Print this page
Forgot to merge in unlink of ZONE_LOCK in dlmgmtd.
dlmgmt mismerge
Mismerge dlmgmt_door.c
OS-3342 dlmgmtd needs to be mindful of lock ordering
OS-2608 dlmgmtd needs to record zone identifiers
OS-3492 zone_free asserts to its destruction when dlmgmtd has fallen
OS-3494 zoneadmd tears down networking too soon when boot fails
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/dlmgmtd/dlmgmt_door.c
          +++ new/usr/src/cmd/dlmgmtd/dlmgmt_door.c
↓ open down ↓ 50 lines elided ↑ open up ↑
  51   51  #include <errno.h>
  52   52  #include <priv_utils.h>
  53   53  #include <stdlib.h>
  54   54  #include <strings.h>
  55   55  #include <syslog.h>
  56   56  #include <sys/sysevent/eventdefs.h>
  57   57  #include <zone.h>
  58   58  #include <libsysevent.h>
  59   59  #include <libdlmgmt.h>
  60   60  #include <librcm.h>
       61 +#include <sys/types.h>
       62 +#include <sys/stat.h>
       63 +#include <fcntl.h>
       64 +#include <unistd.h>
  61   65  #include "dlmgmt_impl.h"
  62   66  
       67 +
  63   68  typedef void dlmgmt_door_handler_t(void *, void *, size_t *, zoneid_t,
  64   69      ucred_t *);
  65   70  
  66   71  typedef struct dlmgmt_door_info_s {
  67   72          uint_t                  di_cmd;
  68   73          size_t                  di_reqsz;
  69   74          size_t                  di_acksz;
  70   75          dlmgmt_door_handler_t   *di_handler;
  71   76  } dlmgmt_door_info_t;
  72   77  
↓ open down ↓ 299 lines elided ↑ open up ↑
 372  377          dlmgmt_table_lock(B_TRUE);
 373  378  
 374  379          if ((linkp = link_by_id(linkid, zoneid)) == NULL) {
 375  380                  err = ENOENT;
 376  381                  goto done;
 377  382          }
 378  383  
 379  384          if ((err = dlmgmt_checkprivs(linkp->ll_class, cred)) != 0)
 380  385                  goto done;
 381  386  
      387 +        if (linkp->ll_tomb == B_TRUE) {
      388 +                err = EINPROGRESS;
      389 +                goto done;
      390 +        }
      391 +
 382  392          if (((linkp->ll_flags & flags) & DLMGMT_ACTIVE) != 0) {
 383  393                  if ((err = dlmgmt_delete_db_entry(linkp, DLMGMT_ACTIVE)) != 0)
 384  394                          goto done;
 385  395                  dflags |= DLMGMT_ACTIVE;
 386  396          }
 387  397  
 388  398          if (((linkp->ll_flags & flags) & DLMGMT_PERSIST) != 0) {
 389  399                  if ((err = dlmgmt_delete_db_entry(linkp, DLMGMT_PERSIST)) != 0)
 390  400                          goto done;
 391  401                  dflags |= DLMGMT_PERSIST;
↓ open down ↓ 249 lines elided ↑ open up ↑
 641  651           */
 642  652          dlmgmt_table_lock(B_TRUE);
 643  653          if ((linkp = link_by_id(remapid->ld_linkid, zoneid)) == NULL) {
 644  654                  err = ENOENT;
 645  655                  goto done;
 646  656          }
 647  657  
 648  658          if ((err = dlmgmt_checkprivs(linkp->ll_class, cred)) != 0)
 649  659                  goto done;
 650  660  
      661 +        if (linkp->ll_tomb == B_TRUE) {
      662 +                err = EBUSY;
      663 +                goto done;
      664 +        }
      665 +
      666 +
 651  667          if (link_by_name(remapid->ld_link, linkp->ll_zoneid) != NULL) {
 652  668                  err = EEXIST;
 653  669                  goto done;
 654  670          }
 655  671  
 656  672          (void) strlcpy(oldname, linkp->ll_link, MAXLINKNAMELEN);
 657  673          avl_remove(&dlmgmt_name_avl, linkp);
 658  674          (void) strlcpy(linkp->ll_link, remapid->ld_link, MAXLINKNAMELEN);
 659  675          avl_add(&dlmgmt_name_avl, linkp);
 660  676          renamed = B_TRUE;
↓ open down ↓ 41 lines elided ↑ open up ↑
 702  718           */
 703  719          dlmgmt_table_lock(B_TRUE);
 704  720          if ((linkp = link_by_id(upid->ld_linkid, zoneid)) == NULL) {
 705  721                  err = ENOENT;
 706  722                  goto done;
 707  723          }
 708  724  
 709  725          if ((err = dlmgmt_checkprivs(linkp->ll_class, cred)) != 0)
 710  726                  goto done;
 711  727  
      728 +        if (linkp->ll_tomb == B_TRUE) {
      729 +                err = EBUSY;
      730 +                goto done;
      731 +        }
      732 +
 712  733          if (linkp->ll_flags & DLMGMT_ACTIVE) {
 713  734                  err = EINVAL;
 714  735                  goto done;
 715  736          }
 716  737  
 717  738          if ((err = link_activate(linkp)) == 0) {
 718  739                  (void) dlmgmt_write_db_entry(linkp->ll_link, linkp,
 719  740                      DLMGMT_ACTIVE);
 720  741          }
 721  742  done:
↓ open down ↓ 487 lines elided ↑ open up ↑
1209 1230          }
1210 1231  
1211 1232          if ((linkp = link_by_id(linkid, zoneid)) == NULL) {
1212 1233                  err = ENOENT;
1213 1234                  goto done;
1214 1235          }
1215 1236  
1216 1237          if ((err = dlmgmt_checkprivs(linkp->ll_class, cred)) != 0)
1217 1238                  goto done;
1218 1239  
     1240 +        if (linkp->ll_tomb == B_TRUE) {
     1241 +                err = EBUSY;
     1242 +                goto done;
     1243 +        }
     1244 +
