UCT/IB: Fix RoCE version extraction with traffic class flag

The UCT_IB_ADDRESS_FLAG_TRAFFIC_CLASS at BIT(7) overlaps with the
RoCE version bits in the flags byte. The version extraction does
flags >> 5, which includes bit 7, corrupting the RoCE version when
traffic class is packed. Mask out the traffic class flag before
extracting the version.

Also initialize traffic_class in test pack_params to avoid reading
uninitialized memory when the traffic class flag is set.

Author: ndg8743

src/uct/ib/base/ib_iface.c

@@ -353,7 +353,11 @@ static inline uct_ib_roce_version_t
 uct_ib_address_flags_get_roce_version(uint8_t flags)
 {
     ucs_assert(flags & UCT_IB_ADDRESS_FLAG_LINK_LAYER_ETH);
-    return (uct_ib_roce_version_t)(flags >> ucs_ilog2(UCT_IB_ADDRESS_FLAG_ETH_LAST));
+    /* Mask out the traffic class flag (bit 7) which is above the RoCE version
+     * bits (5-6) to avoid corrupting the extracted version */
+    return (uct_ib_roce_version_t)((flags &
+                                    ~UCT_IB_ADDRESS_FLAG_TRAFFIC_CLASS) >>
+                                   ucs_ilog2(UCT_IB_ADDRESS_FLAG_ETH_LAST));
 }
 
 static inline sa_family_t

test/gtest/uct/ib/test_ib.cc

@@ -102,8 +102,9 @@ class test_uct_ib_addr : public test_uct_ib {
         pack_params.lid       = lid_in;
         pack_params.roce_info = iface->gid_info.roce_info;
         pack_params.path_mtu  = iface->config.path_mtu;
-        pack_params.gid_index = std::numeric_limits<uint8_t>::max();
-        pack_params.pkey      = iface->pkey;
+        pack_params.gid_index     = std::numeric_limits<uint8_t>::max();
+        pack_params.pkey          = iface->pkey;
+        pack_params.traffic_class = iface->config.traffic_class;
         address_size          = uct_ib_address_size(&pack_params);
         ib_addr               = (uct_ib_address_t*)malloc(address_size);
         uct_ib_address_pack(&pack_params, ib_addr);