[PATCH mptcp-next v10 0/5] add add skc_to_mptcp_sock

Geliang Tang posted 5 patches 2 years ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/cover.1646796538.git.geliang.tang@suse.com
Maintainers: Matthieu Baerts <matthieu.baerts@tessares.net>, Alexei Starovoitov <ast@kernel.org>, Yonghong Song <yhs@fb.com>, Daniel Borkmann <daniel@iogearbox.net>, John Fastabend <john.fastabend@gmail.com>, KP Singh <kpsingh@kernel.org>, Song Liu <songliubraving@fb.com>, Jakub Kicinski <kuba@kernel.org>, "David S. Miller" <davem@davemloft.net>, Shuah Khan <shuah@kernel.org>, Mat Martineau <mathew.j.martineau@linux.intel.com>, Andrii Nakryiko <andrii@kernel.org>, Martin KaFai Lau <kafai@fb.com>
include/linux/bpf.h                           |  31 +----
include/linux/btf_ids.h                       |   3 +-
include/uapi/linux/bpf.h                      |  14 +--
kernel/bpf/verifier.c                         |  20 ---
net/core/filter.c                             |  22 +++-
net/mptcp/bpf.c                               |  62 +---------
scripts/bpf_doc.py                            |   4 +-
tools/include/uapi/linux/bpf.h                |  14 +--
tools/testing/selftests/bpf/bpf_tcp_helpers.h |   6 +
.../testing/selftests/bpf/prog_tests/mptcp.c  | 116 +++++++++++++++---
tools/testing/selftests/bpf/progs/mptcp.c     |  36 ++++--
tools/testing/selftests/bpf/verifier/sock.c   |  63 ----------
12 files changed, 172 insertions(+), 219 deletions(-)
[PATCH mptcp-next v10 0/5] add add skc_to_mptcp_sock
Posted by Geliang Tang 2 years ago
v10:
 - merge the squash-to patch.
 - update patch 3 as Matt suggested.
 - add sync() in get_msk_token() before read().
 - add a comment for get_msk_token().
 - update subjects and commit logs.

v9:
 - update progs/mptcp.c in patch 4 and 5

v8:
 - update as Matt suggested.

v7:
 - parse msk token from the output of 'ip mptcp monitor'.
 - add Nicolas and Matt's SoB tags.

v6:
 - add skc_to_mptcp_sock helper and test

RESEND:
 - fix the CI Build Failure.
v5:
 - fix incorrect token value
 - verify the token in selftest

v4:
 - define bpf_mptcp_sock_proto as a static function, no longer export
   it in linux/bpf.h

v3:
 - use RET_PTR_TO_BTF_ID_OR_NULL instead of RET_PTR_TO_MPTCP_SOCK_OR_NULL
 - add a new bpf_id BTF_SOCK_TYPE_MPTCP

v2:
 - keep RET_PTR_TO_MPTCP_SOCK_OR_NULL. If we use RET_PTR_TO_BTF_ID_OR_NULL
instead of RET_PTR_TO_MPTCP_SOCK_OR_NULL as Alexei suggested, the
"userspace" tests developed by Nicolas will break.

Geliang Tang (5):
  Revert "selftests: bpf: add bpf_mptcp_sock() verifier tests"
  Revert "bpf: add 'bpf_mptcp_sock' structure and helper"
  bpf: add bpf_skc_to_mptcp_sock_proto
  Squash to "selftests: bpf: add MPTCP test base"
  selftests: bpf: test bpf_skc_to_mptcp_sock

 include/linux/bpf.h                           |  31 +----
 include/linux/btf_ids.h                       |   3 +-
 include/uapi/linux/bpf.h                      |  14 +--
 kernel/bpf/verifier.c                         |  20 ---
 net/core/filter.c                             |  22 +++-
 net/mptcp/bpf.c                               |  62 +---------
 scripts/bpf_doc.py                            |   4 +-
 tools/include/uapi/linux/bpf.h                |  14 +--
 tools/testing/selftests/bpf/bpf_tcp_helpers.h |   6 +
 .../testing/selftests/bpf/prog_tests/mptcp.c  | 116 +++++++++++++++---
 tools/testing/selftests/bpf/progs/mptcp.c     |  36 ++++--
 tools/testing/selftests/bpf/verifier/sock.c   |  63 ----------
 12 files changed, 172 insertions(+), 219 deletions(-)

-- 
2.34.1


Re: [PATCH mptcp-next v10 0/5] add add skc_to_mptcp_sock
Posted by Matthieu Baerts 2 years ago
Hi Geliang,

On 09/03/2022 04:35, Geliang Tang wrote:
> v10:
>  - merge the squash-to patch.
>  - update patch 3 as Matt suggested.
>  - add sync() in get_msk_token() before read().
>  - add a comment for get_msk_token().
>  - update subjects and commit logs.

Thank you for this new version! It looks good to me!

Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net>

I'm looking at rebuilding the TopGit tree. I will apply this just after.

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

Re: [PATCH mptcp-next v10 0/5] add add skc_to_mptcp_sock
Posted by Mat Martineau 2 years ago
On Wed, 9 Mar 2022, Matthieu Baerts wrote:

> Hi Geliang,
>
> On 09/03/2022 04:35, Geliang Tang wrote:
>> v10:
>>  - merge the squash-to patch.
>>  - update patch 3 as Matt suggested.
>>  - add sync() in get_msk_token() before read().
>>  - add a comment for get_msk_token().
>>  - update subjects and commit logs.
>
> Thank you for this new version! It looks good to me!
>
> Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net>
>
> I'm looking at rebuilding the TopGit tree. I will apply this just after.
>

Thank you both for iterating on this. Builds and runs fine for me 
(although I didn't try !CONFIG_MPTCP).

Acked-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

--
Mat Martineau
Intel