Andrew Lukoshko
b3393f484c
Drop the 211.7.x security-ahead patches superseded by the RHEL 211.8.1..211.16.1 backports (1100-1104), add those backports (1106-1161) from centos-stream-10 and upstream linux-6.12.y. Keep the smb cifs.spnego ahead-fix (1105). Bump to 211.16.1.
80 lines
2.7 KiB
Diff
80 lines
2.7 KiB
Diff
From 5cda728320e19c716ddf48cd704360d164af5775 Mon Sep 17 00:00:00 2001
|
|
From: Sreekanth Reddy <sreeredd@redhat.com>
|
|
Date: Tue, 19 Aug 2025 14:10:02 -0700
|
|
Subject: [PATCH] RDMA/bnxt_re: Fix missing error handling for tx_queue
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-108694
|
|
|
|
commit e3d57a00d4d1f36689e9eab80b60d5024361efec
|
|
Author: Gautam R A <gautam-r.a@broadcom.com>
|
|
Date: Tue May 20 09:29:08 2025 +0530
|
|
|
|
RDMA/bnxt_re: Fix missing error handling for tx_queue
|
|
|
|
bnxt_re_fill_gen0_ext0() did not return an error when
|
|
attempting to modify CMDQ_MODIFY_ROCE_CC_MODIFY_MASK_TX_QUEUE,
|
|
leading to silent failures.
|
|
|
|
Fixed this by returning -EOPNOTSUPP for tx_queue modifications and
|
|
ensuring proper error propagation in bnxt_re_configure_cc().
|
|
|
|
Fixes: 656dff55da19 ("RDMA/bnxt_re: Congestion control settings using debugfs hook")
|
|
Signed-off-by: Gautam R A <gautam-r.a@broadcom.com>
|
|
Link: https://patch.msgid.link/20250520035910.1061918-3-kalesh-anakkur.purayil@broadcom.com
|
|
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
|
|
Signed-off-by: Leon Romanovsky <leon@kernel.org>
|
|
|
|
Signed-off-by: Sreekanth Reddy <sreeredd@redhat.com>
|
|
|
|
diff --git a/drivers/infiniband/hw/bnxt_re/debugfs.c b/drivers/infiniband/hw/bnxt_re/debugfs.c
|
|
index a3aad6c3dbec..9f6392155d91 100644
|
|
--- a/drivers/infiniband/hw/bnxt_re/debugfs.c
|
|
+++ b/drivers/infiniband/hw/bnxt_re/debugfs.c
|
|
@@ -206,7 +206,7 @@ static ssize_t bnxt_re_cc_config_get(struct file *filp, char __user *buffer,
|
|
return simple_read_from_buffer(buffer, usr_buf_len, ppos, (u8 *)(buf), rc);
|
|
}
|
|
|
|
-static void bnxt_re_fill_gen0_ext0(struct bnxt_qplib_cc_param *ccparam, u32 offset, u32 val)
|
|
+static int bnxt_re_fill_gen0_ext0(struct bnxt_qplib_cc_param *ccparam, u32 offset, u32 val)
|
|
{
|
|
u32 modify_mask;
|
|
|
|
@@ -250,7 +250,7 @@ static void bnxt_re_fill_gen0_ext0(struct bnxt_qplib_cc_param *ccparam, u32 offs
|
|
ccparam->tcp_cp = val;
|
|
break;
|
|
case CMDQ_MODIFY_ROCE_CC_MODIFY_MASK_TX_QUEUE:
|
|
- break;
|
|
+ return -EOPNOTSUPP;
|
|
case CMDQ_MODIFY_ROCE_CC_MODIFY_MASK_INACTIVITY_CP:
|
|
ccparam->inact_th = val;
|
|
break;
|
|
@@ -263,18 +263,21 @@ static void bnxt_re_fill_gen0_ext0(struct bnxt_qplib_cc_param *ccparam, u32 offs
|
|
}
|
|
|
|
ccparam->mask = modify_mask;
|
|
+ return 0;
|
|
}
|
|
|
|
static int bnxt_re_configure_cc(struct bnxt_re_dev *rdev, u32 gen_ext, u32 offset, u32 val)
|
|
{
|
|
struct bnxt_qplib_cc_param ccparam = { };
|
|
+ int rc;
|
|
|
|
- /* Supporting only Gen 0 now */
|
|
- if (gen_ext == CC_CONFIG_GEN0_EXT0)
|
|
- bnxt_re_fill_gen0_ext0(&ccparam, offset, val);
|
|
- else
|
|
+ if (gen_ext != CC_CONFIG_GEN0_EXT0)
|
|
return -EINVAL;
|
|
|
|
+ rc = bnxt_re_fill_gen0_ext0(&ccparam, offset, val);
|
|
+ if (rc)
|
|
+ return rc;
|
|
+
|
|
bnxt_qplib_modify_cc(&rdev->qplib_res, &ccparam);
|
|
return 0;
|
|
}
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|