From: Leon Romanovsky <leon@kernel.org>
To: Doug Ledford <dledford@redhat.com>
Cc: linux-rdma@vger.kernel.org,
Stephen Hemminger <stephen@networkplumber.org>,
Ariel Almog <ariela@mellanox.com>,
Linux Netdev <netdev@vger.kernel.org>,
Leon Romanovsky <leonro@mellanox.com>
Subject: [PATCH rdma-next V2 09/27] RDMA/netlink: Add and implement doit netlink callback
Date: Mon, 3 Jul 2017 09:28:12 +0300 [thread overview]
Message-ID: <20170703062830.30361-10-leon@kernel.org> (raw)
In-Reply-To: <20170703062830.30361-1-leon@kernel.org>
From: Leon Romanovsky <leonro@mellanox.com>
The .doit callback is used by netlink core to differentiate
between get and set operations. Common convention is to use
that call for command operations like (SET, ADD, e.t.c.) and/or
access without NLF_M_DUMP flag.
This commit adds proper declaration and implementation
to RDMA netlink.
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
---
drivers/infiniband/core/netlink.c | 19 ++++++++++++++-----
include/rdma/rdma_netlink.h | 2 ++
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
index 4d8c8b5583c6..f98f9fe86d0a 100644
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -76,9 +76,13 @@ static bool is_nl_msg_valid(unsigned int type, unsigned int op)
static bool is_nl_valid(unsigned int type, unsigned int op)
{
- if (!is_nl_msg_valid(type, op) ||
- !rdma_nl_types[type].cb_table ||
- !rdma_nl_types[type].cb_table[op].dump)
+ const struct rdma_nl_cbs *cb_table;
+
+ if (!is_nl_msg_valid(type, op))
+ return false;
+
+ cb_table = rdma_nl_types[type].cb_table;
+ if (!cb_table || (!cb_table[op].dump && !cb_table[op].doit))
return false;
return true;
}
@@ -153,6 +157,7 @@ static int rdma_nl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
unsigned int op = RDMA_NL_GET_OP(type);
struct netlink_callback cb = {};
struct netlink_dump_control c = {};
+ int ret;
if (!is_nl_valid(index, op))
return -EINVAL;
@@ -171,10 +176,14 @@ static int rdma_nl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
cb.nlh = nlh;
cb.dump = rdma_nl_types[index].cb_table[op].dump;
return cb.dump(skb, &cb);
+ } else {
+ c.dump = rdma_nl_types[index].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);
+ return ret;
- c.dump = rdma_nl_types[index].cb_table[op].dump;
- return netlink_dump_start(nls, skb, nlh, &c);
}
/*
diff --git a/include/rdma/rdma_netlink.h b/include/rdma/rdma_netlink.h
index 17565a2765c4..b8b3528ebc08 100644
--- a/include/rdma/rdma_netlink.h
+++ b/include/rdma/rdma_netlink.h
@@ -6,6 +6,8 @@
#include <uapi/rdma/rdma_netlink.h>
struct rdma_nl_cbs {
+ int (*doit)(struct sk_buff *skb, struct nlmsghdr *nlh,
+ struct netlink_ext_ack *extack);
int (*dump)(struct sk_buff *skb, struct netlink_callback *nlcb);
u8 flags;
};
--
2.13.2
next prev parent reply other threads:[~2017-07-03 6:28 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-03 6:28 [PATCH rdma-next V2 00/27] RDMA Netlink Device Client Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 02/27] RDMA/netlink: Simplify the put_msg and put_attr Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 03/27] RDMA/netlink: Rename and remove redundant parameter from ibnl_unicast Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 04/27] RDMA/netlink: Rename and remove redundant parameter from ibnl_multicast Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 06/27] RDMA/netlink: Rename netlink callback struct Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 07/27] RDMA/core: Add iterator over ib_devices Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 08/27] RDMA/core: Add and expose static device index Leon Romanovsky
2017-07-03 6:28 ` Leon Romanovsky [this message]
2017-07-03 6:28 ` [PATCH rdma-next V2 10/27] RDMA/netlink: Reduce indirection access to cb_table Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 11/27] RDMA/netlink: Convert LS to doit callback Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 16/27] RDMA/netlink: Add nldev device doit implementation Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 17/27] RDMA/netlink: Add nldev port dumpit implementation Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 18/27] RDMA/netlink: Implement nldev port doit callback Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 20/27] RDMA: Simplify get firmware interface Leon Romanovsky
[not found] ` <20170703062830.30361-21-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-07-17 14:48 ` Dennis Dalessandro
2017-07-03 6:28 ` [PATCH rdma-next V2 21/27] RDMA/netlink: Export FW version Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 22/27] RDMA/netlink: Export node_guid and sys_image_guid Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 24/27] RDMA/netink: Export lids and sm_lids Leon Romanovsky
[not found] ` <20170703062830.30361-25-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-07-17 15:12 ` Dennis Dalessandro
2017-07-03 6:28 ` [PATCH rdma-next V2 25/27] RDMA/netlink: Export LID mask counter (LMC) Leon Romanovsky
2017-07-17 15:14 ` Dennis Dalessandro
2017-07-17 18:32 ` Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 26/27] RDMA/netlink: Provide port state and physical link state Leon Romanovsky
[not found] ` <20170703062830.30361-1-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-07-03 6:28 ` [PATCH rdma-next V2 01/27] RDMA/netlink: Add flag to consolidate common handing Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 05/27] RDMA/netlink: Simplify and rename ibnl_chk_listeners Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 12/27] RDMA/netlink: Update copyright Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 13/27] RDMA/netlink: Add netlink device definitions to UAPI Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 14/27] RDMA/netlink: Add nldev initialization flows Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 15/27] RDMA/netlink: Implement nldev device dumpit calback Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 19/27] RDMA/netlink: Expose device and port capability masks Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 23/27] RDMA/netlink: Advertise IB subnet prefix Leon Romanovsky
2017-07-03 6:28 ` [PATCH rdma-next V2 27/27] RDMA/netlink: Export node_type Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170703062830.30361-10-leon@kernel.org \
--to=leon@kernel.org \
--cc=ariela@mellanox.com \
--cc=dledford@redhat.com \
--cc=leonro@mellanox.com \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.