Re: [PATCH v3 1/3] IB/core: Removed port validity check from ib_get_cached_subnet_prefix
From: Leon Romanovsky <leon@kernel.org>
Date: 2021-06-09 08:37:28
Also in:
lkml
On Wed, Jun 09, 2021 at 11:25:32AM +0530, Anand Khoje wrote:
quoted hunk ↗ jump to hunk
Removed port validity check from ib_get_cached_subnet_prefix() as this check is not needed because "port_num" is valid. Suggested-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: Anand Khoje <redacted> Signed-off-by: Haakon Bugge <redacted> --- v1 -> v2: - Added changes as per Leon's suggestion of removing port validity check from ib_get_cached_subnet_prefix(). - Split the v1 patch in 3 patches as per Leon's suggestion. v2 -> v3: - Added some formatting changes per Leon's suggestions and removed return from ib_get_cached_subnet_prefix. --- drivers/infiniband/core/cache.c | 6 +----- drivers/infiniband/core/core_priv.h | 2 +- drivers/infiniband/core/device.c | 13 ++++--------- drivers/infiniband/core/security.c | 7 ++----- 4 files changed, 8 insertions(+), 20 deletions(-)diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c index 3b0991fedd81..e957f0c915a3 100644 --- a/drivers/infiniband/core/cache.c +++ b/drivers/infiniband/core/cache.c@@ -1069,19 +1069,15 @@ int ib_get_cached_pkey(struct ib_device *device, } EXPORT_SYMBOL(ib_get_cached_pkey); -int ib_get_cached_subnet_prefix(struct ib_device *device, u32 port_num, +void ib_get_cached_subnet_prefix(struct ib_device *device, u32 port_num, u64 *sn_pfx) { unsigned long flags; - if (!rdma_is_port_valid(device, port_num)) - return -EINVAL; - read_lock_irqsave(&device->cache_lock, flags); *sn_pfx = device->port_data[port_num].cache.subnet_prefix; read_unlock_irqrestore(&device->cache_lock, flags); - return 0; } EXPORT_SYMBOL(ib_get_cached_subnet_prefix);diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h index 29809dd30041..0b23f50fa958 100644 --- a/drivers/infiniband/core/core_priv.h +++ b/drivers/infiniband/core/core_priv.h@@ -214,7 +214,7 @@ int ib_nl_handle_ip_res_resp(struct sk_buff *skb, struct nlmsghdr *nlh, struct netlink_ext_ack *extack); -int ib_get_cached_subnet_prefix(struct ib_device *device, +void ib_get_cached_subnet_prefix(struct ib_device *device, u32 port_num, u64 *sn_pfx);diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index c660cef66ac6..595128b26c34 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c@@ -886,15 +886,10 @@ static void ib_policy_change_task(struct work_struct *work) rdma_for_each_port (dev, i) { u64 sp; - int ret = ib_get_cached_subnet_prefix(dev, - i, - &sp); - - WARN_ONCE(ret, - "ib_get_cached_subnet_prefix err: %d, this should never happen here\n", - ret); - if (!ret) - ib_security_cache_change(dev, i, sp); + + ib_get_cached_subnet_prefix(dev, i, &sp); + + ib_security_cache_change(dev, i, sp);
nitpick, the blank line is not needed. Thanks, Reviewed-by: Leon Romanovsky <leonro@nvidia.com>