[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090115231934.GA8328@gondor.apana.org.au>
Date: Fri, 16 Jan 2009 10:19:35 +1100
From: Herbert Xu <herbert@...dor.apana.org.au>
To: Willy Tarreau <w@....eu>
Cc: David Miller <davem@...emloft.net>, jarkao2@...il.com,
zbr@...emap.net, dada1@...mosbay.com, ben@...s.com, mingo@...e.hu,
linux-kernel@...r.kernel.org, netdev@...r.kernel.org,
jens.axboe@...cle.com
Subject: Re: [PATCH] tcp: splice as many packets as possible at once
On Fri, Jan 16, 2009 at 12:03:31AM +0100, Willy Tarreau wrote:
>
> I'm leaving the patch below for comments, maybe someone will spot
> something ? Don't we need at least one kfree() somewhere to match
> alloc_pages() ?
Indeed.
> > static inline int spd_fill_page(struct splice_pipe_desc *spd, struct page *page,
> > unsigned int len, unsigned int offset,
> > - struct sk_buff *skb)
> > + struct sk_buff *skb, int linear)
> > {
> > if (unlikely(spd->nr_pages == PIPE_BUFFERS))
> > return 1;
> >
> > + if (linear) {
> > + page = linear_to_page(page, len, offset);
> > + if (!page)
> > + return 1;
> > + }
> > +
> > spd->pages[spd->nr_pages] = page;
> > spd->partial[spd->nr_pages].len = len;
> > spd->partial[spd->nr_pages].offset = offset;
> > - spd->partial[spd->nr_pages].private = (unsigned long) skb_get(skb);
> > spd->nr_pages++;
> > + get_page(page);
This get_page needs to be moved into an else clause of the previous
if block.
Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists