Skip to content

Commit d6567d8

Browse files
committed
issue: 4409248 Fix RoCE LAG warning
We can not disable RoCE LAG (deprecated option in OFED 5.1). Signed-off-by: Bashar Abdelgafer <[email protected]>
1 parent 81a1553 commit d6567d8

File tree

3 files changed

+7
-15
lines changed

3 files changed

+7
-15
lines changed

src/core/dev/net_device_val.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,8 +1479,7 @@ bool net_device_val::verify_bond_or_eth_qp_creation()
14791479
guid_iter->second.front().c_str()) &&
14801480
check_bond_roce_lag_exist(bond_roce_lag_path, sizeof(bond_roce_lag_path),
14811481
guid_iter->second.back().c_str())) {
1482-
print_roce_lag_warnings(get_ifname_link(), bond_roce_lag_path,
1483-
guid_iter->second.front().c_str(),
1482+
print_roce_lag_warnings(get_ifname_link(), guid_iter->second.front().c_str(),
14841483
guid_iter->second.back().c_str());
14851484
}
14861485
}
@@ -1532,7 +1531,7 @@ bool net_device_val::verify_qp_creation(const char *ifname, enum ibv_qp_type qp_
15321531
nd_logdbg("Cant find ib_ctx for interface %s", base_ifname);
15331532
if (qp_type == IBV_QPT_RAW_PACKET && m_bond != NO_BOND) {
15341533
if (check_bond_roce_lag_exist(bond_roce_lag_path, sizeof(bond_roce_lag_path), ifname)) {
1535-
print_roce_lag_warnings(get_ifname_link(), bond_roce_lag_path);
1534+
print_roce_lag_warnings(get_ifname_link());
15361535
} else if ((p_ib_ctx = g_p_ib_ctx_handler_collection->get_ib_ctx(get_ifname_link())) &&
15371536
strstr(p_ib_ctx->get_ibname(), "bond")) {
15381537
print_roce_lag_warnings(get_ifname_link());

src/core/util/utils.cpp

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ int get_base_interface_name(const char *if_name, char *base_ifname, size_t sz_ba
164164
return 0;
165165
}
166166

167-
void print_roce_lag_warnings(const char *interface, char *disable_path /* = NULL */,
168-
const char *port1 /* = NULL */, const char *port2 /* = NULL */)
167+
void print_roce_lag_warnings(const char *interface, const char *port1 /* = NULL */,
168+
const char *port2 /* = NULL */)
169169
{
170170
vlog_printf(VLOG_WARNING,
171171
"**********************************************************************************"
@@ -180,14 +180,7 @@ void print_roce_lag_warnings(const char *interface, char *disable_path /* = NULL
180180
} else {
181181
vlog_printf(VLOG_WARNING, "* Interface %s will not be offloaded.\n", interface);
182182
vlog_printf(VLOG_WARNING,
183-
"* " PRODUCT_NAME " cannot offload the device while RoCE LAG is enabled.\n");
184-
}
185-
186-
vlog_printf(VLOG_WARNING, "* Please refer to " PRODUCT_NAME " Release Notes for more info\n");
187-
188-
if (disable_path) {
189-
vlog_printf(VLOG_WARNING, "* In order to disable RoCE LAG please use:\n");
190-
vlog_printf(VLOG_WARNING, "* echo 0 > %s\n", disable_path);
183+
"* " PRODUCT_NAME " cannot offload the device; issue with RoCE LAG.\n");
191184
}
192185
vlog_printf(VLOG_WARNING,
193186
"**********************************************************************************"

src/core/util/utils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ size_t get_vlan_base_name_from_ifname(const char *ifname, char *base_ifname, siz
255255
size_t get_local_ll_addr(const char *ifname, unsigned char *addr, int addr_len, bool is_broadcast);
256256

257257
/* Print warning while RoCE Lag is enabled */
258-
void print_roce_lag_warnings(const char *interface, char *disable_path = nullptr,
259-
const char *port1 = nullptr, const char *port2 = nullptr);
258+
void print_roce_lag_warnings(const char *interface, const char *port1 = nullptr,
259+
const char *port2 = nullptr);
260260

261261
/*Print a warning to the user when there was an error registering memory*/
262262
void print_warning_rlimit_memlock(size_t length, int error);

0 commit comments

Comments
 (0)