Commit 2cb39269 authored May 12, 2021 by Lang Cheng Committed by Zheng Zengkai Jul 20, 2021

RDMA/hns: Remove unused parameter udata

mainline inclusion
from mainline-v5.12-rc1
commit 69e0a42f
category: bugfix
bugzilla: 174002
CVE:NA

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

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

The old version of ib_umem_get() need these udata as a parameter but now
they are unnecessary.

Fixes: c320e527 ("IB: Allow calls to ib_umem_get from kernel ULPs")
Link: https://lore.kernel.org/r/1620807142-39157-2-git-send-email-liweihang@huawei.com


Signed-off-by: Lang Cheng <chenglang@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: wangsirong <wangsirong@huawei.com>
Reviewed-by: ChunZhi Hu <huchunzhi@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent a77e1f87

drivers/infiniband/hw/hns/hns_roce_cq.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -234,8 +234,7 @@ static int alloc_cq_db(struct hns_roce_dev hr_dev, struct hns_roce_cq hr_cq,
		udata->outlen >= offsetofend(typeof(*resp), cap_flags)) {
		uctx = rdma_udata_to_drv_context(udata,
		struct hns_roce_ucontext, ibucontext);
		err = hns_roce_db_map_user(uctx, udata, addr,
		&hr_cq->db);
		err = hns_roce_db_map_user(uctx, addr, &hr_cq->db);
		if (err)
		return err;
		hr_cq->flags \|= HNS_ROCE_CQ_FLAG_RECORD_DB;

drivers/infiniband/hw/hns/hns_roce_db.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -8,8 +8,7 @@
		#include <rdma/ib_umem.h>
		#include "hns_roce_device.h"

		int hns_roce_db_map_user(struct hns_roce_ucontext *context,
		struct ib_udata *udata, unsigned long virt,
		int hns_roce_db_map_user(struct hns_roce_ucontext *context, unsigned long virt,
		struct hns_roce_db *db)
		{
		unsigned long page_addr = virt & PAGE_MASK;

drivers/infiniband/hw/hns/hns_roce_device.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -1247,8 +1247,7 @@ int hns_roce_create_cq(struct ib_cq ib_cq, const struct ib_cq_init_attr attr,
		struct ib_udata *udata);

		int hns_roce_destroy_cq(struct ib_cq ib_cq, struct ib_udata udata);
		int hns_roce_db_map_user(struct hns_roce_ucontext *context,
		struct ib_udata *udata, unsigned long virt,
		int hns_roce_db_map_user(struct hns_roce_ucontext *context, unsigned long virt,
		struct hns_roce_db *db);
		void hns_roce_db_unmap_user(struct hns_roce_ucontext *context,
		struct hns_roce_db *db);

drivers/infiniband/hw/hns/hns_roce_qp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -826,7 +826,7 @@ static int alloc_qp_db(struct hns_roce_dev hr_dev, struct hns_roce_qp hr_qp,

		if (udata) {
		if (user_qp_has_sdb(hr_dev, init_attr, udata, resp, ucmd)) {
		ret = hns_roce_db_map_user(uctx, udata, ucmd->sdb_addr,
		ret = hns_roce_db_map_user(uctx, ucmd->sdb_addr,
		&hr_qp->sdb);
		if (ret) {
		ibdev_err(ibdev,
		@@ -839,7 +839,7 @@ static int alloc_qp_db(struct hns_roce_dev hr_dev, struct hns_roce_qp hr_qp,
		}

		if (user_qp_has_rdb(hr_dev, init_attr, udata, resp)) {
		ret = hns_roce_db_map_user(uctx, udata, ucmd->db_addr,
		ret = hns_roce_db_map_user(uctx, ucmd->db_addr,
		&hr_qp->rdb);
		if (ret) {
		ibdev_err(ibdev,