LU-8955 cfg: reserve flags for SELinux status checking

Reserve LCFG_NODEMAP_SET_SEPOL config flag that will be used to
define sepol parameter on nodemap entries.
Reserve OBD_CONNECT2_SELINUX_POLICY connection flag that will be set
(in ocd_connect_flags2) if a client supports sending the SELinux
policy status info.
Add checks for all lcfg_command_type constants, along with lustre_cfg
and cfg_record_type.

Test-Parameters: trivial
Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Change-Id: I009eb8f1597b51acce7dc21498a43096e41cd034
Reviewed-on: https://review.whamcloud.com/33797
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Patrick Farrell <farr0186@gmail.com>

diff --git a/lustre/include/uapi/linux/lustre/lustre_cfg.h b/lustre/include/uapi/linux/lustre/lustre_cfg.h
index d5b5b6c..af78b57 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_cfg.h
+++ b/lustre/include/uapi/linux/lustre/lustre_cfg.h
@@ -150,6 +150,7 @@ enum lcfg_command_type {
                                                 */
        LCFG_NODEMAP_MAP_MODE     = 0x00ce059, /**< set the mapping mode */
        LCFG_NODEMAP_AUDIT_MODE   = 0x00ce05a, /**< set the audit mode */
+       LCFG_NODEMAP_SET_SEPOL    = 0x00ce05b, /**< set SELinux policy */
 };
 
 struct lustre_cfg_bufs {

diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h
index 069fe56..118c98d 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_idl.h
+++ b/lustre/include/uapi/linux/lustre/lustre_idl.h
@@ -833,6 +833,7 @@ struct ptlrpc_body_v2 {
 #define OBD_CONNECT2_WBC_INTENTS       0x40ULL /* create/unlink/... intents for wbc, also operations under client-held parent locks */
 #define OBD_CONNECT2_LOCK_CONVERT      0x80ULL /* IBITS lock convert support */
 #define OBD_CONNECT2_ARCHIVE_ID_ARRAY  0x100ULL /* store HSM archive_id in array */
+#define OBD_CONNECT2_SELINUX_POLICY    0x400ULL /* has client SELinux policy */
 
 /* XXX README XXX:
  * Please DO NOT add flag values here before first ensuring that this same

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index b1f77cd..34a0192 100644 (file)
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -782,6 +782,7 @@ static const char *obd_connect_names[] = {
        "wbc",          /* 0x40 */
        "lock_convert",  /* 0x80 */
        "archive_id_array",     /* 0x100 */
+       "selinux_policy",       /* 0x200 */
        NULL
 };
 

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index 12ec0c1..0188129 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -42,6 +42,7 @@
 #include <lustre_net.h>
 #include <lustre_disk.h>
 #include <uapi/linux/lustre/lustre_lfsck_user.h>
+#include <uapi/linux/lustre/lustre_cfg.h>
 
 void lustre_assert_wire_constants(void)
 {
@@ -1335,6 +1336,8 @@ void lustre_assert_wire_constants(void)
                 OBD_CONNECT2_LOCK_CONVERT);
        LASSERTF(OBD_CONNECT2_ARCHIVE_ID_ARRAY == 0x100ULL, "found 0x%.16llxULL\n",
                 OBD_CONNECT2_ARCHIVE_ID_ARRAY);
+       LASSERTF(OBD_CONNECT2_SELINUX_POLICY == 0x400ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT2_SELINUX_POLICY);
        LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n",
                (unsigned)OBD_CKSUM_CRC32);
        LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n",
@@ -5473,4 +5476,146 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct llog_update_record, lur_update_rec));
        LASSERTF((int)sizeof(((struct llog_update_record *)0)->lur_update_rec) == 32, "found %lld\n",
                 (long long)(int)sizeof(((struct llog_update_record *)0)->lur_update_rec));
