From: Alexei Starovoitov <ast@kernel.org>
Date: Fri, 2 Oct 2020 22:18:40 +0000 (-0700)
Subject: Merge branch 'Add skb_adjust_room() for SK_SKB'
X-Git-Tag: v5.10-rc1~107^2~16^2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb91db01c652ba9391f67c21db2d5260448b3efd;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'Add skb_adjust_room() for SK_SKB'

John Fastabend says:

====================
This implements the helper skb_adjust_room() for BPF_SKS_SK_STREAM_VERDICT
programs so we can push/pop headers from the data on recieve. One use
case is to pop TLS headers off kTLS packets.

The first patch implements the helper and the second updates test_sockmap
to use it removing some case handling we had to do earlier to account for
the TLS headers in the kTLS tests.

v1->v2:
 Fix error path for TLS case (Daniel)
 check mode input is 0 because we don't use it now (Daniel)
 Remove incorrect/misleading comment (Lorenz)

Thanks,
John
Acked-by: Martin KaFai Lau <kafai@fb.com>
---
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---

fb91db01c652ba9391f67c21db2d5260448b3efd