Commit 0ab9f4c3 authored by Selvin Xavier's avatar Selvin Xavier Committed by Zhang Changzhong
Browse files

RDMA/bnxt_re: Avoid CPU lockups due fifo occupancy check loop 

mainline inclusion
from mainline-v6.12-rc4
commit 8be3e5b0c96beeefe9d5486b96575d104d3e7d17
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB2SU7
CVE: CVE-2024-50157

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8be3e5b0c96beeefe9d5486b96575d104d3e7d17

--------------------------------

Driver waits indefinitely for the fifo occupancy to go below a threshold
as soon as the pacing interrupt is received. This can cause soft lockup on
one of the processors, if the rate of DB is very high.

Add a loop count for FPGA and exit the __wait_for_fifo_occupancy_below_th
if the loop is taking more time. Pacing will be continuing until the
occupancy is below the threshold. This is ensured by the checks in
bnxt_re_pacing_timer_exp and further scheduling the work for pacing based
on the fifo occupancy.

Fixes: 2ad4e630 ("RDMA/bnxt_re: Implement doorbell pacing algorithm")
Link: https://patch.msgid.link/r/1728373302-19530-7-git-send-email-selvin.xavier@broadcom.com


Reviewed-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: default avatarChandramohan Akula <chandramohan.akula@broadcom.com>
Signed-off-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Conflicts:
	drivers/infiniband/hw/bnxt_re/main.c
[24943dcdc156 ("RDMA/bnxt_re: Disable doorbell moderation if hardware
register read fails") not merged]
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parent 8a039651

drivers/infiniband/hw/bnxt_re/main.c

+10 −0
Original line number Diff line number Diff line
@@ -484,6 +484,8 @@ static void bnxt_re_set_default_pacing_data(struct bnxt_re_dev *rdev) 


static void __wait_for_fifo_occupancy_below_th(struct bnxt_re_dev *rdev)

{

	struct bnxt_qplib_db_pacing_data *pacing_data = rdev->qplib_res.pacing_data;

	u32 retry_fifo_check = 1000;

	u32 read_val, fifo_occup;



	/* loop shouldn't run infintely as the occupancy usually goes
@@ -500,6 +502,14 @@ static void __wait_for_fifo_occupancy_below_th(struct bnxt_re_dev *rdev) 


		if (fifo_occup < rdev->qplib_res.pacing_data->pacing_th)

			break;

		if (!retry_fifo_check--) {

			dev_info_once(rdev_to_dev(rdev),

				      "%s: fifo_occup = 0x%xfifo_max_depth = 0x%x pacing_th = 0x%x\n",

				      __func__, fifo_occup, pacing_data->fifo_max_depth,

					pacing_data->pacing_th);

			break;

		}



	}

}