[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAEP_g=9tr9JYgvpMGWriWEjYgHLcjYVA=xLFVM408Ry5ZnoN0w@mail.gmail.com>
Date: Tue, 4 Feb 2014 22:02:12 -0800
From: Jesse Gross <jesse@...ira.com>
To: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
Cc: David Miller <davem@...emloft.net>,
netdev <netdev@...r.kernel.org>,
"dev@...nvswitch.com" <dev@...nvswitch.com>,
Thomas Graf <tgraf@...g.ch>,
Zoltan Kiss <zoltan.kiss@...rix.com>
Subject: Re: [PATCH net 1/5] openvswitch: Pad OVS_PACKET_ATTR_PACKET if linear
copy was performed
On Mon, Feb 3, 2014 at 8:43 AM, Sergei Shtylyov
<sergei.shtylyov@...entembedded.com> wrote:
> Hello.
>
>
> On 03-02-2014 5:08, Jesse Gross wrote:
>
>> From: Thomas Graf <tgraf@...g.ch>
>
>
>> While the zerocopy method is correctly omitted if user space
>> does not support unaligned Netlink messages. The attribute is
>> still not padded correctly as skb_zerocopy() will not ensure
>> padding and the attribute size is no longer pre calculated
>> though nla_reserve() which ensured padding previously.
>
>
>> This patch applies appropriate padding if a linear data copy
>> was performed in skb_zerocopy().
>
>
>> Signed-off-by: Thomas Graf <tgraf@...g.ch>
>> Acked-by: Zoltan Kiss <zoltan.kiss@...rix.com>
>> Signed-off-by: Jesse Gross <jesse@...ira.com>
>> ---
>> net/openvswitch/datapath.c | 7 ++++++-
>> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>
>> diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
>> index df46928..3ca9121 100644
>> --- a/net/openvswitch/datapath.c
>> +++ b/net/openvswitch/datapath.c
>
> [...]
>
>> @@ -466,6 +466,11 @@ static int queue_userspace_packet(struct datapath
>> *dp, struct sk_buff *skb,
>>
>> skb_zerocopy(user_skb, skb, skb->len, hlen);
>>
>> + /* Pad OVS_PACKET_ATTR_PACKET if linear copy was performed */
>> + if (!(dp->user_features & OVS_DP_F_UNALIGNED) &&
>> + (plen = (ALIGN(user_skb->len, NLA_ALIGNTO) - user_skb->len)) >
>> 0)
>
>
> This shouldn't pass checkpatch.pl which complains about assignments
> inside *if* statements.
I've fixed both of these issues and will resubmit.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists