LU-17706 lnet: reserve TOFULND and EFALND

Reserve network numbers for Fujitsu Torus Fusion LND and Amazon
Elastic Fabric Adapter LND to avoid hard-to-fix conflicts in the
future.

Add comments for the other LND numbers to provide some context.

Test-Parameters: trivial
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Icea6cecf5a951c5a44527c937a2631c9cc3ebbe5
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54674
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Chris Horn <chris.horn@hpe.com>
Reviewed-by: Shuichi Ihara <sihara@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lnet/include/uapi/linux/lnet/nidstr.h b/lnet/include/uapi/linux/lnet/nidstr.h
index 7f7781b..6bc44ef 100644 (file)
--- a/lnet/include/uapi/linux/lnet/nidstr.h
+++ b/lnet/include/uapi/linux/lnet/nidstr.h
@@ -19,24 +19,38 @@
  */
 enum {
        /* Only add to these values (i.e. don't ever change or redefine them):
-        * network addresses depend on them... */
-       /*QSWLND        = 1, removed v2_7_50                 */
-       SOCKLND         = 2,
-       /*GMLND         = 3, removed v2_0_0-rc1a-16-gc660aac */
-       /*PTLLND        = 4, removed v2_7_50                 */
-       O2IBLND         = 5,
-       /*CIBLND        = 6, removed v2_0_0-rc1a-175-gd2b8a0e */
-       /*OPENIBLND     = 7, removed v2_0_0-rc1a-175-gd2b8a0e */
-       /*IIBLND        = 8, removed v2_0_0-rc1a-175-gd2b8a0e */
-       LOLND           = 9,
-       /*RALND         = 10, removed v2_7_50_0-34-g8be9e41    */
-       /*VIBLND        = 11, removed v2_0_0-rc1a-175-gd2b8a0e */
-       /*MXLND         = 12, removed v2_7_50_0-34-g8be9e41    */
-       GNILND          = 13,
-       GNIIPLND        = 14,
-       PTL4LND         = 15,
-       KFILND          = 16,
-
+        * network addresses depend on them...
+        *
+        * It is important to keep these definitions and the nidstring handlers
+        * in libcfs_netstrfns[] around for several releases after the actual
+        * LND support has been removed, so that it is still possible to use
+        * LNet routers between peers that may still be using the old LND type.
+        *
+        * The "removed" version is when the LND code was deleted.
+        * The nidstring handling was removed several releases later.
+        */
+       /* QSWLND       = 1,  removed v2_7_50_0-34-g8be9e41369        */
+       SOCKLND         = 2,  /* TCP Sockets                          */
+       /* GMLND        = 3,  removed v2_0_0-rc1a-16-gc660aac3        */
+       /* PTLLND       = 4,  removed v2_7_50_0-34-g8be9e41369        */
+       O2IBLND         = 5,  /* OpenFabrics Alliance OFED v2         */
+       /* CIBLND       = 6,  removed v2_0_0-rc1a-175-gd2b8a0e        */
+       /* OPENIBLND    = 7,  removed v2_0_0-rc1a-175-gd2b8a0e        */
+       /* IIBLND       = 8,  removed v2_0_0-rc1a-175-gd2b8a0e        */
+       LOLND           = 9,  /* LNet internal loopback/memcpy        */
+       /* RALND        = 10, removed v2_7_50_0-34-g8be9e41369        */
+       /* VIBLND       = 11, removed v2_0_0-rc1a-175-gd2b8a0e        */
+       /* MXLND        = 12, removed v2_7_50_0-34-g8be9e41369        */
+       GNILND          = 13, /* Cray/HPE Gemini Network Interface    */
+       GNIIPLND        = 14, /* Cray/HPE Gemini IP Network Interface */
+       PTL4LND         = 15, /* ATOS/Bull Portals 4 for BXI          */
+       KFILND          = 16, /* HPE Kernel Fabric Interface          */
+       TOFULND         = 17, /* Fujitsu Torus Fusion                 */
+       EFALND          = 18, /* Amazon Elastic Fabric Adapter        */
+       /* Please email adilger@whamcloud.com and lustre-devel@lists.lustre.org
+        * to reserve new LND numbers before they are used anywhere.  This only
+        * takes a few minutes, and will save everyone a lot of grief later.
+        */
        NUM_LNDS
 };