From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zoltan Kiss Subject: Re: [PATCH v3] core, nfqueue, openvswitch: Orphan frags in skb_zerocopy and handle errors Date: Fri, 21 Mar 2014 10:35:13 +0000 Message-ID: <532C15E1.4070501@citrix.com> References: <1395331354-23659-1-git-send-email-zoltan.kiss@citrix.com> <532B6A3D.1060600@redhat.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <532B6A3D.1060600-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-yBygre7rU0TnMu66kgdUjQ@public.gmane.org Sender: "dev" Content-Type: text/plain; charset="us-ascii"; format="flowed" To: Thomas Graf , Jesse Gross , pshelar-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org, dev-yBygre7rU0TnMu66kgdUjQ@public.gmane.org Cc: netfilter-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Miklos Szeredi , kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "Michael S. Tsirkin" , Jason Wang , Eric Dumazet , Jan Beulich , Tom Herbert , Herbert Xu , Jozsef Kadlecsik , xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b@public.gmane.org, Pablo Neira Ayuso , Jiri Pirko , Paul Durrant , netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Florian Westphal , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Daniel Borkmann , netfilter-devel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Joe Perches , "David S. Miller" On 20/03/14 22:22, Thomas Graf wrote: > On 03/20/2014 05:02 PM, Zoltan Kiss wrote: >> --- a/net/openvswitch/datapath.c >> +++ b/net/openvswitch/datapath.c >> @@ -464,7 +464,9 @@ static int queue_userspace_packet(struct datapath >> *dp, struct sk_buff *skb, >> } >> nla->nla_len = nla_attr_size(skb->len); >> >> - skb_zerocopy(user_skb, skb, skb->len, hlen); >> + err = skb_zerocopy(user_skb, skb, skb->len, hlen); >> + if (err) >> + goto out; >> >> /* Pad OVS_PACKET_ATTR_PACKET if linear copy was performed */ >> if (!(dp->user_features & OVS_DP_F_UNALIGNED)) { >> @@ -478,6 +480,7 @@ static int queue_userspace_packet(struct datapath >> *dp, struct sk_buff *skb, >> >> err = genlmsg_unicast(ovs_dp_get_net(dp), user_skb, >> upcall_info->portid); >> out: >> + skb_tx_error(skb); > > Really sorry to bug you again. We'll get this right ;-) > > Patch looks great except for this call to skb_tx_error() which is now > done in the error *and* success path. Make the call conditional on > if (err) and we're good. Ah, sorry, I'm really sloppy with this patch. I've sent a fixed one. Zoli From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zoltan Kiss Subject: Re: [PATCH v3] core, nfqueue, openvswitch: Orphan frags in skb_zerocopy and handle errors Date: Fri, 21 Mar 2014 10:35:13 +0000 Message-ID: <532C15E1.4070501@citrix.com> References: <1395331354-23659-1-git-send-email-zoltan.kiss@citrix.com> <532B6A3D.1060600@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Cc: netfilter-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Miklos Szeredi , kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "Michael S. Tsirkin" , Jason Wang , Eric Dumazet , Jan Beulich , Tom Herbert , Herbert Xu , Jozsef Kadlecsik , xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b@public.gmane.org, Pablo Neira Ayuso , Jiri Pirko , Paul Durrant , netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Florian Westphal , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Daniel Borkmann , netfilter-devel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Joe Perches , "David S. Miller" To: Thomas Graf , Jesse Gross , , Return-path: In-Reply-To: <532B6A3D.1060600-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-yBygre7rU0TnMu66kgdUjQ@public.gmane.org Sender: "dev" List-Id: netfilter-devel.vger.kernel.org On 20/03/14 22:22, Thomas Graf wrote: > On 03/20/2014 05:02 PM, Zoltan Kiss wrote: >> --- a/net/openvswitch/datapath.c >> +++ b/net/openvswitch/datapath.c >> @@ -464,7 +464,9 @@ static int queue_userspace_packet(struct datapath >> *dp, struct sk_buff *skb, >> } >> nla->nla_len = nla_attr_size(skb->len); >> >> - skb_zerocopy(user_skb, skb, skb->len, hlen); >> + err = skb_zerocopy(user_skb, skb, skb->len, hlen); >> + if (err) >> + goto out; >> >> /* Pad OVS_PACKET_ATTR_PACKET if linear copy was performed */ >> if (!(dp->user_features & OVS_DP_F_UNALIGNED)) { >> @@ -478,6 +480,7 @@ static int queue_userspace_packet(struct datapath >> *dp, struct sk_buff *skb, >> >> err = genlmsg_unicast(ovs_dp_get_net(dp), user_skb, >> upcall_info->portid); >> out: >> + skb_tx_error(skb); > > Really sorry to bug you again. We'll get this right ;-) > > Patch looks great except for this call to skb_tx_error() which is now > done in the error *and* success path. Make the call conditional on > if (err) and we're good. Ah, sorry, I'm really sloppy with this patch. I've sent a fixed one. Zoli From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760708AbaCUKfW (ORCPT ); Fri, 21 Mar 2014 06:35:22 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:34385 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760391AbaCUKfT (ORCPT ); Fri, 21 Mar 2014 06:35:19 -0400 X-IronPort-AV: E=Sophos;i="4.97,703,1389744000"; d="scan'208";a="112218793" Message-ID: <532C15E1.4070501@citrix.com> Date: Fri, 21 Mar 2014 10:35:13 +0000 From: Zoltan Kiss User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Thomas Graf , Jesse Gross , , CC: "David S. Miller" , Pablo Neira Ayuso , Jozsef Kadlecsik , Eric Dumazet , Daniel Borkmann , Tom Herbert , Jason Wang , Florian Westphal , Joe Perches , Simon Horman , Jiri Pirko , "Michael S. Tsirkin" , Paul Durrant , Jan Beulich , Herbert Xu , Miklos Szeredi , , , , , , Subject: Re: [PATCH v3] core, nfqueue, openvswitch: Orphan frags in skb_zerocopy and handle errors References: <1395331354-23659-1-git-send-email-zoltan.kiss@citrix.com> <532B6A3D.1060600@redhat.com> In-Reply-To: <532B6A3D.1060600@redhat.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.80.2.133] X-DLP: MIA1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 20/03/14 22:22, Thomas Graf wrote: > On 03/20/2014 05:02 PM, Zoltan Kiss wrote: >> --- a/net/openvswitch/datapath.c >> +++ b/net/openvswitch/datapath.c >> @@ -464,7 +464,9 @@ static int queue_userspace_packet(struct datapath >> *dp, struct sk_buff *skb, >> } >> nla->nla_len = nla_attr_size(skb->len); >> >> - skb_zerocopy(user_skb, skb, skb->len, hlen); >> + err = skb_zerocopy(user_skb, skb, skb->len, hlen); >> + if (err) >> + goto out; >> >> /* Pad OVS_PACKET_ATTR_PACKET if linear copy was performed */ >> if (!(dp->user_features & OVS_DP_F_UNALIGNED)) { >> @@ -478,6 +480,7 @@ static int queue_userspace_packet(struct datapath >> *dp, struct sk_buff *skb, >> >> err = genlmsg_unicast(ovs_dp_get_net(dp), user_skb, >> upcall_info->portid); >> out: >> + skb_tx_error(skb); > > Really sorry to bug you again. We'll get this right ;-) > > Patch looks great except for this call to skb_tx_error() which is now > done in the error *and* success path. Make the call conditional on > if (err) and we're good. Ah, sorry, I'm really sloppy with this patch. I've sent a fixed one. Zoli