]> git.baikalelectronics.ru Git - kernel.git/commit
esp: avoid unneeded kmap_atomic call
authorWillem de Bruijn <willemb@google.com>
Sat, 9 Jan 2021 22:18:34 +0000 (17:18 -0500)
committerJakub Kicinski <kuba@kernel.org>
Tue, 12 Jan 2021 02:20:09 +0000 (18:20 -0800)
commit40e11b1fe6a0d03e99296681ad31be55a15b0e14
treea5a886f486cb705d9e421bf20b742950b7cf8191
parentbd7ebda86b3f3ba3a1d2f4cf8757e3047d5edcfa
esp: avoid unneeded kmap_atomic call

esp(6)_output_head uses skb_page_frag_refill to allocate a buffer for
the esp trailer.

It accesses the page with kmap_atomic to handle highmem. But
skb_page_frag_refill can return compound pages, of which
kmap_atomic only maps the first underlying page.

skb_page_frag_refill does not return highmem, because flag
__GFP_HIGHMEM is not set. ESP uses it in the same manner as TCP.
That also does not call kmap_atomic, but directly uses page_address,
in skb_copy_to_page_nocache. Do the same for ESP.

This issue has become easier to trigger with recent kmap local
debugging feature CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP.

Fixes: 1f6f9496b0f0 ("esp4: Avoid skb_cow_data whenever possible")
Fixes: 73a7b070a864 ("esp6: Avoid skb_cow_data whenever possible")
Signed-off-by: Willem de Bruijn <willemb@google.com>
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv4/esp4.c
net/ipv6/esp6.c