| Message ID | 20240626070153.759257-1-sagi@grimberg.me (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2d5f6801db8ec0ce97bc520ecd51a7be06a35042 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] Revert "net: micro-optimize skb_datagram_iter" | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 26 Jun 2024 10:01:53 +0300 you wrote: > This reverts commit 934c29999b57b835d65442da6f741d5e27f3b584. > This triggered a usercopy BUG() in systems with HIGHMEM, reported > by the test robot in: > https://lore.kernel.org/oe-lkp/202406161539.b5ff7b20-oliver.sang@intel.com > > Signed-off-by: Sagi Grimberg <sagi@grimberg.me> > > [...] Here is the summary with links: - [net-next,v2] Revert "net: micro-optimize skb_datagram_iter" https://git.kernel.org/netdev/net-next/c/2d5f6801db8e You are awesome, thank you!
diff --git a/net/core/datagram.c b/net/core/datagram.c index 95f242591fd2..e614cfd8e14a 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c @@ -417,14 +417,14 @@ static int __skb_datagram_iter(const struct sk_buff *skb, int offset, end = start + skb_frag_size(frag); if ((copy = end - offset) > 0) { struct page *page = skb_frag_page(frag); - u8 *vaddr = kmap_local_page(page); + u8 *vaddr = kmap(page); if (copy > len) copy = len; n = INDIRECT_CALL_1(cb, simple_copy_to_iter, vaddr + skb_frag_off(frag) + offset - start, copy, data, to); - kunmap_local(vaddr); + kunmap(page); offset += n; if (n != copy) goto short_copy;
This reverts commit 934c29999b57b835d65442da6f741d5e27f3b584. This triggered a usercopy BUG() in systems with HIGHMEM, reported by the test robot in: https://lore.kernel.org/oe-lkp/202406161539.b5ff7b20-oliver.sang@intel.com Signed-off-by: Sagi Grimberg <sagi@grimberg.me> --- Changes from v1: - added target tree net/core/datagram.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)