Restore early ZONE_ATTR_ values

[citrus-it]

While testing the s10 brand under the upcoming r151042 release, a service failed to come online:

# /usr/sbin/ipsecalgs -s
ipsecalgs: Unable to determine zone IP type: Invalid argument

zone_getattr(10, ZONE_ATTR_FLAGS, 0x08047DE8, 2) Err#22 EINVAL

Some dtrace showed that the branded zone was requesting attribute number 14:

r151042# dtrace -n 'zone_getattr:entry/arg0==11/{self->t++; trace(arg1)}' -n 'zone_getattr:return/self->t/{self->t--; trace(arg1)}' -n 'zone_status_get:return/self->t/{trace(arg1)}' -n 'zone_list_access:return/self->t/{trace(arg1)}' -n 's10_getattr:entry/self->t/{trace(arg1)}' -n 's10_getattr:return/self->t/{trace(arg1)}'

CPU     ID                    FUNCTION:NAME
  2  28085               zone_getattr:entry             32768
  2  37731           zone_status_get:return                 4
  2  28078          zone_list_access:return                 1
  2   9380                s10_getattr:entry             32768
  2   9381               s10_getattr:return                 0
  2  28086              zone_getattr:return                 1
  2  28085               zone_getattr:entry                14
  2  37731           zone_status_get:return                 4
  2  28078          zone_list_access:return                 1
  2  28086              zone_getattr:return                22

and, unfortunately, our attribute 14 is not what it once was:

s10# grep ZONE_ATTR_FLAGS /usr/include/sys/zone.h
#define ZONE_ATTR_FLAGS         14
r151042# grep ZONE_ATTR_FLAGS /usr/include/sys/zone.h
#define   ZONE_ATTR_FLAGS            13

it was renumbered as part of 4ece279

This restores the numbering of the early flags, so that they are what branded zones expect. It also re-synchronises the ones in the 20-29 range with the values in gate and moves the OmniOS/SmartOS-only ones to 30+

[citrus-it]

With this patch, things are much happier in the zone and the ipsecalgs service is online.

s10# truss -t zone_getattr /usr/sbin/ipsecalgs -s
zone_lookup("")                                 = 1
zone_getattr(1, 32768, 0xFEFFDA88, 1)           = 1
zone_lookup("")                                 = 1
zone_getattr(1, ZONE_ATTR_FLAGS, 0x08047DB0, 2) = 2

Retrieval of the ZONE_ATTR_FLAGS attribute is succeeding.

[danmcd]

Nobody outside the platform (illumos and any extras in a distro) consume these values, right? I don't think it is, but it's a question that should linger.

[citrus-it]

Nobody outside the platform (illumos and any extras in a distro) consume these values, right? I don't think it is, but it's a question that should linger.

I can't imagine that they do, certainly not the higher-numbered ones which are related to the RSS capping.
A search on github for ZONE_ATTR_FLAGS shows almost entirely illumos/opensolaris/unleashed stuff.

There's at least one project on there (glibc on illumos) which has the ZONE_FLAGS_ATTR value hard coded to 14, which is the value we're restoring it to.

[danmcd]

So glibc is doing something stupid, huh? Why am I NOT surprised. :)

[danmcd]

Good catch on the truss(1) ones.