LU-10391 lnet: set msg field for lnet message header

During testing messages sent for larger NID setups was missing
the actual message. Fill in the header msg field to properly
send the total message.

Test-Parameters: trivial testlist=sanity-lnet
Test-Parameters: serverversion=2.12 serverdistro=el7.9 testlist=runtests
Test-Parameters: clientversion=2.12 testlist=runtests
Fixes: 7b31ef0bbac ("LU-10391 socklnd: add hello message version 4")
Change-Id: I36ef48a239a64a9002f8dc2683437bc3c57492e6
Signed-off-by: James Simmons <jsimmons@infradead.org>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50716
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Frank Sehr <fsehr@whamcloud.com>
Reviewed-by: Serguei Smirnov <ssmirnov@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h
index 66db8d8..9b09467 100644 (file)
--- a/lnet/include/lnet/lib-lnet.h
+++ b/lnet/include/lnet/lib-lnet.h
@@ -570,6 +570,8 @@ static inline void lnet_hdr_from_nid16(struct lnet_hdr *hdr,
        hdr->src_pid = le32_to_cpu(hdr16->src_pid);
        hdr->type = le32_to_cpu(hdr16->type);
        hdr->payload_length = le32_to_cpu(hdr16->payload_length);
+
+       hdr->msg = hdr16->msg;
 }
 
 static inline void lnet_hdr_to_nid16(const struct lnet_hdr *hdr,
@@ -583,6 +585,8 @@ static inline void lnet_hdr_to_nid16(const struct lnet_hdr *hdr,
        hdr16->src_pid = cpu_to_le32(hdr->src_pid);
        hdr16->type = cpu_to_le32(hdr->type);
        hdr16->payload_length = cpu_to_le32(hdr->payload_length);
+
+       hdr16->msg = hdr->msg;
 }
 
 extern const struct lnet_lnd the_lolnd;