From: Simon Horman <simon.horman@netronome.com>
To: dev@openvswitch.org, netdev@vger.kernel.org
Cc: Pravin Shelar <pshelar@nicira.com>,
Jesse Gross <jesse@nicira.com>, Thomas Graf <tgraf@suug.ch>,
Simon Horman <simon.horman@netronome.com>
Subject: [PATCH/RFC repost 2/8] netlink: Allow suppression of warnings for duplicate attributes
Date: Thu, 18 Sep 2014 10:55:05 +0900 [thread overview]
Message-ID: <1411005311-11752-3-git-send-email-simon.horman@netronome.com> (raw)
In-Reply-To: <1411005311-11752-1-git-send-email-simon.horman@netronome.com>
Add a multiple field to struct nl_policy which if set suppresses
warning of duplicate attributes in nl_parse_nested().
As is the case without this patch only the last occurrence of an
attribute is stored in attrs by nl_parse_nested(). As such
if the multiple field of struct nl_policy is set then it
is up to the caller to parse the message to extract all the attributes.
This is in preparation for allowing multiple OVS_SELECT_GROUP_ATTR_BUCKET
attributes in a nested OVS_ACTION_ATTR_SELECT_GROUP attribute.
Signed-off-by: Simon Horman <simon.horman@netronome.com>
---
lib/netlink.c | 2 +-
lib/netlink.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/netlink.c b/lib/netlink.c
index 24b2168..bc30248 100644
--- a/lib/netlink.c
+++ b/lib/netlink.c
@@ -743,7 +743,7 @@ nl_policy_parse(const struct ofpbuf *msg, size_t nla_offset,
if (!nl_attr_validate(nla, e)) {
return false;
}
- if (attrs[type]) {
+ if (attrs[type] && !e->multiple) {
VLOG_DBG_RL(&rl, "duplicate attr %"PRIu16, type);
}
attrs[type] = nla;
diff --git a/lib/netlink.h b/lib/netlink.h
index f9234da..b0a72fd 100644
--- a/lib/netlink.h
+++ b/lib/netlink.h
@@ -195,6 +195,7 @@ struct nl_policy
enum nl_attr_type type;
size_t min_len, max_len;
bool optional;
+ bool multiple;
};
#define NL_POLICY_FOR(TYPE) \
--
2.0.1
next prev parent reply other threads:[~2014-09-18 1:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-18 1:55 [PATCH/RFC repost 0/8] Open vSwtich ODP Select Group Action Simon Horman
2014-09-18 1:55 ` [PATCH/RFC repost 1/8] odp: select group action attributes Simon Horman
2014-09-18 1:55 ` Simon Horman [this message]
[not found] ` <1411005311-11752-3-git-send-email-simon.horman-wFxRvT7yatFl57MIdRCFDg@public.gmane.org>
2014-09-26 23:55 ` [PATCH/RFC repost 2/8] netlink: Allow suppression of warnings for duplicate attributes Ben Pfaff
2014-10-09 1:18 ` [ovs-dev] " Simon Horman
2014-10-10 15:31 ` Ben Pfaff
2014-09-18 1:55 ` [PATCH/RFC repost 3/8] odp-util: formatting of datapath select group action Simon Horman
[not found] ` <1411005311-11752-4-git-send-email-simon.horman-wFxRvT7yatFl57MIdRCFDg@public.gmane.org>
2014-09-19 13:44 ` Thomas Graf
2014-09-24 4:55 ` Simon Horman
2014-09-18 1:55 ` [PATCH/RFC repost 4/8] datapath: execution of " Simon Horman
[not found] ` <1411005311-11752-5-git-send-email-simon.horman-wFxRvT7yatFl57MIdRCFDg@public.gmane.org>
2014-09-19 14:05 ` Thomas Graf
2014-09-24 6:01 ` Simon Horman
2014-09-24 8:19 ` Thomas Graf
2014-09-25 4:43 ` Simon Horman
2014-09-18 1:55 ` [PATCH/RFC repost 5/8] datapath: Move last_action() helper to datapath.h Simon Horman
[not found] ` <1411005311-11752-6-git-send-email-simon.horman-wFxRvT7yatFl57MIdRCFDg@public.gmane.org>
2014-09-19 14:06 ` Thomas Graf
2014-09-24 6:00 ` Simon Horman
[not found] ` <20140924060013.GB13314-IxS8c3vjKQDk1uMJSBkQmQ@public.gmane.org>
2014-09-24 8:20 ` Thomas Graf
2014-09-25 4:42 ` Simon Horman
2014-09-18 1:55 ` [PATCH/RFC repost 6/8] datapath: validation of select group action Simon Horman
2014-09-18 1:55 ` [PATCH/RFC repost 7/8] ofproto: translate datapath " Simon Horman
[not found] ` <1411005311-11752-8-git-send-email-simon.horman-wFxRvT7yatFl57MIdRCFDg@public.gmane.org>
2014-09-26 23:57 ` Ben Pfaff
2014-10-09 1:14 ` [ovs-dev] " Simon Horman
2014-10-13 20:46 ` Ben Pfaff
2014-10-14 4:54 ` Simon Horman
2014-09-18 1:55 ` [PATCH/RFC repost 8/8] hack: ofproto: enable odp select action Simon Horman
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=1411005311-11752-3-git-send-email-simon.horman@netronome.com \
--to=simon.horman@netronome.com \
--cc=dev@openvswitch.org \
--cc=jesse@nicira.com \
--cc=netdev@vger.kernel.org \
--cc=pshelar@nicira.com \
--cc=tgraf@suug.ch \
/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;
as well as URLs for NNTP newsgroup(s).