* Re: linux-next: Tree for May 16 (net/core) [not found] <20170516112125.517607f8@canb.auug.org.au> @ 2017-05-16 16:28 ` Randy Dunlap 2017-05-16 19:44 ` Paul Gortmaker 0 siblings, 1 reply; 5+ messages in thread From: Randy Dunlap @ 2017-05-16 16:28 UTC (permalink / raw) To: Stephen Rothwell, Linux-Next Mailing List Cc: Linux Kernel Mailing List, netdev@vger.kernel.org On 05/15/17 18:21, Stephen Rothwell wrote: > Hi all, > > Changes since 20170515: > on i386 or x86_64: when CONFIG_INET is not enabled: ../net/core/sock.c: In function 'skb_orphan_partial': ../net/core/sock.c:1810:2: error: implicit declaration of function 'skb_is_tcp_pure_ack' [-Werror=implicit-function-declaration] if (skb_is_tcp_pure_ack(skb)) ^ -- ~Randy ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: Tree for May 16 (net/core) 2017-05-16 16:28 ` linux-next: Tree for May 16 (net/core) Randy Dunlap @ 2017-05-16 19:44 ` Paul Gortmaker 2017-05-16 20:12 ` Eric Dumazet 2017-05-16 20:27 ` [PATCH net] net: fix compile error in skb_orphan_partial() Eric Dumazet 0 siblings, 2 replies; 5+ messages in thread From: Paul Gortmaker @ 2017-05-16 19:44 UTC (permalink / raw) To: Randy Dunlap Cc: Stephen Rothwell, Linux-Next Mailing List, Linux Kernel Mailing List, netdev@vger.kernel.org, Eric Dumazet On Tue, May 16, 2017 at 12:28 PM, Randy Dunlap <rdunlap@infradead.org> wrote: > On 05/15/17 18:21, Stephen Rothwell wrote: >> Hi all, >> >> Changes since 20170515: >> > > on i386 or x86_64: > > when CONFIG_INET is not enabled: > > ../net/core/sock.c: In function 'skb_orphan_partial': > ../net/core/sock.c:1810:2: error: implicit declaration of function 'skb_is_tcp_pure_ack' [-Werror=implicit-function-declaration] > if (skb_is_tcp_pure_ack(skb)) Automated bisect on an ARM build with the same issue reveals: f6ba8d33cfbb46df569972e64dbb5bb7e929bfd9 is the first bad commit commit f6ba8d33cfbb46df569972e64dbb5bb7e929bfd9 Author: Eric Dumazet <edumazet@google.com> Date: Thu May 11 15:24:41 2017 -0700 netem: fix skb_orphan_partial() I should have known that lowering skb->truesize was dangerous :/ In case packets are not leaving the host via a standard Ethernet device, but looped back to local sockets, bad things can happen, as reported by Michael Madsen ( https://bugzilla.kernel.org/show_bug.cgi?id=195713 ) So instead of tweaking skb->truesize, lets change skb->destructor and keep a reference on the owner socket via its sk_refcnt. Fixes: f2f872f9272a ("netem: Introduce skb_orphan_partial() helper") Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Michael Madsen <mkm@nabto.com> Signed-off-by: David S. Miller <davem@davemloft.net> :040000 040000 7bfb7a6f5e12373b1c50ede2455b6ddd6d79cee0 b45b7255322f1dff5e3ab8d3d707cf38a91c76ce M net bisect run success http://kisskb.ellerman.id.au/kisskb/buildresult/13033081/ I'm guessing Eric already knows about this but I've Cc'd him just in case. P. -- > > > -- > ~Randy ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: Tree for May 16 (net/core) 2017-05-16 19:44 ` Paul Gortmaker @ 2017-05-16 20:12 ` Eric Dumazet 2017-05-16 20:27 ` [PATCH net] net: fix compile error in skb_orphan_partial() Eric Dumazet 1 sibling, 0 replies; 5+ messages in thread From: Eric Dumazet @ 2017-05-16 20:12 UTC (permalink / raw) To: Paul Gortmaker Cc: Randy Dunlap, Stephen Rothwell, Linux-Next Mailing List, Linux Kernel Mailing List, netdev@vger.kernel.org On Tue, May 16, 2017 at 12:44 PM, Paul Gortmaker <paul.gortmaker@windriver.com> wrote: > On Tue, May 16, 2017 at 12:28 PM, Randy Dunlap <rdunlap@infradead.org> wrote: >> On 05/15/17 18:21, Stephen Rothwell wrote: >>> Hi all, >>> >>> Changes since 20170515: >>> >> >> on i386 or x86_64: >> >> when CONFIG_INET is not enabled: >> >> ../net/core/sock.c: In function 'skb_orphan_partial': >> ../net/core/sock.c:1810:2: error: implicit declaration of function 'skb_is_tcp_pure_ack' [-Werror=implicit-function-declaration] >> if (skb_is_tcp_pure_ack(skb)) > > Automated bisect on an ARM build with the same issue reveals: > > f6ba8d33cfbb46df569972e64dbb5bb7e929bfd9 is the first bad commit > commit f6ba8d33cfbb46df569972e64dbb5bb7e929bfd9 > Author: Eric Dumazet <edumazet@google.com> > Date: Thu May 11 15:24:41 2017 -0700 > > netem: fix skb_orphan_partial() > > I should have known that lowering skb->truesize was dangerous :/ > > In case packets are not leaving the host via a standard Ethernet device, > but looped back to local sockets, bad things can happen, as reported > by Michael Madsen ( https://bugzilla.kernel.org/show_bug.cgi?id=195713 ) > > So instead of tweaking skb->truesize, lets change skb->destructor > and keep a reference on the owner socket via its sk_refcnt. > > Fixes: f2f872f9272a ("netem: Introduce skb_orphan_partial() helper") > Signed-off-by: Eric Dumazet <edumazet@google.com> > Reported-by: Michael Madsen <mkm@nabto.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > > :040000 040000 7bfb7a6f5e12373b1c50ede2455b6ddd6d79cee0 > b45b7255322f1dff5e3ab8d3d707cf38a91c76ce M net > bisect run success > > http://kisskb.ellerman.id.au/kisskb/buildresult/13033081/ > > I'm guessing Eric already knows about this but I've Cc'd him just in case. I was not aware of this, I will submit a fix, thanks. ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net] net: fix compile error in skb_orphan_partial() 2017-05-16 19:44 ` Paul Gortmaker 2017-05-16 20:12 ` Eric Dumazet @ 2017-05-16 20:27 ` Eric Dumazet 2017-05-17 19:11 ` David Miller 1 sibling, 1 reply; 5+ messages in thread From: Eric Dumazet @ 2017-05-16 20:27 UTC (permalink / raw) To: Paul Gortmaker; +Cc: Randy Dunlap, Stephen Rothwell, netdev@vger.kernel.org From: Eric Dumazet <edumazet@google.com> If CONFIG_INET is not set, net/core/sock.c can not compile : net/core/sock.c: In function ‘skb_orphan_partial’: net/core/sock.c:1810:2: error: implicit declaration of function ‘skb_is_tcp_pure_ack’ [-Werror=implicit-function-declaration] if (skb_is_tcp_pure_ack(skb)) ^ Fix this by always including <net/tcp.h> Fixes: f6ba8d33cfbb ("netem: fix skb_orphan_partial()") Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> Reported-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> --- net/core/sock.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index e43e71d7856b385111cd4c4b1bd835a78c670c60..727f924b7f91f495d9e7a4e7297c9c937d3258ed 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -139,10 +139,7 @@ #include <trace/events/sock.h> -#ifdef CONFIG_INET #include <net/tcp.h> -#endif - #include <net/busy_poll.h> static DEFINE_MUTEX(proto_list_mutex); ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net] net: fix compile error in skb_orphan_partial() 2017-05-16 20:27 ` [PATCH net] net: fix compile error in skb_orphan_partial() Eric Dumazet @ 2017-05-17 19:11 ` David Miller 0 siblings, 0 replies; 5+ messages in thread From: David Miller @ 2017-05-17 19:11 UTC (permalink / raw) To: eric.dumazet; +Cc: paul.gortmaker, rdunlap, sfr, netdev From: Eric Dumazet <eric.dumazet@gmail.com> Date: Tue, 16 May 2017 13:27:53 -0700 > From: Eric Dumazet <edumazet@google.com> > > If CONFIG_INET is not set, net/core/sock.c can not compile : > > net/core/sock.c: In function ‘skb_orphan_partial’: > net/core/sock.c:1810:2: error: implicit declaration of function > ‘skb_is_tcp_pure_ack’ [-Werror=implicit-function-declaration] > if (skb_is_tcp_pure_ack(skb)) > ^ > > Fix this by always including <net/tcp.h> > > Fixes: f6ba8d33cfbb ("netem: fix skb_orphan_partial()") > Signed-off-by: Eric Dumazet <edumazet@google.com> > Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> > Reported-by: Randy Dunlap <rdunlap@infradead.org> > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Applied and queued up for -stable, thanks Eric. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-05-17 19:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20170516112125.517607f8@canb.auug.org.au>
2017-05-16 16:28 ` linux-next: Tree for May 16 (net/core) Randy Dunlap
2017-05-16 19:44 ` Paul Gortmaker
2017-05-16 20:12 ` Eric Dumazet
2017-05-16 20:27 ` [PATCH net] net: fix compile error in skb_orphan_partial() Eric Dumazet
2017-05-17 19:11 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox