From: Joe Stringer <joestringer@nicira.com>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, pablo@netfilter.org,
kaber@trash.net, jpettit@nicira.com, pshelar@nicira.com,
azhou@nicira.com, jesse@nicira.com, fwestpha@redhat.com,
hannes@redhat.com, tgraf@noironetworks.com
Subject: [PATCHv3 net-next 01/10] openvswitch: Serialize acts with original netlink len
Date: Tue, 11 Aug 2015 15:59:12 -0700 [thread overview]
Message-ID: <1439333961-24474-2-git-send-email-joestringer@nicira.com> (raw)
In-Reply-To: <1439333961-24474-1-git-send-email-joestringer@nicira.com>
Previously, we used the kernel-internal netlink actions length to
calculate the size of messages to serialize back to userspace.
However,the sw_flow_actions may not be formatted exactly the same as the
actions on the wire, so store the original actions length when
de-serializing and re-use the original length when serializing.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
---
v2: No change.
v3: Preserve original length across buffer resize.
---
net/openvswitch/datapath.c | 2 +-
net/openvswitch/flow.h | 1 +
net/openvswitch/flow_netlink.c | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index ffe984f..d5b5473 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -713,7 +713,7 @@ static size_t ovs_flow_cmd_msg_size(const struct sw_flow_actions *acts,
/* OVS_FLOW_ATTR_ACTIONS */
if (should_fill_actions(ufid_flags))
- len += nla_total_size(acts->actions_len);
+ len += nla_total_size(acts->orig_len);
return len
+ nla_total_size(sizeof(struct ovs_flow_stats)) /* OVS_FLOW_ATTR_STATS */
diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
index b62cdb3..082a87b 100644
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -144,6 +144,7 @@ struct sw_flow_id {
struct sw_flow_actions {
struct rcu_head rcu;
+ size_t orig_len; /* From flow_cmd_new netlink actions size */
u32 actions_len;
struct nlattr actions[];
};
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index a6eb77a..96cad8c 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -1619,6 +1619,7 @@ static struct nlattr *reserve_sfa_size(struct sw_flow_actions **sfa,
memcpy(acts->actions, (*sfa)->actions, (*sfa)->actions_len);
acts->actions_len = (*sfa)->actions_len;
+ acts->orig_len = (*sfa)->orig_len;
kfree(*sfa);
*sfa = acts;
@@ -2223,6 +2224,7 @@ int ovs_nla_copy_actions(const struct nlattr *attr,
if (IS_ERR(*sfa))
return PTR_ERR(*sfa);
+ (*sfa)->orig_len = nla_len(attr);
err = __ovs_nla_copy_actions(attr, key, 0, sfa, key->eth.type,
key->eth.tci, log);
if (err)
--
2.1.4
next prev parent reply other threads:[~2015-08-11 23:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-11 22:59 [PATCHv3 net-next 00/10] OVS conntrack support Joe Stringer
2015-08-11 22:59 ` Joe Stringer [this message]
2015-08-12 21:34 ` [PATCHv3 net-next 01/10] openvswitch: Serialize acts with original netlink len Pravin Shelar
2015-08-11 22:59 ` [PATCHv3 net-next 02/10] openvswitch: Move MASKED* macros to datapath.h Joe Stringer
2015-08-12 21:34 ` Pravin Shelar
2015-08-11 22:59 ` [PATCHv3 net-next 03/10] ipv6: Export nf_ct_frag6_gather() Joe Stringer
2015-08-12 21:35 ` Pravin Shelar
2015-08-11 22:59 ` [PATCHv3 net-next 04/10] dst: Add __skb_dst_copy() variation Joe Stringer
2015-08-12 21:35 ` Pravin Shelar
2015-08-11 22:59 ` [PATCHv3 net-next 05/10] openvswitch: Add conntrack action Joe Stringer
2015-08-12 21:38 ` Pravin Shelar
2015-08-11 22:59 ` [PATCHv3 net-next 06/10] openvswitch: Allow matching on conntrack mark Joe Stringer
2015-08-12 23:00 ` Pravin Shelar
2015-08-12 23:41 ` Joe Stringer
2015-08-13 17:14 ` Pravin Shelar
2015-08-11 22:59 ` [PATCHv3 net-next 07/10] netfilter: Always export nf_connlabels_replace() Joe Stringer
2015-08-11 22:59 ` [PATCHv3 net-next 08/10] netfilter: connlabels: Export setting connlabel length Joe Stringer
2015-08-11 22:59 ` [PATCHv3 net-next 09/10] openvswitch: Allow matching on conntrack label Joe Stringer
2015-08-11 22:59 ` [PATCHv3 net-next 10/10] openvswitch: Allow attaching helpers to ct action Joe Stringer
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=1439333961-24474-2-git-send-email-joestringer@nicira.com \
--to=joestringer@nicira.com \
--cc=azhou@nicira.com \
--cc=fwestpha@redhat.com \
--cc=hannes@redhat.com \
--cc=jesse@nicira.com \
--cc=jpettit@nicira.com \
--cc=kaber@trash.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=pshelar@nicira.com \
--cc=tgraf@noironetworks.com \
/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).