+
+       /* Checks for struct lustre_cfg */
+       LASSERTF((int)sizeof(struct lustre_cfg) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct lustre_cfg));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_version) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_version));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_version) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_version));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_command) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_command));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_command) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_command));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_num) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_num));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_num) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_num));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_flags) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_flags));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_flags));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_nid) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_nid));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_nid) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_nid));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_nal) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_nal));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_nal) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_nal));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_bufcount) == 28, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_bufcount));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_bufcount) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_bufcount));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_buflens[0]) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_buflens[0]));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_buflens[0]) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_buflens[0]));
+       LASSERTF(LCFG_ATTACH == 0x000cf001UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_ATTACH);
+       LASSERTF(LCFG_DETACH == 0x000cf002UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DETACH);
+       LASSERTF(LCFG_SETUP == 0x000cf003UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SETUP);
+       LASSERTF(LCFG_CLEANUP == 0x000cf004UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_CLEANUP);
+       LASSERTF(LCFG_ADD_UUID == 0x000cf005UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_ADD_UUID);
+       LASSERTF(LCFG_DEL_UUID == 0x000cf006UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DEL_UUID);
+       LASSERTF(LCFG_MOUNTOPT == 0x000cf007UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_MOUNTOPT);
+       LASSERTF(LCFG_DEL_MOUNTOPT == 0x000cf008UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DEL_MOUNTOPT);
+       LASSERTF(LCFG_SET_TIMEOUT == 0x000cf009UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SET_TIMEOUT);
+       LASSERTF(LCFG_SET_UPCALL == 0x000cf00aUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SET_UPCALL);
+       LASSERTF(LCFG_ADD_CONN == 0x000cf00bUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_ADD_CONN);
+       LASSERTF(LCFG_DEL_CONN == 0x000cf00cUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DEL_CONN);
+       LASSERTF(LCFG_LOV_ADD_OBD == 0x000cf00dUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOV_ADD_OBD);
+       LASSERTF(LCFG_LOV_DEL_OBD == 0x000cf00eUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOV_DEL_OBD);
+       LASSERTF(LCFG_PARAM == 0x000cf00fUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_PARAM);
+       LASSERTF(LCFG_MARKER == 0x000cf010UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_MARKER);
+       LASSERTF(LCFG_LOG_START == 0x000ce011UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOG_START);
+       LASSERTF(LCFG_LOG_END == 0x000ce012UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOG_END);
+       LASSERTF(LCFG_LOV_ADD_INA == 0x000ce013UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOV_ADD_INA);
+       LASSERTF(LCFG_ADD_MDC == 0x000cf014UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_ADD_MDC);
+       LASSERTF(LCFG_DEL_MDC == 0x000cf015UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DEL_MDC);
+       LASSERTF(LCFG_SPTLRPC_CONF == 0x000ce016UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SPTLRPC_CONF);
+       LASSERTF(LCFG_POOL_NEW == 0x000ce020UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_POOL_NEW);
+       LASSERTF(LCFG_POOL_ADD == 0x000ce021UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_POOL_ADD);
+       LASSERTF(LCFG_POOL_REM == 0x000ce022UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_POOL_REM);
+       LASSERTF(LCFG_POOL_DEL == 0x000ce023UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_POOL_DEL);
+       LASSERTF(LCFG_SET_LDLM_TIMEOUT == 0x000ce030UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SET_LDLM_TIMEOUT);
+       LASSERTF(LCFG_PRE_CLEANUP == 0x000cf031UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_PRE_CLEANUP);
+       LASSERTF(LCFG_SET_PARAM == 0x000ce032UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SET_PARAM);
+       LASSERTF(LCFG_NODEMAP_ADD == 0x000ce040UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD);
+       LASSERTF(LCFG_NODEMAP_DEL == 0x000ce041UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL);
+       LASSERTF(LCFG_NODEMAP_ADD_RANGE == 0x000ce042UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD_RANGE);
+       LASSERTF(LCFG_NODEMAP_DEL_RANGE == 0x000ce043UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL_RANGE);
+       LASSERTF(LCFG_NODEMAP_ADD_UIDMAP == 0x000ce044UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD_UIDMAP);
+       LASSERTF(LCFG_NODEMAP_DEL_UIDMAP == 0x000ce045UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL_UIDMAP);
+       LASSERTF(LCFG_NODEMAP_ADD_GIDMAP == 0x000ce046UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD_GIDMAP);
+       LASSERTF(LCFG_NODEMAP_DEL_GIDMAP == 0x000ce047UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL_GIDMAP);
+       LASSERTF(LCFG_NODEMAP_ACTIVATE == 0x000ce048UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ACTIVATE);
+       LASSERTF(LCFG_NODEMAP_ADMIN == 0x000ce049UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADMIN);
+       LASSERTF(LCFG_NODEMAP_TRUSTED == 0x000ce050UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_TRUSTED);
+       LASSERTF(LCFG_NODEMAP_SQUASH_UID == 0x000ce051UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_SQUASH_UID);
+       LASSERTF(LCFG_NODEMAP_SQUASH_GID == 0x000ce052UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_SQUASH_GID);
+       LASSERTF(LCFG_NODEMAP_ADD_SHKEY == 0x000ce053UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD_SHKEY);
+       LASSERTF(LCFG_NODEMAP_DEL_SHKEY == 0x000ce054UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL_SHKEY);
+       LASSERTF(LCFG_NODEMAP_TEST_NID == 0x000ce055UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_TEST_NID);
+       LASSERTF(LCFG_NODEMAP_TEST_ID == 0x000ce056UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_TEST_ID);
+       LASSERTF(LCFG_NODEMAP_SET_FILESET == 0x000ce057UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_SET_FILESET);
+       LASSERTF(LCFG_NODEMAP_DENY_UNKNOWN == 0x000ce058UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DENY_UNKNOWN);
+       LASSERTF(LCFG_NODEMAP_MAP_MODE == 0x000ce059UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_MAP_MODE);
+       LASSERTF(LCFG_NODEMAP_AUDIT_MODE == 0x000ce05aUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_AUDIT_MODE);
+       LASSERTF(LCFG_NODEMAP_SET_SEPOL == 0x000ce05bUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_SET_SEPOL);
+       LASSERTF(PORTALS_CFG_TYPE == 1, "found %lld\n",
+                (long long)PORTALS_CFG_TYPE);
+       LASSERTF(LUSTRE_CFG_TYPE == 123, "found %lld\n",
+                (long long)LUSTRE_CFG_TYPE);
 }

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 065e5bc..dac04de 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -41,6 +41,7 @@
 #include <linux/lustre/lustre_idl.h>
 #include <linux/lustre/lustre_lfsck_user.h>
 #include <linux/lustre/lustre_disk.h>
+#include <linux/lustre/lustre_cfg.h>
 
 #define BLANK_LINE()                                           \
 do {                                                           \
@@ -604,6 +605,7 @@ check_obd_connect_data(void)
        CHECK_DEFINE_64X(OBD_CONNECT2_WBC_INTENTS);
        CHECK_DEFINE_64X(OBD_CONNECT2_LOCK_CONVERT);
        CHECK_DEFINE_64X(OBD_CONNECT2_ARCHIVE_ID_ARRAY);
+       CHECK_DEFINE_64X(OBD_CONNECT2_SELINUX_POLICY);
 
        CHECK_VALUE_X(OBD_CKSUM_CRC32);
        CHECK_VALUE_X(OBD_CKSUM_ADLER);
@@ -2517,6 +2519,76 @@ static void check_llog_update_record(void)
        CHECK_MEMBER(llog_update_record, lur_update_rec);
 }
 
+static void
+check_lustre_cfg(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(lustre_cfg);
+       CHECK_MEMBER(lustre_cfg, lcfg_version);
+       CHECK_MEMBER(lustre_cfg, lcfg_command);
+       CHECK_MEMBER(lustre_cfg, lcfg_num);
+       CHECK_MEMBER(lustre_cfg, lcfg_flags);
+       CHECK_MEMBER(lustre_cfg, lcfg_nid);
+       CHECK_MEMBER(lustre_cfg, lcfg_nal);
+       CHECK_MEMBER(lustre_cfg, lcfg_bufcount);
+       CHECK_MEMBER(lustre_cfg, lcfg_buflens[0]);
+
+       CHECK_VALUE_X(LCFG_ATTACH);
+       CHECK_VALUE_X(LCFG_DETACH);
+       CHECK_VALUE_X(LCFG_SETUP);
+       CHECK_VALUE_X(LCFG_CLEANUP);
+       CHECK_VALUE_X(LCFG_ADD_UUID);
+       CHECK_VALUE_X(LCFG_DEL_UUID);
+       CHECK_VALUE_X(LCFG_MOUNTOPT);
+       CHECK_VALUE_X(LCFG_DEL_MOUNTOPT);
+       CHECK_VALUE_X(LCFG_SET_TIMEOUT);
+       CHECK_VALUE_X(LCFG_SET_UPCALL);
+       CHECK_VALUE_X(LCFG_ADD_CONN);
+       CHECK_VALUE_X(LCFG_DEL_CONN);
+       CHECK_VALUE_X(LCFG_LOV_ADD_OBD);
+       CHECK_VALUE_X(LCFG_LOV_DEL_OBD);
+       CHECK_VALUE_X(LCFG_PARAM);
+       CHECK_VALUE_X(LCFG_MARKER);
+       CHECK_VALUE_X(LCFG_LOG_START);
+       CHECK_VALUE_X(LCFG_LOG_END);
+       CHECK_VALUE_X(LCFG_LOV_ADD_INA);
+       CHECK_VALUE_X(LCFG_ADD_MDC);
+       CHECK_VALUE_X(LCFG_DEL_MDC);
+       CHECK_VALUE_X(LCFG_SPTLRPC_CONF);
+       CHECK_VALUE_X(LCFG_POOL_NEW);
+       CHECK_VALUE_X(LCFG_POOL_ADD);
+       CHECK_VALUE_X(LCFG_POOL_REM);
+       CHECK_VALUE_X(LCFG_POOL_DEL);
+       CHECK_VALUE_X(LCFG_SET_LDLM_TIMEOUT);
+       CHECK_VALUE_X(LCFG_PRE_CLEANUP);
+       CHECK_VALUE_X(LCFG_SET_PARAM);
+       CHECK_VALUE_X(LCFG_NODEMAP_ADD);
+       CHECK_VALUE_X(LCFG_NODEMAP_DEL);
+       CHECK_VALUE_X(LCFG_NODEMAP_ADD_RANGE);
+       CHECK_VALUE_X(LCFG_NODEMAP_DEL_RANGE);
+       CHECK_VALUE_X(LCFG_NODEMAP_ADD_UIDMAP);
+       CHECK_VALUE_X(LCFG_NODEMAP_DEL_UIDMAP);
+       CHECK_VALUE_X(LCFG_NODEMAP_ADD_GIDMAP);
+       CHECK_VALUE_X(LCFG_NODEMAP_DEL_GIDMAP);
+       CHECK_VALUE_X(LCFG_NODEMAP_ACTIVATE);
+       CHECK_VALUE_X(LCFG_NODEMAP_ADMIN);
+       CHECK_VALUE_X(LCFG_NODEMAP_TRUSTED);
+       CHECK_VALUE_X(LCFG_NODEMAP_SQUASH_UID);
+       CHECK_VALUE_X(LCFG_NODEMAP_SQUASH_GID);
+       CHECK_VALUE_X(LCFG_NODEMAP_ADD_SHKEY);
+       CHECK_VALUE_X(LCFG_NODEMAP_DEL_SHKEY);
+       CHECK_VALUE_X(LCFG_NODEMAP_TEST_NID);
+       CHECK_VALUE_X(LCFG_NODEMAP_TEST_ID);
+       CHECK_VALUE_X(LCFG_NODEMAP_SET_FILESET);
+       CHECK_VALUE_X(LCFG_NODEMAP_DENY_UNKNOWN);
+       CHECK_VALUE_X(LCFG_NODEMAP_MAP_MODE);
+       CHECK_VALUE_X(LCFG_NODEMAP_AUDIT_MODE);
+       CHECK_VALUE_X(LCFG_NODEMAP_SET_SEPOL);
+
+       CHECK_VALUE(PORTALS_CFG_TYPE);
+       CHECK_VALUE(LUSTRE_CFG_TYPE);
+}
+
 int
 main(int argc, char **argv)
 {
@@ -2888,6 +2960,8 @@ main(int argc, char **argv)
        check_update_records();
        check_llog_update_record();
 
+       check_lustre_cfg();
+
        printf("}\n\n");
 
        return 0;

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 7c5fe3f..ec0c08c 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -40,6 +40,7 @@
 #include <linux/lustre/lustre_lfsck_user.h>
 #include <linux/lustre/lustre_disk.h>
 #endif
+#include <linux/lustre/lustre_cfg.h>
 
 #define LASSERT(cond) if (!(cond)) { printf("failed " #cond "\n"); ret = 1; }
 #define LASSERTF(cond, fmt, ...) if (!(cond)) { printf("failed '" #cond "'" fmt, ## __VA_ARGS__);ret = 1;}
@@ -1357,6 +1358,8 @@ void lustre_assert_wire_constants(void)
                 OBD_CONNECT2_LOCK_CONVERT);
        LASSERTF(OBD_CONNECT2_ARCHIVE_ID_ARRAY == 0x100ULL, "found 0x%.16llxULL\n",
                 OBD_CONNECT2_ARCHIVE_ID_ARRAY);
+       LASSERTF(OBD_CONNECT2_SELINUX_POLICY == 0x400ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT2_SELINUX_POLICY);
        LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n",
                (unsigned)OBD_CKSUM_CRC32);
        LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n",
@@ -5495,4 +5498,146 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct llog_update_record, lur_update_rec));
        LASSERTF((int)sizeof(((struct llog_update_record *)0)->lur_update_rec) == 32, "found %lld\n",
                 (long long)(int)sizeof(((struct llog_update_record *)0)->lur_update_rec));
+
+       /* Checks for struct lustre_cfg */
+       LASSERTF((int)sizeof(struct lustre_cfg) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct lustre_cfg));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_version) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_version));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_version) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_version));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_command) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_command));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_command) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_command));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_num) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_num));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_num) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_num));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_flags) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_flags));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_flags));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_nid) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_nid));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_nid) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_nid));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_nal) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_nal));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_nal) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_nal));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_bufcount) == 28, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_bufcount));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_bufcount) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_bufcount));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_buflens[0]) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_buflens[0]));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_buflens[0]) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_buflens[0]));
+       LASSERTF(LCFG_ATTACH == 0x000cf001UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_ATTACH);
+       LASSERTF(LCFG_DETACH == 0x000cf002UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DETACH);
+       LASSERTF(LCFG_SETUP == 0x000cf003UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SETUP);
+       LASSERTF(LCFG_CLEANUP == 0x000cf004UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_CLEANUP);
+       LASSERTF(LCFG_ADD_UUID == 0x000cf005UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_ADD_UUID);
+       LASSERTF(LCFG_DEL_UUID == 0x000cf006UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DEL_UUID);
+       LASSERTF(LCFG_MOUNTOPT == 0x000cf007UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_MOUNTOPT);
+       LASSERTF(LCFG_DEL_MOUNTOPT == 0x000cf008UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DEL_MOUNTOPT);
+       LASSERTF(LCFG_SET_TIMEOUT == 0x000cf009UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SET_TIMEOUT);
+       LASSERTF(LCFG_SET_UPCALL == 0x000cf00aUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SET_UPCALL);
+       LASSERTF(LCFG_ADD_CONN == 0x000cf00bUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_ADD_CONN);
+       LASSERTF(LCFG_DEL_CONN == 0x000cf00cUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DEL_CONN);
+       LASSERTF(LCFG_LOV_ADD_OBD == 0x000cf00dUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOV_ADD_OBD);
+       LASSERTF(LCFG_LOV_DEL_OBD == 0x000cf00eUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOV_DEL_OBD);
+       LASSERTF(LCFG_PARAM == 0x000cf00fUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_PARAM);
+       LASSERTF(LCFG_MARKER == 0x000cf010UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_MARKER);
+       LASSERTF(LCFG_LOG_START == 0x000ce011UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOG_START);
+       LASSERTF(LCFG_LOG_END == 0x000ce012UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOG_END);
+       LASSERTF(LCFG_LOV_ADD_INA == 0x000ce013UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOV_ADD_INA);
+       LASSERTF(LCFG_ADD_MDC == 0x000cf014UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_ADD_MDC);
+       LASSERTF(LCFG_DEL_MDC == 0x000cf015UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DEL_MDC);
+       LASSERTF(LCFG_SPTLRPC_CONF == 0x000ce016UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SPTLRPC_CONF);
+       LASSERTF(LCFG_POOL_NEW == 0x000ce020UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_POOL_NEW);
+       LASSERTF(LCFG_POOL_ADD == 0x000ce021UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_POOL_ADD);
+       LASSERTF(LCFG_POOL_REM == 0x000ce022UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_POOL_REM);
+       LASSERTF(LCFG_POOL_DEL == 0x000ce023UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_POOL_DEL);
+       LASSERTF(LCFG_SET_LDLM_TIMEOUT == 0x000ce030UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SET_LDLM_TIMEOUT);
+       LASSERTF(LCFG_PRE_CLEANUP == 0x000cf031UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_PRE_CLEANUP);
+       LASSERTF(LCFG_SET_PARAM == 0x000ce032UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SET_PARAM);
+       LASSERTF(LCFG_NODEMAP_ADD == 0x000ce040UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD);
+       LASSERTF(LCFG_NODEMAP_DEL == 0x000ce041UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL);
+       LASSERTF(LCFG_NODEMAP_ADD_RANGE == 0x000ce042UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD_RANGE);
+       LASSERTF(LCFG_NODEMAP_DEL_RANGE == 0x000ce043UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL_RANGE);
+       LASSERTF(LCFG_NODEMAP_ADD_UIDMAP == 0x000ce044UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD_UIDMAP);
+       LASSERTF(LCFG_NODEMAP_DEL_UIDMAP == 0x000ce045UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL_UIDMAP);
+       LASSERTF(LCFG_NODEMAP_ADD_GIDMAP == 0x000ce046UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD_GIDMAP);
+       LASSERTF(LCFG_NODEMAP_DEL_GIDMAP == 0x000ce047UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL_GIDMAP);
+       LASSERTF(LCFG_NODEMAP_ACTIVATE == 0x000ce048UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ACTIVATE);
+       LASSERTF(LCFG_NODEMAP_ADMIN == 0x000ce049UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADMIN);
+       LASSERTF(LCFG_NODEMAP_TRUSTED == 0x000ce050UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_TRUSTED);
+       LASSERTF(LCFG_NODEMAP_SQUASH_UID == 0x000ce051UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_SQUASH_UID);
+       LASSERTF(LCFG_NODEMAP_SQUASH_GID == 0x000ce052UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_SQUASH_GID);
+       LASSERTF(LCFG_NODEMAP_ADD_SHKEY == 0x000ce053UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD_SHKEY);
+       LASSERTF(LCFG_NODEMAP_DEL_SHKEY == 0x000ce054UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL_SHKEY);
+       LASSERTF(LCFG_NODEMAP_TEST_NID == 0x000ce055UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_TEST_NID);
+       LASSERTF(LCFG_NODEMAP_TEST_ID == 0x000ce056UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_TEST_ID);
+       LASSERTF(LCFG_NODEMAP_SET_FILESET == 0x000ce057UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_SET_FILESET);
+       LASSERTF(LCFG_NODEMAP_DENY_UNKNOWN == 0x000ce058UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DENY_UNKNOWN);
+       LASSERTF(LCFG_NODEMAP_MAP_MODE == 0x000ce059UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_MAP_MODE);
+       LASSERTF(LCFG_NODEMAP_AUDIT_MODE == 0x000ce05aUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_AUDIT_MODE);
+       LASSERTF(LCFG_NODEMAP_SET_SEPOL == 0x000ce05bUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_SET_SEPOL);
+       LASSERTF(PORTALS_CFG_TYPE == 1, "found %lld\n",
+                (long long)PORTALS_CFG_TYPE);
+       LASSERTF(LUSTRE_CFG_TYPE == 123, "found %lld\n",
+                (long long)LUSTRE_CFG_TYPE);
 }