1219 1245          /* We can only assign an active link to a zone. */
1220 1246          if (!(linkp->ll_flags & DLMGMT_ACTIVE)) {
1221 1247                  err = EINVAL;
1222 1248                  goto done;
1223 1249          }
1224 1250  
1225 1251          oldzoneid = linkp->ll_zoneid;
1226 1252          newzoneid = setzoneid->ld_zoneid;
1227 1253  
1228 1254          if (oldzoneid == newzoneid)
↓ open down ↓ 73 lines elided ↑ open up ↑
1302 1328  }
1303 1329  
1304 1330  /* ARGSUSED */
1305 1331  static void
1306 1332  dlmgmt_zonehalt(void *argp, void *retp, size_t *sz, zoneid_t zoneid,
1307 1333      ucred_t *cred)
1308 1334  {
1309 1335          int                     err = 0;
1310 1336          dlmgmt_door_zonehalt_t  *zonehalt = argp;
1311 1337          dlmgmt_zonehalt_retval_t *retvalp = retp;
     1338 +        static char my_pid[10];
1312 1339  
     1340 +        if (my_pid[0] == NULL)
     1341 +                (void) snprintf(my_pid, sizeof (my_pid), "%d\n", getpid());
     1342 +
1313 1343          if ((err = dlmgmt_checkprivs(0, cred)) == 0) {
1314 1344                  if (zoneid != GLOBAL_ZONEID) {
1315 1345                          err = EACCES;
1316 1346                  } else if (zonehalt->ld_zoneid == GLOBAL_ZONEID) {
1317 1347                          err = EINVAL;
1318 1348                  } else {
     1349 +                        /*
     1350 +                         * dls and mac don't honor the locking rules defined in
     1351 +                         * mac. In order to try and make that case less likely
     1352 +                         * to happen, we try to serialize some of the zone
     1353 +                         * activity here between dlmgmtd and the brands on
     1354 +                         * /etc/dladm/zone.lck
     1355 +                         */
     1356 +                        int fd;
     1357 +
     1358 +                        while ((fd = open(ZONE_LOCK, O_WRONLY |
     1359 +                            O_CREAT | O_EXCL, S_IRUSR | S_IWUSR)) < 0)
     1360 +                        (void) sleep(1);
     1361 +                        (void) write(fd, my_pid, sizeof (my_pid));
     1362 +                        (void) close(fd);
     1363 +
1319 1364                          dlmgmt_table_lock(B_TRUE);
1320 1365                          dlmgmt_db_fini(zonehalt->ld_zoneid);
1321 1366                          dlmgmt_table_unlock();
     1367 +
     1368 +                        (void) unlink(ZONE_LOCK);
1322 1369                  }
1323 1370          }
1324 1371          retvalp->lr_err = err;
1325 1372  }
1326 1373  
1327 1374  static dlmgmt_door_info_t i_dlmgmt_door_info_tbl[] = {
1328 1375          { DLMGMT_CMD_DLS_CREATE, sizeof (dlmgmt_upcall_arg_create_t),
1329 1376              sizeof (dlmgmt_create_retval_t), dlmgmt_upcall_create },
1330 1377          { DLMGMT_CMD_DLS_GETATTR, sizeof (dlmgmt_upcall_arg_getattr_t),
1331 1378              sizeof (dlmgmt_getattr_retval_t), dlmgmt_upcall_getattr },
↓ open down ↓ 117 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX