From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: Geliang Tang <geliang.tang@suse.com>,
Matthieu Baerts <matthieu.baerts@tessares.net>
Cc: mptcp@lists.linux.dev
Subject: Re: [PATCH mptcp-next] Squash to "selftests/bpf: test bpf_skc_to_mptcp_sock"
Date: Tue, 10 May 2022 16:03:17 -0700 (PDT) [thread overview]
Message-ID: <45f492b2-1b41-9681-2fac-9cd59dd0f6b@linux.intel.com> (raw)
In-Reply-To: <6de915f94665491d2944dd7aab1e6f7a0f3abcaf.1652156539.git.geliang.tang@suse.com>
On Tue, 10 May 2022, Geliang Tang wrote:
> Drop bpf_mptcp_helpers.h, squash into bpf_tcp_helpers.h (Andrii)
Hi Geliang -
Since there are 6 different commits touching bpf_mptcp_helpers.h, maybe it
would be easier for Matthieu if you posted the full patches for
"selftests/bpf: test bpf_skc_to_mptcp_sock" and all the bpf patches after
that, instead of squash changes / instructions?
I'm not sure the instructions below translate well to topgit.
- Mat
>
> 1
>
> CONFLICT (modify/delete): tools/testing/selftests/bpf/bpf_mptcp_helpers.h deleted in HEAD and modified in 8996b41ffcd2 (selftests/bpf: verify token of struct mptcp_sock). Version 8996b41ffcd2 (selftests/bpf: verify token of struct mptcp_sock) of tools/testing/selftests/bpf/bpf_mptcp_helpers.h left in tree.
> Auto-merging tools/testing/selftests/bpf/progs/mptcp_sock.c
> error: could not apply 8996b41ffcd2... selftests/bpf: verify token of struct mptcp_sock
>
> cat tools/testing/selftests/bpf/bpf_tcp_helpers.h:
>
> '''
> extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym;
>
> struct mptcp_sock {
> struct inet_connection_sock sk;
>
> __u32 token;
> } __attribute__((preserve_access_index));
>
> '''
>
> git add tools/testing/selftests/bpf/bpf_tcp_helpers.h
> git rm tools/testing/selftests/bpf/bpf_mptcp_helpers.h
>
> 2
>
> CONFLICT (modify/delete): tools/testing/selftests/bpf/bpf_mptcp_helpers.h deleted in HEAD and modified in 57dcfb6f61ec (selftests/bpf: verify ca_name of struct mptcp_sock). Version 57dcfb6f61ec (selftests/bpf: verify ca_name of struct mptcp_sock) of tools/testing/selftests/bpf/bpf_mptcp_helpers.h left in tree.
> Auto-merging tools/testing/selftests/bpf/bpf_tcp_helpers.h
> Auto-merging tools/testing/selftests/bpf/progs/mptcp_sock.c
> error: could not apply 57dcfb6f61ec... selftests/bpf: verify ca_name of struct mptcp_sock
>
> cat tools/testing/selftests/bpf/bpf_tcp_helpers.h:
>
> '''
> extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym;
>
> struct mptcp_sock {
> struct inet_connection_sock sk;
>
> __u32 token;
> char ca_name[TCP_CA_NAME_MAX];
> } __attribute__((preserve_access_index));
>
> '''
>
> git add tools/testing/selftests/bpf/bpf_tcp_helpers.h
> git rm tools/testing/selftests/bpf/bpf_mptcp_helpers.h
>
> 3
>
> CONFLICT (modify/delete): tools/testing/selftests/bpf/bpf_mptcp_helpers.h deleted in HEAD and modified in 416cb433f1df (selftests/bpf: verify first of struct mptcp_sock). Version 416cb433f1df (selftests/bpf: verify first of struct mptcp_sock) of tools/testing/selftests/bpf/bpf_mptcp_helpers.h left in tree.
> Auto-merging tools/testing/selftests/bpf/progs/mptcp_sock.c
> error: could not apply 416cb433f1df... selftests/bpf: verify first of struct mptcp_sock
>
> cat tools/testing/selftests/bpf/bpf_tcp_helpers.h:
>
> '''
> extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym;
>
> struct mptcp_sock {
> struct inet_connection_sock sk;
>
> __u32 token;
> struct sock *first;
> char ca_name[TCP_CA_NAME_MAX];
> } __attribute__((preserve_access_index));
>
> '''
>
> git add tools/testing/selftests/bpf/bpf_tcp_helpers.h
> git rm tools/testing/selftests/bpf/bpf_mptcp_helpers.h
>
> 4
>
> CONFLICT (modify/delete): tools/testing/selftests/bpf/bpf_mptcp_helpers.h deleted in HEAD and modified in 74d3c74494e6 (mptcp: add struct mptcp_sched_ops). Version 74d3c74494e6 (mptcp: add struct mptcp_sched_ops) of tools/testing/selftests/bpf/bpf_mptcp_helpers.h left in tree.
> error: could not apply 74d3c74494e6... mptcp: add struct mptcp_sched_ops
>
> cat tools/testing/selftests/bpf/bpf_tcp_helpers.h:
>
> '''
> extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym;
>
> struct mptcp_sched_data {
> struct sock *sock;
> bool call_again;
> };
>
> struct mptcp_sched_ops {
> char name[MPTCP_SCHED_NAME_MAX];
>
> void (*init)(const struct mptcp_sock *msk);
> void (*release)(const struct mptcp_sock *msk);
>
> void (*get_subflow)(const struct mptcp_sock *msk, bool reinject,
> struct mptcp_sched_data *data);
> void *owner;
> };
>
> struct mptcp_sock {
> struct inet_connection_sock sk;
>
> __u32 token;
> struct sock *first;
> char ca_name[TCP_CA_NAME_MAX];
> } __attribute__((preserve_access_index));
>
> '''
>
> git add tools/testing/selftests/bpf/bpf_tcp_helpers.h
> git rm tools/testing/selftests/bpf/bpf_mptcp_helpers.h
>
> 5
>
> CONFLICT (modify/delete): tools/testing/selftests/bpf/bpf_mptcp_helpers.h deleted in HEAD and modified in 1b3d7a5f1f10 (mptcp: add sched in mptcp_sock). Version 1b3d7a5f1f10 (mptcp: add sched in mptcp_sock) of tools/testing/selftests/bpf/bpf_mptcp_helpers.h left in tree.
> error: could not apply 1b3d7a5f1f10... mptcp: add sched in mptcp_sock
>
> cat tools/testing/selftests/bpf/bpf_tcp_helpers.h:
>
> '''
> extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym;
>
> struct mptcp_sched_data {
> struct sock *sock;
> bool call_again;
> };
>
> struct mptcp_sched_ops {
> char name[MPTCP_SCHED_NAME_MAX];
>
> void (*init)(const struct mptcp_sock *msk);
> void (*release)(const struct mptcp_sock *msk);
>
> void (*get_subflow)(const struct mptcp_sock *msk, bool reinject,
> struct mptcp_sched_data *data);
> void *owner;
> };
>
> struct mptcp_sock {
> struct inet_connection_sock sk;
>
> __u32 token;
> struct sock *first;
> struct mptcp_sched_ops *sched;
> char ca_name[TCP_CA_NAME_MAX];
> } __attribute__((preserve_access_index));
>
> '''
>
> git add tools/testing/selftests/bpf/bpf_tcp_helpers.h
> git rm tools/testing/selftests/bpf/bpf_mptcp_helpers.h
>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> ---
> MAINTAINERS | 1 -
> tools/testing/selftests/bpf/bpf_mptcp_helpers.h | 14 --------------
> tools/testing/selftests/bpf/bpf_tcp_helpers.h | 5 +++++
> tools/testing/selftests/bpf/progs/mptcp_sock.c | 2 +-
> 4 files changed, 6 insertions(+), 16 deletions(-)
> delete mode 100644 tools/testing/selftests/bpf/bpf_mptcp_helpers.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index af0d6a8543f6..56f5dd17859b 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -13787,7 +13787,6 @@ F: include/net/mptcp.h
> F: include/trace/events/mptcp.h
> F: include/uapi/linux/mptcp.h
> F: net/mptcp/
> -F: tools/testing/selftests/bpf/bpf_mptcp_helpers.h
> F: tools/testing/selftests/bpf/*/*mptcp*.c
> F: tools/testing/selftests/net/mptcp/
>
> diff --git a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h
> deleted file mode 100644
> index 18da4cc65e89..000000000000
> --- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -/* Copyright (c) 2022, SUSE. */
> -
> -#ifndef __BPF_MPTCP_HELPERS_H
> -#define __BPF_MPTCP_HELPERS_H
> -
> -#include "bpf_tcp_helpers.h"
> -
> -struct mptcp_sock {
> - struct inet_connection_sock sk;
> -
> -} __attribute__((preserve_access_index));
> -
> -#endif
> diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
> index b1ede6f0b821..a43b1afe22bd 100644
> --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h
> +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
> @@ -225,4 +225,9 @@ static __always_inline bool tcp_cc_eq(const char *a, const char *b)
> extern __u32 tcp_slow_start(struct tcp_sock *tp, __u32 acked) __ksym;
> extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym;
>
> +struct mptcp_sock {
> + struct inet_connection_sock sk;
> +
> +} __attribute__((preserve_access_index));
> +
> #endif
> diff --git a/tools/testing/selftests/bpf/progs/mptcp_sock.c b/tools/testing/selftests/bpf/progs/mptcp_sock.c
> index 9552584b1b6c..dd2448d1e7fc 100644
> --- a/tools/testing/selftests/bpf/progs/mptcp_sock.c
> +++ b/tools/testing/selftests/bpf/progs/mptcp_sock.c
> @@ -4,7 +4,7 @@
>
> #include <linux/bpf.h>
> #include <bpf/bpf_helpers.h>
> -#include "bpf_mptcp_helpers.h"
> +#include "bpf_tcp_helpers.h"
>
> char _license[] SEC("license") = "GPL";
> extern bool CONFIG_MPTCP __kconfig;
> --
> 2.34.1
>
>
>
--
Mat Martineau
Intel
next prev parent reply other threads:[~2022-05-10 23:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-10 4:23 [PATCH mptcp-next] Squash to "selftests/bpf: test bpf_skc_to_mptcp_sock" Geliang Tang
2022-05-10 4:23 ` [PATCH mptcp-next] Squash to "selftests/bpf: add bpf_first scheduler" Geliang Tang
2022-05-10 6:48 ` Squash to "selftests/bpf: add bpf_first scheduler": Tests Results MPTCP CI
2022-05-10 23:03 ` Mat Martineau [this message]
2022-05-14 10:05 ` [PATCH mptcp-next] Squash to "selftests/bpf: test bpf_skc_to_mptcp_sock" Matthieu Baerts
2022-05-16 22:56 ` Mat Martineau
2022-05-14 11:12 ` Matthieu Baerts
-- strict thread matches above, loose matches on Subject: below --
2022-05-16 5:50 Geliang Tang
2022-05-16 16:25 ` Matthieu Baerts
2022-05-17 7:43 [PATCH mptcp-next] Squash to "bpf: add bpf_skc_to_mptcp_sock_proto" Geliang Tang
2022-05-17 7:43 ` [PATCH mptcp-next] Squash to "selftests/bpf: test bpf_skc_to_mptcp_sock" Geliang Tang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45f492b2-1b41-9681-2fac-9cd59dd0f6b@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=geliang.tang@suse.com \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox