[PATCH bpf-next v3 0/8] bpf: mptcp: Support for mptcp_sock and is_mptcp

Mat Martineau posted 8 patches 1 week, 6 days ago
Failed in applying to current master (apply log)
MAINTAINERS                                   |   2 +
include/linux/bpf.h                           |   1 +
include/linux/btf_ids.h                       |   3 +-
include/net/mptcp.h                           |   6 +
include/uapi/linux/bpf.h                      |   8 +
kernel/bpf/verifier.c                         |   1 +
kernel/trace/bpf_trace.c                      |   2 +
net/core/filter.c                             |  27 +-
net/mptcp/Makefile                            |   2 +
net/mptcp/bpf.c                               |  22 ++
scripts/bpf_doc.py                            |   2 +
tools/include/uapi/linux/bpf.h                |   8 +
.../testing/selftests/bpf/bpf_mptcp_helpers.h |  17 ++
tools/testing/selftests/bpf/bpf_tcp_helpers.h |   4 +
tools/testing/selftests/bpf/config            |   3 +
tools/testing/selftests/bpf/network_helpers.c |  43 ++-
tools/testing/selftests/bpf/network_helpers.h |   4 +
.../testing/selftests/bpf/prog_tests/mptcp.c  | 272 ++++++++++++++++++
.../testing/selftests/bpf/progs/mptcp_sock.c  |  80 ++++++
19 files changed, 497 insertions(+), 10 deletions(-)
create mode 100644 net/mptcp/bpf.c
create mode 100644 tools/testing/selftests/bpf/bpf_mptcp_helpers.h
create mode 100644 tools/testing/selftests/bpf/prog_tests/mptcp.c
create mode 100644 tools/testing/selftests/bpf/progs/mptcp_sock.c
[PATCH bpf-next v3 0/8] bpf: mptcp: Support for mptcp_sock and is_mptcp
Posted by Mat Martineau 1 week, 6 days ago
This patch set adds BPF access to the is_mptcp flag in tcp_sock and
access to mptcp_sock structures, along with associated self tests. You
may recognize some of the code from earlier
(https://lore.kernel.org/bpf/20200918121046.190240-6-nicolas.rybowski@tessares.net/)
but it has been reworked quite a bit.


v1 -> v2: Emit BTF type, add func_id checks in verifier.c and bpf_trace.c,
remove build check for CONFIG_BPF_JIT, add selftest check for CONFIG_MPTCP,
and add a patch to include CONFIG_IKCONFIG/CONFIG_IKCONFIG_PROC for the
BPF self tests.

v2 -> v3: Access sysctl through the filesystem to work around CI use of
the more limited busybox sysctl command.


Geliang Tang (6):
  bpf: add bpf_skc_to_mptcp_sock_proto
  selftests: bpf: Enable CONFIG_IKCONFIG_PROC in config
  selftests: bpf: test bpf_skc_to_mptcp_sock
  selftests: bpf: verify token of struct mptcp_sock
  selftests: bpf: verify ca_name of struct mptcp_sock
  selftests: bpf: verify first of struct mptcp_sock

Nicolas Rybowski (2):
  bpf: expose is_mptcp flag to bpf_tcp_sock
  selftests: bpf: add MPTCP test base

 MAINTAINERS                                   |   2 +
 include/linux/bpf.h                           |   1 +
 include/linux/btf_ids.h                       |   3 +-
 include/net/mptcp.h                           |   6 +
 include/uapi/linux/bpf.h                      |   8 +
 kernel/bpf/verifier.c                         |   1 +
 kernel/trace/bpf_trace.c                      |   2 +
 net/core/filter.c                             |  27 +-
 net/mptcp/Makefile                            |   2 +
 net/mptcp/bpf.c                               |  22 ++
 scripts/bpf_doc.py                            |   2 +
 tools/include/uapi/linux/bpf.h                |   8 +
 .../testing/selftests/bpf/bpf_mptcp_helpers.h |  17 ++
 tools/testing/selftests/bpf/bpf_tcp_helpers.h |   4 +
 tools/testing/selftests/bpf/config            |   3 +
 tools/testing/selftests/bpf/network_helpers.c |  43 ++-
 tools/testing/selftests/bpf/network_helpers.h |   4 +
 .../testing/selftests/bpf/prog_tests/mptcp.c  | 272 ++++++++++++++++++
 .../testing/selftests/bpf/progs/mptcp_sock.c  |  80 ++++++
 19 files changed, 497 insertions(+), 10 deletions(-)
 create mode 100644 net/mptcp/bpf.c
 create mode 100644 tools/testing/selftests/bpf/bpf_mptcp_helpers.h
 create mode 100644 tools/testing/selftests/bpf/prog_tests/mptcp.c
 create mode 100644 tools/testing/selftests/bpf/progs/mptcp_sock.c


base-commit: 20b87e7c29dffcfa3f96f2e99daec84fd46cabdb
-- 
2.36.0


Re: [PATCH bpf-next v3 0/8] bpf: mptcp: Support for mptcp_sock and is_mptcp
Posted by Andrii Nakryiko 1 week, 2 days ago
On Mon, May 2, 2022 at 2:12 PM Mat Martineau
<mathew.j.martineau@linux.intel.com> wrote:
>
> This patch set adds BPF access to the is_mptcp flag in tcp_sock and
> access to mptcp_sock structures, along with associated self tests. You
> may recognize some of the code from earlier
> (https://lore.kernel.org/bpf/20200918121046.190240-6-nicolas.rybowski@tessares.net/)
> but it has been reworked quite a bit.
>
>
> v1 -> v2: Emit BTF type, add func_id checks in verifier.c and bpf_trace.c,
> remove build check for CONFIG_BPF_JIT, add selftest check for CONFIG_MPTCP,
> and add a patch to include CONFIG_IKCONFIG/CONFIG_IKCONFIG_PROC for the
> BPF self tests.
>
> v2 -> v3: Access sysctl through the filesystem to work around CI use of
> the more limited busybox sysctl command.
>
>
> Geliang Tang (6):
>   bpf: add bpf_skc_to_mptcp_sock_proto
>   selftests: bpf: Enable CONFIG_IKCONFIG_PROC in config
>   selftests: bpf: test bpf_skc_to_mptcp_sock
>   selftests: bpf: verify token of struct mptcp_sock
>   selftests: bpf: verify ca_name of struct mptcp_sock
>   selftests: bpf: verify first of struct mptcp_sock
>

It would be nice to use more consistent with the majority of other
commits "selftests/bpf: " prefix. Thank you.

> Nicolas Rybowski (2):
>   bpf: expose is_mptcp flag to bpf_tcp_sock
>   selftests: bpf: add MPTCP test base
>
>  MAINTAINERS                                   |   2 +
>  include/linux/bpf.h                           |   1 +
>  include/linux/btf_ids.h                       |   3 +-
>  include/net/mptcp.h                           |   6 +
>  include/uapi/linux/bpf.h                      |   8 +
>  kernel/bpf/verifier.c                         |   1 +
>  kernel/trace/bpf_trace.c                      |   2 +
>  net/core/filter.c                             |  27 +-
>  net/mptcp/Makefile                            |   2 +
>  net/mptcp/bpf.c                               |  22 ++
>  scripts/bpf_doc.py                            |   2 +
>  tools/include/uapi/linux/bpf.h                |   8 +
>  .../testing/selftests/bpf/bpf_mptcp_helpers.h |  17 ++
>  tools/testing/selftests/bpf/bpf_tcp_helpers.h |   4 +
>  tools/testing/selftests/bpf/config            |   3 +
>  tools/testing/selftests/bpf/network_helpers.c |  43 ++-
>  tools/testing/selftests/bpf/network_helpers.h |   4 +
>  .../testing/selftests/bpf/prog_tests/mptcp.c  | 272 ++++++++++++++++++
>  .../testing/selftests/bpf/progs/mptcp_sock.c  |  80 ++++++
>  19 files changed, 497 insertions(+), 10 deletions(-)
>  create mode 100644 net/mptcp/bpf.c
>  create mode 100644 tools/testing/selftests/bpf/bpf_mptcp_helpers.h
>  create mode 100644 tools/testing/selftests/bpf/prog_tests/mptcp.c
>  create mode 100644 tools/testing/selftests/bpf/progs/mptcp_sock.c
>
>
> base-commit: 20b87e7c29dffcfa3f96f2e99daec84fd46cabdb
> --
> 2.36.0
>

Re: [PATCH bpf-next v3 0/8] bpf: mptcp: Support for mptcp_sock and is_mptcp
Posted by Mat Martineau 1 week, 2 days ago
On Fri, 6 May 2022, Andrii Nakryiko wrote:

> On Mon, May 2, 2022 at 2:12 PM Mat Martineau
> <mathew.j.martineau@linux.intel.com> wrote:
>>
>> This patch set adds BPF access to the is_mptcp flag in tcp_sock and
>> access to mptcp_sock structures, along with associated self tests. You
>> may recognize some of the code from earlier
>> (https://lore.kernel.org/bpf/20200918121046.190240-6-nicolas.rybowski@tessares.net/)
>> but it has been reworked quite a bit.
>>
>>
>> v1 -> v2: Emit BTF type, add func_id checks in verifier.c and bpf_trace.c,
>> remove build check for CONFIG_BPF_JIT, add selftest check for CONFIG_MPTCP,
>> and add a patch to include CONFIG_IKCONFIG/CONFIG_IKCONFIG_PROC for the
>> BPF self tests.
>>
>> v2 -> v3: Access sysctl through the filesystem to work around CI use of
>> the more limited busybox sysctl command.
>>
>>
>> Geliang Tang (6):
>>   bpf: add bpf_skc_to_mptcp_sock_proto
>>   selftests: bpf: Enable CONFIG_IKCONFIG_PROC in config
>>   selftests: bpf: test bpf_skc_to_mptcp_sock
>>   selftests: bpf: verify token of struct mptcp_sock
>>   selftests: bpf: verify ca_name of struct mptcp_sock
>>   selftests: bpf: verify first of struct mptcp_sock
>>
>
> It would be nice to use more consistent with the majority of other
> commits "selftests/bpf: " prefix. Thank you.

Sure, we'll update those prefixes and address your comments in the 
individual patches. Thanks for the review.

- Mat

>
>> Nicolas Rybowski (2):
>>   bpf: expose is_mptcp flag to bpf_tcp_sock
>>   selftests: bpf: add MPTCP test base
>>
>>  MAINTAINERS                                   |   2 +
>>  include/linux/bpf.h                           |   1 +
>>  include/linux/btf_ids.h                       |   3 +-
>>  include/net/mptcp.h                           |   6 +
>>  include/uapi/linux/bpf.h                      |   8 +
>>  kernel/bpf/verifier.c                         |   1 +
>>  kernel/trace/bpf_trace.c                      |   2 +
>>  net/core/filter.c                             |  27 +-
>>  net/mptcp/Makefile                            |   2 +
>>  net/mptcp/bpf.c                               |  22 ++
>>  scripts/bpf_doc.py                            |   2 +
>>  tools/include/uapi/linux/bpf.h                |   8 +
>>  .../testing/selftests/bpf/bpf_mptcp_helpers.h |  17 ++
>>  tools/testing/selftests/bpf/bpf_tcp_helpers.h |   4 +
>>  tools/testing/selftests/bpf/config            |   3 +
>>  tools/testing/selftests/bpf/network_helpers.c |  43 ++-
>>  tools/testing/selftests/bpf/network_helpers.h |   4 +
>>  .../testing/selftests/bpf/prog_tests/mptcp.c  | 272 ++++++++++++++++++
>>  .../testing/selftests/bpf/progs/mptcp_sock.c  |  80 ++++++
>>  19 files changed, 497 insertions(+), 10 deletions(-)
>>  create mode 100644 net/mptcp/bpf.c
>>  create mode 100644 tools/testing/selftests/bpf/bpf_mptcp_helpers.h
>>  create mode 100644 tools/testing/selftests/bpf/prog_tests/mptcp.c
>>  create mode 100644 tools/testing/selftests/bpf/progs/mptcp_sock.c
>>
>>
>> base-commit: 20b87e7c29dffcfa3f96f2e99daec84fd46cabdb
>> --
>> 2.36.0
>>
>

--
Mat Martineau
Intel