From: Leon Romanovsky <leonro@mellanox.com>
Date: Thu, 15 Jun 2017 13:14:13 +0300
Subject: RDMA/netlink: Reduce indirection access to cb_table
Patch-mainline: v4.14-rc1
Git-commit: c729943a77c108253c46b2d50c8a15a888facf4c
References: bsc#1046306 FATE#322942
Introduce intermediate variable to store access to fields
of cb_table.
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/infiniband/core/netlink.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -155,12 +155,15 @@ static int rdma_nl_rcv_msg(struct sk_buf
unsigned int op = RDMA_NL_GET_OP(type);
struct netlink_callback cb = {};
struct netlink_dump_control c = {};
+ const struct rdma_nl_cbs *cb_table;
int ret;
if (!is_nl_valid(index, op))
return -EINVAL;
- if ((rdma_nl_types[index].cb_table[op].flags & RDMA_NL_ADMIN_PERM) &&
+ cb_table = rdma_nl_types[type].cb_table;
+
+ if ((cb_table[op].flags & RDMA_NL_ADMIN_PERM) &&
!netlink_capable(skb, CAP_NET_ADMIN))
return -EPERM;
@@ -172,14 +175,14 @@ static int rdma_nl_rcv_msg(struct sk_buf
(index == RDMA_NL_LS && op == RDMA_NL_LS_OP_SET_TIMEOUT)) {
cb.skb = skb;
cb.nlh = nlh;
- cb.dump = rdma_nl_types[index].cb_table[op].dump;
+ cb.dump = cb_table[op].dump;
return cb.dump(skb, &cb);
} else {
- c.dump = rdma_nl_types[index].cb_table[op].dump;
+ c.dump = cb_table[op].dump;
return netlink_dump_start(nls, skb, nlh, &c);
}
- if (rdma_nl_types[index].cb_table[op].doit)
- ret = rdma_nl_types[index].cb_table[op].doit(skb, nlh, extack);
+ if (cb_table[op].doit)
+ ret = cb_table[op].doit(skb, nlh, extack);
return ret;
}