From c3bb15b38a9532081ca104af4eee894af8e5b18c Mon Sep 17 00:00:00 2001 From: Joe Stringer Date: Wed, 2 Dec 2015 23:53:49 -0800 Subject: [PATCH] datapath: Serialize acts with original netlink len 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. Upstream: 8e2fed1 "openvswitch: Serialize acts with original netlink len" Signed-off-by: Joe Stringer Acked-by: Pravin B Shelar --- datapath/datapath.c | 2 +- datapath/flow.h | 1 + datapath/flow_netlink.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/datapath/datapath.c b/datapath/datapath.c index f6a0cd3a5..9e6f6147d 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -725,7 +725,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/datapath/flow.h b/datapath/flow.h index 1abb2e15a..61fa70845 100644 --- a/datapath/flow.h +++ b/datapath/flow.h @@ -143,6 +143,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/datapath/flow_netlink.c b/datapath/flow_netlink.c index f95aa1436..2060769e8 100644 --- a/datapath/flow_netlink.c +++ b/datapath/flow_netlink.c @@ -1661,6 +1661,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; @@ -2260,6 +2261,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)