Netdev List
 help / color / mirror / Atom feed
From: Eric Dumazet <eric.dumazet@gmail.com>
To: Alexander Duyck <alexander.h.duyck@intel.com>
Cc: "Alexander Duyck" <alexander.duyck@gmail.com>,
	"David Miller" <davem@davemloft.net>,
	netdev <netdev@vger.kernel.org>,
	"Neal Cardwell" <ncardwell@google.com>,
	"Tom Herbert" <therbert@google.com>,
	"Jeff Kirsher" <jeffrey.t.kirsher@intel.com>,
	"Michael Chan" <mchan@broadcom.com>,
	"Matt Carlson" <mcarlson@broadcom.com>,
	"Herbert Xu" <herbert@gondor.apana.org.au>,
	"Ben Hutchings" <bhutchings@solarflare.com>,
	"Ilpo Järvinen" <ilpo.jarvinen@helsinki.fi>,
	"Maciej Żenczykowski" <maze@google.com>
Subject: Re: [PATCH net-next] net: take care of cloned skbs in tcp_try_coalesce()
Date: Wed, 02 May 2012 18:46:19 +0200	[thread overview]
Message-ID: <1335977179.22133.599.camel@edumazet-glaptop> (raw)
In-Reply-To: <4FA1606A.6040607@intel.com>

On Wed, 2012-05-02 at 09:27 -0700, Alexander Duyck wrote:

> Are you sure about that?  I think this may blow up if a bridge is
> brought into play.  In that case you will have clones that will be going
> through the xmit path of network drivers and I know in the case of the
> older e1000 driver it didn't stop to look at the length but would
> instead just go through and start mapping all frags to the device.  I am
> fairly certain you are risking a data corruption any time you modify
> nr_frags and dataref is != 1.
> 


Hmm...

A driver should not map more fragments than len/data_len permits.
But point taken.

Frankly we can add the test, but it means that any sniffer running will
disable tcp coalescing, while net/packet/af_packet.c does the right
thing.

I'll check how I can do...

> I really think what we should be doing is either not merge period, or we
> have to go through slow paths if either the to or the from is cloned.
> 
> >>> @@ -4515,7 +4521,12 @@ copyfrags:
> >>>  		offset = from->data - (unsigned char *)page_address(page);
> >>>  		skb_fill_page_desc(to, skb_shinfo(to)->nr_frags,
> >>>  				   page, offset, skb_headlen(from));
> >>> -		*fragstolen = true;
> >>> +
> >>> +		if (skb_cloned(from))
> >>> +			get_page(page);
> >>> +		else
> >>> +			*fragstolen = true;
> >>> +
> >>>  		delta = len; /* we dont know real truesize... */
> >>>  		goto copyfrags;
> >>>  	}
> >>>
> >>>
> >> I don't see where we are now addressing the put_page call to release the
> >> page afterwards.  By calling get_page you are incrementing the page
> >> count by one, but where are you decrementing dataref in the shared
> >> info?  Without that we are looking at a memory leak because __kfree_skb
> >> will decrement the dataref but it will never reach 0 so it will never
> >> call put_page on the head frag.
> > really the dataref was already incremented at skb_clone() time
> >
> > It will be properly decremented since we call __kfree_skb()
> >
> > Only the last decrement will perform the put_page()
> >
> > Think about splice() is doing, its the same get_page() game.
> I think you are missing the point.  So skb_clone will bump the dataref
> to 2, calling get_page will bump the page count to 2.  After this
> function you don't call __kfree_skb(skb) instead you call
> kmem_cache_free(skbuff_head_cache, skb).  This will free the sk_buff,
> but not decrement dataref leaving it at 2.  Eventually the raw socket
> will call kfree_skb(skb) on the clone dropping the dataref to 1 and you
> will call put_page dropping the page count to 1, but I don't see where
> the last __kfree_skb call will come from that will drop dataref and the
> page count to 0.

No, you miss that _if_ we added one to page count, then we wont call
kmem_cache_free(skbuff_head_cache, skb) but call __kfree_skb(skb)
instead because fragstolen will be false.

if (fragstolen)
	kmem_cache_free(...)
else
	__kfree_skb(...)

In future patch (addressing tcp coalescing in tcp_queue_rcv() as well),
I'll add a helper to make this more clear.

  reply	other threads:[~2012-05-02 16:46 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-27 10:37 [PATCH 3/4 net-next] net: make GRO aware of skb->head_frag Eric Dumazet
2012-04-30 17:54 ` Eric Dumazet
2012-04-30 18:10 ` [PATCH 3/4 v2 " Eric Dumazet
2012-04-30 23:36   ` Alexander Duyck
2012-05-01  1:27     ` Eric Dumazet
2012-05-01  5:33       ` Alexander Duyck
2012-05-01  6:39         ` Eric Dumazet
2012-05-01 16:17           ` Alexander Duyck
2012-05-01 17:04             ` Eric Dumazet
2012-05-01 19:45               ` Alexander Duyck
2012-05-02  2:45                 ` Eric Dumazet
2012-05-02  8:24                 ` Eric Dumazet
2012-05-02 16:16                   ` Alexander Duyck
2012-05-02 16:19                     ` Eric Dumazet
2012-05-02 16:27                       ` Eric Dumazet
2012-05-02 17:04                         ` Alexander Duyck
2012-05-02 17:02                       ` Alexander Duyck
2012-05-02 17:16                   ` Rick Jones
2012-05-01 22:58               ` Alexander Duyck
2012-05-01 23:10                 ` Alexander Duyck
2012-05-02  2:47                   ` Eric Dumazet
2012-05-02  3:54                     ` Eric Dumazet
2012-05-02  8:13                     ` [PATCH net-next] net: take care of cloned skbs in tcp_try_coalesce() Eric Dumazet
2012-05-02 15:52                       ` Alexander Duyck
2012-05-02 16:12                         ` Eric Dumazet
2012-05-02 16:27                           ` Alexander Duyck
2012-05-02 16:46                             ` Eric Dumazet [this message]
2012-05-02 17:55                               ` [PATCH v2 " Eric Dumazet
2012-05-02 19:58                                 ` [PATCH net-next] net: implement tcp coalescing in tcp_queue_rcv() Eric Dumazet
2012-05-02 20:11                                   ` Joe Perches
2012-05-02 20:23                                     ` Eric Dumazet
2012-05-02 20:34                                       ` Joe Perches
2012-05-03  0:32                                       ` David Miller
2012-05-03  1:11                                   ` David Miller
2012-05-03  2:14                                     ` Eric Dumazet
2012-05-03  2:21                                       ` David Miller
2012-05-03  1:11                                 ` [PATCH v2 net-next] net: take care of cloned skbs in tcp_try_coalesce() David Miller
2012-05-02 18:05                               ` [PATCH " Alexander Duyck
2012-05-02 18:15                                 ` Eric Dumazet
2012-05-02 20:55                                   ` Alexander Duyck
2012-05-03  1:52                                     ` Eric Dumazet
2012-05-03  3:00                                       ` Alexander Duyck
2012-05-03  3:14                                         ` Eric Dumazet
2012-05-03  3:28                                           ` Alexander Duyck
2012-05-01  1:48   ` [PATCH 3/4 v2 net-next] net: make GRO aware of skb->head_frag David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1335977179.22133.599.camel@edumazet-glaptop \
    --to=eric.dumazet@gmail.com \
    --cc=alexander.duyck@gmail.com \
    --cc=alexander.h.duyck@intel.com \
    --cc=bhutchings@solarflare.com \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=ilpo.jarvinen@helsinki.fi \
    --cc=jeffrey.t.kirsher@intel.com \
    --cc=maze@google.com \
    --cc=mcarlson@broadcom.com \
    --cc=mchan@broadcom.com \
    --cc=ncardwell@google.com \
    --cc=netdev@vger.kernel.org \
    --cc=therbert@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox