From: Leon Romanovsky <leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Leon Romanovsky <leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Subject: [rdma-next v2 15/33] RDMA/netlink: Add and implement doit netlink callback
Date: Thu, 10 Aug 2017 14:08:09 +0300 [thread overview]
Message-ID: <20170810110827.9952-16-leon@kernel.org> (raw)
In-Reply-To: <20170810110827.9952-1-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
From: Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
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-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Reviewed-by: Steve Wise <swise-7bPotxP6k4+P2YhJcF5u+vpXobYPEAuW@public.gmane.org>
---
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 a7082adae16b..484d6a8a2811 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;
}
@@ -151,6 +155,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;
@@ -169,10 +174,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 92f8832297ab..e25bf1988846 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.14.0
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-08-10 11:08 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-10 11:07 [pull request][rdma-next v2 00/33] RDMA netlink refactoring and RDMAtool code Leon Romanovsky
[not found] ` <20170810110827.9952-1-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-08-10 11:07 ` [rdma-next v2 01/33] RDMA/core: Add wait/retry version of ibnl_unicast Leon Romanovsky
2017-08-10 11:07 ` [rdma-next v2 02/33] RDMA/netlink: Remove netlink clients infrastructure Leon Romanovsky
2017-08-10 11:07 ` [rdma-next v2 03/33] RDMA/netlink: Remove redundant owner option for netlink callbacks Leon Romanovsky
2017-08-10 11:07 ` [rdma-next v2 04/33] RDMA/netlink: Avoid double pass for RDMA netlink messages Leon Romanovsky
2017-08-10 11:07 ` [rdma-next v2 05/33] RDMA/iwcm: Remove useless check of netlink client validity Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 06/33] RDMA/iwcm: Remove extra EXPORT_SYMBOLS Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 07/33] RDMA/netlink: Add flag to consolidate common handling Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 08/33] RDMA/netlink: Simplify the put_msg and put_attr Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 09/33] RDMA/netlink: Rename and remove redundant parameter from ibnl_unicast* Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 10/33] RDMA/netlink: Rename and remove redundant parameter from ibnl_multicast Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 11/33] RDMA/netlink: Simplify and rename ibnl_chk_listeners Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 12/33] RDMA/netlink: Rename netlink callback struct Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 13/33] RDMA/core: Add iterator over ib_devices Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 14/33] RDMA/core: Add and expose static device index Leon Romanovsky
2017-08-10 11:08 ` Leon Romanovsky [this message]
2017-08-10 11:08 ` [rdma-next v2 16/33] RDMA/netlink: Reduce indirection access to cb_table Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 17/33] RDMA/netlink: Convert LS to doit callback Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 18/33] RDMA/netlink: Update copyright Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 19/33] RDMA/netlink: Add netlink device definitions to UAPI Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 20/33] RDMA/netlink: Add nldev initialization flows Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 21/33] RDMA/netlink: Implement nldev device dumpit calback Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 22/33] RDMA/netlink: Add nldev device doit implementation Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 23/33] RDMA/netlink: Add nldev port dumpit implementation Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 24/33] RDMA/netlink: Implement nldev port doit callback Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 25/33] RDMA/netlink: Expose device and port capability masks Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 26/33] RDMA: Simplify get firmware interface Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 27/33] RDMA/netlink: Export FW version Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 28/33] RDMA/netlink: Export node_guid and sys_image_guid Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 29/33] RDMA/netlink: Advertise IB subnet prefix Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 30/33] RDMA/netink: Export lids and sm_lids Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 31/33] RDMA/netlink: Export LID mask control (LMC) Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 32/33] RDMA/netlink: Provide port state and physical link state Leon Romanovsky
2017-08-10 11:08 ` [rdma-next v2 33/33] RDMA/netlink: Export node_type Leon Romanovsky
2017-08-11 15:37 ` [pull request][rdma-next v2 00/33] RDMA netlink refactoring and RDMAtool code Doug Ledford
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=20170810110827.9952-16-leon@kernel.org \
--to=leon-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \
--cc=dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org \
--cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox