Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754993AbbHEWaO (ORCPT ); Wed, 5 Aug 2015 18:30:14 -0400 Received: from mail-ig0-f173.google.com ([209.85.213.173]:33350 "EHLO mail-ig0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753795AbbHEWaL (ORCPT ); Wed, 5 Aug 2015 18:30:11 -0400 MIME-Version: 1.0 In-Reply-To: <1438750199-9061-2-git-send-email-joestringer@nicira.com> References: <1438750199-9061-1-git-send-email-joestringer@nicira.com> <1438750199-9061-2-git-send-email-joestringer@nicira.com> Date: Wed, 5 Aug 2015 15:30:10 -0700 Message-ID: Subject: Re: [PATCHv2 net-next 1/9] openvswitch: Serialize acts with original netlink len From: Pravin Shelar To: Joe Stringer Cc: netdev , LKML , pablo , Patrick McHardy , Justin Pettit , Andy Zhou , Jesse Gross , Florian Westphal , Hannes Sowa , Thomas Graf Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2479 Lines: 58 On Tue, Aug 4, 2015 at 9:49 PM, Joe Stringer wrote: > 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 > Acked-by: Thomas Graf > --- > net/openvswitch/datapath.c | 2 +- > net/openvswitch/flow.h | 1 + > net/openvswitch/flow_netlink.c | 1 + > 3 files changed, 3 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..d536fb7 100644 > --- a/net/openvswitch/flow_netlink.c > +++ b/net/openvswitch/flow_netlink.c > @@ -1545,6 +1545,7 @@ static struct sw_flow_actions *nla_alloc_flow_actions(int size, bool log) > return ERR_PTR(-ENOMEM); > > sfa->actions_len = 0; > + sfa->orig_len = size; This is getting updated every time datapath action buffer is expanded (ref: reserve_sfa_size()). So it does not keep original userspace action length. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/