From fe81fa253e1c142b0c77488e293dabc585c878d0 Mon Sep 17 00:00:00 2001 From: Qian Yingjin Date: Mon, 30 Nov 2020 10:08:17 +0800 Subject: [PATCH] LU-10499 statahead: introducing OBD_CONNECT2_BATCH_RPC flag Add a new connection flag OBD_CONNECT2_BATCH_RPC flag for multi-RPC aggregation. By necessity, also include definitions for OBD_CONNECT2_REP_MBITS, OBD_CONNECT2_MODE_CONVERT so obd_connect_names[] works. Lustre-change: https://review.whamcloud.com/40791 Lustre-commit: 6007dc9382df7260841a4748158307ade25f22ef Test-Parameters: trivial Signed-off-by: Qian Yingjin Reviewed-by: Andreas Dilger Reviewed-by: Wang Shilong Change-Id: I05369c3ece75119eb3363d05065a0bb929839b4a Reviewed-on: https://review.whamcloud.com/46107 Reviewed-by: Lai Siyao Tested-by: jenkins Tested-by: Maloo --- lustre/include/uapi/linux/lustre/lustre_idl.h | 3 +++ lustre/ptlrpc/wiretest.c | 6 ++++++ lustre/utils/wirecheck.c | 3 +++ lustre/utils/wiretest.c | 6 ++++++ 4 files changed, 18 insertions(+) diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h index 3647e84..b3bea37 100644 --- a/lustre/include/uapi/linux/lustre/lustre_idl.h +++ b/lustre/include/uapi/linux/lustre/lustre_idl.h @@ -871,6 +871,9 @@ struct ptlrpc_body_v2 { #define OBD_CONNECT2_GETATTR_PFID 0x20000ULL /* pack parent FID in getattr */ #define OBD_CONNECT2_LSEEK 0x40000ULL /* SEEK_HOLE/DATA RPC */ #define OBD_CONNECT2_DOM_LVB 0x80000ULL /* pack DOM glimpse data in LVB */ +#define OBD_CONNECT2_REP_MBITS 0x100000ULL /* match reply mbits not xid*/ +#define OBD_CONNECT2_MODE_CONVERT 0x200000ULL /* LDLM mode convert */ +#define OBD_CONNECT2_BATCH_RPC 0x400000ULL /* Multi-RPC batch request */ #define OBD_CONNECT2_PCCRO 0x800000ULL /* Read-only PCC */ #define OBD_CONNECT2_ATOMIC_OPEN_LOCK 0x4000000ULL/* request lock on 1st open */ /* XXX README XXX: diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index 2028f7a..b07ed8e 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -1381,6 +1381,12 @@ void lustre_assert_wire_constants(void) OBD_CONNECT2_LSEEK); LASSERTF(OBD_CONNECT2_DOM_LVB == 0x80000ULL, "found 0x%.16llxULL\n", OBD_CONNECT2_DOM_LVB); + LASSERTF(OBD_CONNECT2_REP_MBITS == 0x100000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT2_REP_MBITS); + LASSERTF(OBD_CONNECT2_MODE_CONVERT == 0x200000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT2_MODE_CONVERT); + LASSERTF(OBD_CONNECT2_BATCH_RPC == 0x400000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT2_BATCH_RPC); LASSERTF(OBD_CONNECT2_PCCRO == 0x800000ULL, "found 0x%.16llxULL\n", OBD_CONNECT2_PCCRO); LASSERTF(OBD_CONNECT2_ATOMIC_OPEN_LOCK == 0x4000000ULL, "found 0x%.16llxULL\n", diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index dfe739a..c7a6550 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -627,6 +627,9 @@ check_obd_connect_data(void) CHECK_DEFINE_64X(OBD_CONNECT2_GETATTR_PFID); CHECK_DEFINE_64X(OBD_CONNECT2_LSEEK); CHECK_DEFINE_64X(OBD_CONNECT2_DOM_LVB); + CHECK_DEFINE_64X(OBD_CONNECT2_REP_MBITS); + CHECK_DEFINE_64X(OBD_CONNECT2_MODE_CONVERT); + CHECK_DEFINE_64X(OBD_CONNECT2_BATCH_RPC); CHECK_DEFINE_64X(OBD_CONNECT2_PCCRO); CHECK_DEFINE_64X(OBD_CONNECT2_ATOMIC_OPEN_LOCK); diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index 2fc44a8..50d4e77 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -1417,6 +1417,12 @@ void lustre_assert_wire_constants(void) OBD_CONNECT2_LSEEK); LASSERTF(OBD_CONNECT2_DOM_LVB == 0x80000ULL, "found 0x%.16llxULL\n", OBD_CONNECT2_DOM_LVB); + LASSERTF(OBD_CONNECT2_REP_MBITS == 0x100000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT2_REP_MBITS); + LASSERTF(OBD_CONNECT2_MODE_CONVERT == 0x200000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT2_MODE_CONVERT); + LASSERTF(OBD_CONNECT2_BATCH_RPC == 0x400000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT2_BATCH_RPC); LASSERTF(OBD_CONNECT2_PCCRO == 0x800000ULL, "found 0x%.16llxULL\n", OBD_CONNECT2_PCCRO); LASSERTF(OBD_CONNECT2_ATOMIC_OPEN_LOCK == 0x4000000ULL, "found 0x%.16llxULL\n", -- 1.8.3.1