virtio-net: realign page_to_skb() after merges
Subsystems (4)
Jakub Kicinski
maintainerPATCH 1/1 virtio-net: realign page_to_skb() after merges
We ended up merging two versions of the same patch set:
commit 8fb7da9e9907 ("virtio_net: get build_skb() buf by data ptr") commit 5c37711d9f27 ("virtio-net: fix for unable to handle page fault for address")
into net, and
commit 7bf64460e3b2 ("virtio-net: get build_skb() buf by data ptr") commit 6c66c147b9a4 ("virtio-net: fix for unable to handle page fault for address")
into net-next. Redo the merge from commit 126285651b7f ("Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net"), so that the most recent code remains.
--- drivers/net/virtio_net.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-)
drivers/net/virtio_net.c +8 -19
@@ -380,7 +380,7 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi, struct page *page, unsigned int offset, unsigned int len, unsigned int truesize, bool hdr_valid, unsigned int metasize, - bool whole_page) + unsigned int headroom) { struct sk_buff *skb;struct virtio_net_hdr_mrg_rxbuf *hdr;
@@ -398,28 +398,16 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,else hdr_padded_len =sizeof (struct padded_vnet_hdr ); -/* If whole_page, there is an offset between the beginning of the +/* If headroom is not 0, there is an offset between the beginning of the * data and the allocated space, otherwise the data and the allocated * space are aligned. * * Buffers with headroom use PAGE_SIZE as alloc size, see * add_recvbuf_mergeable() + get_mergeable_buf_len() */ -if (whole_page) { -/* Buffers with whole_page use PAGE_SIZE as alloc size, -* see add_recvbuf_mergeable() + get_mergeable_buf_len() -*/ - truesize =PAGE_SIZE ; - -/* page maybe head page, so we should get the buf by p, not the -* page -*/ - tailroom = truesize - len -offset_in_page (p); - buf = (char *)((unsigned long )p &PAGE_MASK ); - }else { - tailroom = truesize - len; - buf = p; - } + truesize = headroom ?PAGE_SIZE : truesize; + tailroom = truesize - len - headroom; + buf = p - headroom; len -= hdr_len; offset += hdr_padded_len;
@@ -978,7 +966,8 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,put_page (page); head_skb =page_to_skb (vi, rq, xdp_page, offset, len,PAGE_SIZE , false, - metasize, true); + metasize, +VIRTIO_XDP_HEADROOM );return head_skb; }break ;
@@ -1029,7 +1018,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,rcu_read_unlock (); head_skb =page_to_skb (vi, rq, page, offset, len, truesize, !xdp_prog, - metasize, !!headroom); + metasize, headroom); curr_skb = head_skb;if (unlikely (!curr_skb))
Signature · 1 line
2.31.1
Quoted 10 lines · Jakub Kicinski
We ended up merging two versions of the same patch set:
commit
8fb7da9e9907("virtio_net: getbuild_skb()buf by data ptr") commit5c37711d9f27("virtio-net: fix for unable to handle page fault for address")into net, and
commit
7bf64460e3b2("virtio-net: getbuild_skb()buf by data ptr") commit6c66c147b9a4("virtio-net: fix for unable to handle page fault for address")
Quoted 6 lines
into net-next. Redo the merge from commit
126285651b7f("Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net"), so that the most recent code remains.Signed-off-by Jakub Kicinski <[email protected]>
Quoted 69 lines
--- drivers/net/virtio_net.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-)drivers/net/virtio_net.c +8
-19@@ -380,7 +380,7 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi, struct page *page, unsigned int offset, unsigned int len, unsigned int truesize, bool hdr_valid, unsigned int metasize, - bool whole_page) + unsigned int headroom) { struct sk_buff *skb;struct virtio_net_hdr_mrg_rxbuf *hdr;@@ -398,28 +398,16 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,else hdr_padded_len =sizeof (struct padded_vnet_hdr ); -/* If whole_page, there is an offset between the beginning of the +/* If headroom is not 0, there is an offset between the beginning of the * data and the allocated space, otherwise the data and the allocated * space are aligned. * * Buffers with headroom use PAGE_SIZE as alloc size, see * add_recvbuf_mergeable() + get_mergeable_buf_len() */ -if (whole_page) { -/* Buffers with whole_page use PAGE_SIZE as alloc size, -* see add_recvbuf_mergeable() + get_mergeable_buf_len() -*/ - truesize =PAGE_SIZE ; - -/* page maybe head page, so we should get the buf by p, not the -* page -*/ - tailroom = truesize - len -offset_in_page (p); - buf = (char *)((unsigned long )p &PAGE_MASK ); - }else { - tailroom = truesize - len; - buf = p; - } + truesize = headroom ?PAGE_SIZE : truesize; + tailroom = truesize - len - headroom; + buf = p - headroom; len -= hdr_len; offset += hdr_padded_len;@@ -978,7 +966,8 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,put_page (page); head_skb =page_to_skb (vi, rq, xdp_page, offset, len,PAGE_SIZE , false, - metasize, true); + metasize, +VIRTIO_XDP_HEADROOM );return head_skb; }break ;@@ -1029,7 +1018,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,rcu_read_unlock (); head_skb =page_to_skb (vi, rq, page, offset, len, truesize, !xdp_prog, - metasize, !!headroom); + metasize, headroom); curr_skb = head_skb;if (unlikely (!curr_skb))
Michael S. Tsirkin
maintainerQuoted 10 lines · Jakub Kicinski
We ended up merging two versions of the same patch set:
commit
8fb7da9e9907("virtio_net: getbuild_skb()buf by data ptr") commit5c37711d9f27("virtio-net: fix for unable to handle page fault for address")into net, and
commit
7bf64460e3b2("virtio-net: getbuild_skb()buf by data ptr") commit6c66c147b9a4("virtio-net: fix for unable to handle page fault for address")
Quoted 6 lines
into net-next. Redo the merge from commit
126285651b7f("Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net"), so that the most recent code remains.Signed-off-by Jakub Kicinski <[email protected]>
And maybe add
so automated tools have an easier time finding this fixup.
Quoted 71 lines
--- drivers/net/virtio_net.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-)drivers/net/virtio_net.c +8
-19@@ -380,7 +380,7 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi, struct page *page, unsigned int offset, unsigned int len, unsigned int truesize, bool hdr_valid, unsigned int metasize, - bool whole_page) + unsigned int headroom) { struct sk_buff *skb;struct virtio_net_hdr_mrg_rxbuf *hdr;@@ -398,28 +398,16 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,else hdr_padded_len =sizeof (struct padded_vnet_hdr ); -/* If whole_page, there is an offset between the beginning of the +/* If headroom is not 0, there is an offset between the beginning of the * data and the allocated space, otherwise the data and the allocated * space are aligned. * * Buffers with headroom use PAGE_SIZE as alloc size, see * add_recvbuf_mergeable() + get_mergeable_buf_len() */ -if (whole_page) { -/* Buffers with whole_page use PAGE_SIZE as alloc size, -* see add_recvbuf_mergeable() + get_mergeable_buf_len() -*/ - truesize =PAGE_SIZE ; - -/* page maybe head page, so we should get the buf by p, not the -* page -*/ - tailroom = truesize - len -offset_in_page (p); - buf = (char *)((unsigned long )p &PAGE_MASK ); - }else { - tailroom = truesize - len; - buf = p; - } + truesize = headroom ?PAGE_SIZE : truesize; + tailroom = truesize - len - headroom; + buf = p - headroom; len -= hdr_len; offset += hdr_padded_len;@@ -978,7 +966,8 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,put_page (page); head_skb =page_to_skb (vi, rq, xdp_page, offset, len,PAGE_SIZE , false, - metasize, true); + metasize, +VIRTIO_XDP_HEADROOM );return head_skb; }break ;@@ -1029,7 +1018,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,rcu_read_unlock (); head_skb =page_to_skb (vi, rq, page, offset, len, truesize, !xdp_prog, - metasize, !!headroom); + metasize, headroom); curr_skb = head_skb;if (unlikely (!curr_skb))Signature · 1 line
2.31.1
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 8 lines · On Mon, 2 Aug 2021 10:57:29 -0700 you wrote:
We ended up merging two versions of the same patch set:
commit
8fb7da9e9907("virtio_net: getbuild_skb()buf by data ptr") commit5c37711d9f27("virtio-net: fix for unable to handle page fault for address")into net, and
[...]
Here is the summary with links:
- [net-next] virtio-net: realign page_to_skb() after merges
https://git.kernel.org/netdev/net-next/c/c32325b8fdf2
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html