Skip to contentSkip to conversation

net: Fix page seeking for skb_splice_bits().

PATCH In review Jarek Poplawski 2 participants 2 messages Feb 11, 2009 – Feb 13, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: Fix page seeking for skb_splice_bits().

Hi,

So, you both were right there is something wrong with splice for multipage linear regions, at least theoretically. Since I don't know if this can really matter in practice (could NUMA slab allocate these pages from different tables?), I've done it against -net, but maybe -net-next is enough?

Thanks,
Jarek P.
------------->
net: Fix page seeking for skb_splice_bits().

struct page walking should be done with proper accessor functions, not directly.

With doubts from David S. Miller and Herbert Xu.

---

 net/core/skbuff.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
net/core/skbuff.c +6 -1
index da74b84..7aacd95 100644
@@ -1373,8 +1373,13 @@ static inline int spd_fill_page(struct splice_pipe_desc *spd, struct page *page,
 static inline void __segment_seek(struct page **page, unsigned int *poff,
 				  unsigned int *plen, unsigned int off)
 {
+	unsigned long n;
+
 	*poff += off;
-	*page += *poff / PAGE_SIZE;
+	n = *poff / PAGE_SIZE;
+	if (n)
+		*page = nth_page(*page, n);
+
 	*poff = *poff % PAGE_SIZE;
 	*plen -= off;
 }
maintainer
#1 lore raw

From: Jarek Poplawski <[email protected]>
Date: Wed, 11 Feb 2009 22:58:06 +0100

Quoted 5 lines

So, you both were right there is something wrong with splice for multipage linear regions, at least theoretically. Since I don't know if this can really matter in practice (could NUMA slab allocate these pages from different tables?), I've done it against -net, but maybe -net-next is enough?

I'll add this to net-next-2.6 because I think it's theoretical at best. In fact I don't think we would get allocations across NUMA nodes in this situation.

Thanks Jarek.