* [PATCH] [NET]: Unmap fragment page once iterator is done
@ 2013-06-15 0:54 Wedson Almeida Filho
2013-06-24 1:36 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Wedson Almeida Filho @ 2013-06-15 0:54 UTC (permalink / raw)
To: David S. Miller; +Cc: Thomas Graf, netdev, linux-kernel, Wedson Almeida Filho
Callers of skb_seq_read() are currently forced to call skb_abort_seq_read()
even when consuming all the data because the last call to skb_seq_read (the
one that returns 0 to indicate the end) fails to unmap the last fragment page.
With this patch callers will be allowed to traverse the SKB data by calling
skb_prepare_seq_read() once and repeatedly calling skb_seq_read() as originally
intended (and documented in the original commit 677e90eda), that is, only call
skb_abort_seq_read() if the sequential read is actually aborted.
Signed-off-by: Wedson Almeida Filho <wedsonaf@gmail.com>
---
net/core/skbuff.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index cfd777b..26ea1cf 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2554,8 +2554,13 @@ unsigned int skb_seq_read(unsigned int consumed, const u8 **data,
unsigned int block_limit, abs_offset = consumed + st->lower_offset;
skb_frag_t *frag;
- if (unlikely(abs_offset >= st->upper_offset))
+ if (unlikely(abs_offset >= st->upper_offset)) {
+ if (st->frag_data) {
+ kunmap_atomic(st->frag_data);
+ st->frag_data = NULL;
+ }
return 0;
+ }
next_skb:
block_limit = skb_headlen(st->cur_skb) + st->stepped_offset;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [NET]: Unmap fragment page once iterator is done
2013-06-15 0:54 [PATCH] [NET]: Unmap fragment page once iterator is done Wedson Almeida Filho
@ 2013-06-24 1:36 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-06-24 1:36 UTC (permalink / raw)
To: wedsonaf; +Cc: tgraf, netdev, linux-kernel
From: Wedson Almeida Filho <wedsonaf@gmail.com>
Date: Fri, 14 Jun 2013 17:54:29 -0700
> Callers of skb_seq_read() are currently forced to call skb_abort_seq_read()
> even when consuming all the data because the last call to skb_seq_read (the
> one that returns 0 to indicate the end) fails to unmap the last fragment page.
>
> With this patch callers will be allowed to traverse the SKB data by calling
> skb_prepare_seq_read() once and repeatedly calling skb_seq_read() as originally
> intended (and documented in the original commit 677e90eda), that is, only call
> skb_abort_seq_read() if the sequential read is actually aborted.
>
> Signed-off-by: Wedson Almeida Filho <wedsonaf@gmail.com>
If you're going to do this I want you to get rid of the now-extraneous
skb_abort_seq_read() calls at the same time.
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-24 1:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-15 0:54 [PATCH] [NET]: Unmap fragment page once iterator is done Wedson Almeida Filho
2013-06-24 1:36 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).