Print this page
Merge cleanup from previous six commits
OS-200 need a better mechanism for storing persistent zone_did
OS-511 make zonecfg device resource extensible, like the net resource
OS-224 add more zonecfg net properties
OS-216 store all net config info on zone
OS-399 zone phys. mem. cap should be a rctl and have associated kstat

Split Close
Expand all
Collapse all
          --- old/usr/src/head/libzonecfg.h
          +++ new/usr/src/head/libzonecfg.h
↓ open down ↓ 34 lines elided ↑ open up ↑
  35   35  #endif
  36   36  
  37   37  /* sys/socket.h is required by net/if.h, which has a constant needed here */
  38   38  #include <sys/param.h>
  39   39  #include <sys/fstyp.h>
  40   40  #include <sys/mount.h>
  41   41  #include <priv.h>
  42   42  #include <netinet/in.h>
  43   43  #include <sys/socket.h>
  44   44  #include <net/if.h>
       45 +#include <sys/mac.h>
  45   46  #include <stdio.h>
  46   47  #include <rctl.h>
  47   48  #include <zone.h>
  48   49  #include <libbrand.h>
  49   50  #include <sys/uuid.h>
  50   51  #include <libuutil.h>
  51   52  #include <sys/mnttab.h>
  52   53  #include <limits.h>
  53   54  #include <utmpx.h>
  54   55  
↓ open down ↓ 65 lines elided ↑ open up ↑
 120  121  
 121  122  #define LIBZONECFG_PATH         "libzonecfg.so.1"
 122  123  
 123  124  #define ZONE_CONFIG_ROOT        "/etc/zones"
 124  125  #define ZONE_INDEX_FILE         ZONE_CONFIG_ROOT "/index"
 125  126  
 126  127  #define MAXUSERNAME             (sizeof (((struct utmpx *)0)->ut_name))
 127  128  #define MAXAUTHS                4096
 128  129  #define ZONE_MGMT_PROF          "Zone Management"
 129  130  
      131 +#define ZONE_INT32SZ            11              /* string to hold 32bit int. */
      132 +
 130  133  /* Owner, group, and mode (defined by packaging) for the config directory */
 131  134  #define ZONE_CONFIG_UID         0               /* root */
 132  135  #define ZONE_CONFIG_GID         3               /* sys */
 133  136  #define ZONE_CONFIG_MODE        0755
 134  137  
 135  138  /* Owner, group, and mode (defined by packaging) for the index file */
 136  139  #define ZONE_INDEX_UID          0               /* root */
 137  140  #define ZONE_INDEX_GID          3               /* sys */
 138  141  #define ZONE_INDEX_MODE         0644
 139  142  
↓ open down ↓ 3 lines elided ↑ open up ↑
 143  146  /*
 144  147   * Shortened alias names for the zones rctls.
 145  148   */
 146  149  #define ALIAS_MAXLWPS           "max-lwps"
 147  150  #define ALIAS_MAXSHMMEM         "max-shm-memory"
 148  151  #define ALIAS_MAXSHMIDS         "max-shm-ids"
 149  152  #define ALIAS_MAXMSGIDS         "max-msg-ids"
 150  153  #define ALIAS_MAXSEMIDS         "max-sem-ids"
 151  154  #define ALIAS_MAXLOCKEDMEM      "locked"
 152  155  #define ALIAS_MAXSWAP           "swap"
      156 +#define ALIAS_MAXPHYSMEM        "physical"
 153  157  #define ALIAS_SHARES            "cpu-shares"
 154  158  #define ALIAS_CPUCAP            "cpu-cap"
 155  159  #define ALIAS_MAXPROCS          "max-processes"
      160 +#define ALIAS_ZFSPRI            "zfs-io-priority"
 156  161  
 157  162  /* Default name for zone detached manifest */
 158  163  #define ZONE_DETACHED   "SUNWdetached.xml"
 159  164  
 160  165  /*
 161  166   * Bit flag definitions for passing into libzonecfg functions.
 162  167   */
 163  168  #define ZONE_DRY_RUN            0x01
 164  169  
 165  170  /*
↓ open down ↓ 18 lines elided ↑ open up ↑
 184  189  } zone_fsopt_t;
 185  190  
 186  191  struct zone_fstab {
 187  192          char            zone_fs_special[MAXPATHLEN];    /* special file */
 188  193          char            zone_fs_dir[MAXPATHLEN];        /* mount point */
 189  194          char            zone_fs_type[FSTYPSZ];          /* e.g. ufs */
 190  195          zone_fsopt_t   *zone_fs_options;                /* mount options */
 191  196          char            zone_fs_raw[MAXPATHLEN];        /* device to fsck */
 192  197  };
 193  198  
      199 +/*
      200 + * Generic resource attribute list.
      201 + * Key/value resource that can be attached to net or device.
      202 + */
      203 +struct zone_res_attrtab {
      204 +        char    zone_res_attr_name[MAXNAMELEN];
      205 +        char    zone_res_attr_value[MAXNAMELEN];
      206 +        struct zone_res_attrtab *zone_res_attr_next;
      207 +};
      208 +
 194  209  struct zone_nwiftab {
 195  210          char    zone_nwif_address[INET6_ADDRSTRLEN]; /* shared-ip only */
 196  211          char    zone_nwif_allowed_address[INET6_ADDRSTRLEN]; /* excl-ip only */
 197  212          char    zone_nwif_physical[LIFNAMSIZ];
      213 +        char    zone_nwif_mac[MAXMACADDRLEN];           /* excl-ip only */
      214 +        char    zone_nwif_vlan_id[ZONE_INT32SZ];        /* excl-ip only */
      215 +        char    zone_nwif_gnic[LIFNAMSIZ];              /* excl-ip only */
 198  216          char    zone_nwif_defrouter[INET6_ADDRSTRLEN];
      217 +        struct zone_res_attrtab *zone_nwif_attrp;
 199  218  };
 200  219  
 201  220  struct zone_devtab {
 202  221          char    zone_dev_match[MAXPATHLEN];
      222 +        struct zone_res_attrtab *zone_dev_attrp;
 203  223  };
 204  224  
 205  225  struct zone_rctlvaltab {
 206  226          char    zone_rctlval_priv[MAXNAMELEN];
 207  227          char    zone_rctlval_limit[MAXNAMELEN];
 208  228          char    zone_rctlval_action[MAXNAMELEN];
 209  229          struct zone_rctlvaltab *zone_rctlval_next;
 210  230  };
 211  231  
 212  232  struct zone_rctltab {
↓ open down ↓ 10 lines elided ↑ open up ↑
 223  243  struct zone_dstab {
 224  244          char    zone_dataset_name[MAXNAMELEN];
 225  245  };
 226  246  
 227  247  struct zone_psettab {
 228  248          char    zone_ncpu_min[MAXNAMELEN];
 229  249          char    zone_ncpu_max[MAXNAMELEN];
 230  250          char    zone_importance[MAXNAMELEN];
 231  251  };
 232  252  
 233      -struct zone_mcaptab {
 234      -        char    zone_physmem_cap[MAXNAMELEN];
 235      -};
 236      -
 237  253  struct zone_pkgtab {
 238  254          char    zone_pkg_name[MAXNAMELEN];
 239  255          char    zone_pkg_version[ZONE_PKG_VERSMAX];
 240  256  };
 241  257  
 242  258  struct zone_devpermtab {
 243  259          char    zone_devperm_name[MAXPATHLEN];
 244  260          uid_t   zone_devperm_uid;
 245  261          gid_t   zone_devperm_gid;
 246  262          mode_t  zone_devperm_mode;
↓ open down ↓ 63 lines elided ↑ open up ↑
 310  326  extern  int     zonecfg_set_autoboot(zone_dochandle_t, boolean_t);
 311  327  extern  int     zonecfg_get_iptype(zone_dochandle_t, zone_iptype_t *);
 312  328  extern  int     zonecfg_set_iptype(zone_dochandle_t, zone_iptype_t);
 313  329  extern  int     zonecfg_get_pool(zone_dochandle_t, char *, size_t);
 314  330  extern  int     zonecfg_set_pool(zone_dochandle_t, char *);
 315  331  extern  int     zonecfg_get_bootargs(zone_dochandle_t, char *, size_t);
 316  332  extern  int     zonecfg_set_bootargs(zone_dochandle_t, char *);
 317  333  extern  int     zonecfg_get_sched_class(zone_dochandle_t, char *, size_t);
 318  334  extern  int     zonecfg_set_sched(zone_dochandle_t, char *);
 319  335  extern  int     zonecfg_get_dflt_sched_class(zone_dochandle_t, char *, int);
      336 +extern  zoneid_t zonecfg_get_did(zone_dochandle_t);
      337 +extern  void    zonecfg_set_did(zone_dochandle_t);
 320  338  
 321  339  /*
 322  340   * Set/retrieve the brand for the zone
 323  341   */
 324  342  extern  int     zonecfg_get_brand(zone_dochandle_t, char *, size_t);
 325  343  extern  int     zonecfg_set_brand(zone_dochandle_t, char *);
 326  344  
 327  345  /*
 328  346   * Filesystem configuration.
 329  347   */
↓ open down ↓ 4 lines elided ↑ open up ↑
 334  352      struct zone_fstab *, struct zone_fstab *);
 335  353  extern  int     zonecfg_lookup_filesystem(zone_dochandle_t,
 336  354      struct zone_fstab *);
 337  355  extern  int     zonecfg_add_fs_option(struct zone_fstab *, char *);
 338  356  extern  int     zonecfg_remove_fs_option(struct zone_fstab *, char *);
 339  357  extern  void    zonecfg_free_fs_option_list(zone_fsopt_t *);
 340  358  extern  int     zonecfg_find_mounts(char *, int(*)(const struct mnttab *,
 341  359      void *), void *);
 342  360  
 343  361  /*
      362 + * Resource key/value attributes (properties).
      363 + */
      364 +extern  int     zonecfg_add_res_attr(struct zone_res_attrtab **,
      365 +    struct zone_res_attrtab *);
      366 +extern  void    zonecfg_free_res_attr_list(struct zone_res_attrtab *);
      367 +extern  int     zonecfg_remove_res_attr(struct zone_res_attrtab **,
      368 +    struct zone_res_attrtab *);
      369 +
      370 +/*
 344  371   * Network interface configuration.
 345  372   */
 346  373  extern  int     zonecfg_add_nwif(zone_dochandle_t, struct zone_nwiftab *);
 347  374  extern  int     zonecfg_delete_nwif(zone_dochandle_t, struct zone_nwiftab *);
 348  375  extern  int     zonecfg_modify_nwif(zone_dochandle_t, struct zone_nwiftab *,
 349  376      struct zone_nwiftab *);
 350  377  extern  int     zonecfg_lookup_nwif(zone_dochandle_t, struct zone_nwiftab *);
 351  378  
 352  379  /*
 353  380   * Hostid emulation configuration.
↓ open down ↓ 61 lines elided ↑ open up ↑
 415  442  
 416  443  /*
 417  444   * cpu-set configuration.
 418  445   */
 419  446  extern  int     zonecfg_add_pset(zone_dochandle_t, struct zone_psettab *);
 420  447  extern  int     zonecfg_delete_pset(zone_dochandle_t);
 421  448  extern  int     zonecfg_modify_pset(zone_dochandle_t, struct zone_psettab *);
 422  449  extern  int     zonecfg_lookup_pset(zone_dochandle_t, struct zone_psettab *);
 423  450  
 424  451  /*
 425      - * mem-cap configuration.
 426      - */
 427      -extern  int     zonecfg_delete_mcap(zone_dochandle_t);
 428      -extern  int     zonecfg_modify_mcap(zone_dochandle_t, struct zone_mcaptab *);
 429      -extern  int     zonecfg_lookup_mcap(zone_dochandle_t, struct zone_mcaptab *);
 430      -
 431      -/*
 432  452   * Temporary pool support functions.
 433  453   */
 434  454  extern  int     zonecfg_destroy_tmp_pool(char *, char *, int);
 435  455  extern  int     zonecfg_bind_tmp_pool(zone_dochandle_t, zoneid_t, char *, int);
 436  456  extern  int     zonecfg_bind_pool(zone_dochandle_t, zoneid_t, char *, int);
 437  457  extern  boolean_t zonecfg_warn_poold(zone_dochandle_t);
 438  458  extern  int     zonecfg_get_poolname(zone_dochandle_t, char *, char *, size_t);
 439  459  
 440  460  /*
 441  461   * Miscellaneous utility functions.
↓ open down ↓ 36 lines elided ↑ open up ↑
 478  498  extern  int     zonecfg_setattrent(zone_dochandle_t);
 479  499  extern  int     zonecfg_getattrent(zone_dochandle_t, struct zone_attrtab *);
 480  500  extern  int     zonecfg_endattrent(zone_dochandle_t);
 481  501  extern  int     zonecfg_setrctlent(zone_dochandle_t);
 482  502  extern  int     zonecfg_getrctlent(zone_dochandle_t, struct zone_rctltab *);
 483  503  extern  int     zonecfg_endrctlent(zone_dochandle_t);
 484  504  extern  int     zonecfg_setdsent(zone_dochandle_t);
 485  505  extern  int     zonecfg_getdsent(zone_dochandle_t, struct zone_dstab *);
 486  506  extern  int     zonecfg_enddsent(zone_dochandle_t);
 487  507  extern  int     zonecfg_getpsetent(zone_dochandle_t, struct zone_psettab *);
 488      -extern  int     zonecfg_getmcapent(zone_dochandle_t, struct zone_mcaptab *);
 489  508  extern  int     zonecfg_getpkgdata(zone_dochandle_t, uu_avl_pool_t *,
 490  509      uu_avl_t *);
 491  510  extern  int     zonecfg_setdevperment(zone_dochandle_t);
 492  511  extern  int     zonecfg_getdevperment(zone_dochandle_t,
 493  512      struct zone_devpermtab *);
 494  513  extern  int     zonecfg_enddevperment(zone_dochandle_t);
 495  514  extern  int     zonecfg_setadminent(zone_dochandle_t);
 496  515  extern  int     zonecfg_getadminent(zone_dochandle_t, struct zone_admintab *);
 497  516  extern  int     zonecfg_endadminent(zone_dochandle_t);
 498  517  
↓ open down ↓ 3 lines elided ↑ open up ↑
 502  521  extern  int     zonecfg_default_privset(priv_set_t *, const char *);
 503  522  extern  int     zonecfg_get_privset(zone_dochandle_t, priv_set_t *,
 504  523      char **);
 505  524  extern  int     zonecfg_get_limitpriv(zone_dochandle_t, char **);
 506  525  extern  int     zonecfg_set_limitpriv(zone_dochandle_t, char *);
 507  526  
 508  527  /*
 509  528   * Higher-level routines.
 510  529   */
 511  530  extern  int     zone_get_brand(char *, char *, size_t);
      531 +extern  zoneid_t zone_get_did(char *);
 512  532  extern  int     zone_get_rootpath(char *, char *, size_t);
 513  533  extern  int     zone_get_devroot(char *, char *, size_t);
 514  534  extern  int     zone_get_zonepath(char *, char *, size_t);
 515  535  extern  int     zone_get_state(char *, zone_state_t *);
 516  536  extern  int     zone_set_state(char *, zone_state_t);
 517  537  extern  char    *zone_state_str(zone_state_t);
 518  538  extern  int     zonecfg_get_name_by_uuid(const uuid_t, char *, size_t);
 519  539  extern  int     zonecfg_get_uuid(const char *, uuid_t);
 520  540  extern  int     zonecfg_default_brand(char *, size_t);
      541 +extern  int     zonecfg_fix_obsolete(zone_dochandle_t);
 521  542  
 522  543  /*
 523  544   * Iterator for configured zones.
 524  545   */
 525  546  extern FILE             *setzoneent(void);
 526  547  extern char             *getzoneent(FILE *);
 527  548  extern struct zoneent   *getzoneent_private(FILE *);
 528  549  extern void             endzoneent(FILE *);
 529  550  
 530  551  /*
↓ open down ↓ 70 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX