linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Martin KaFai Lau <kafai@fb.com>
To: Florent Revest <revest@chromium.org>
Cc: <bpf@vger.kernel.org>, <viro@zeniv.linux.org.uk>,
	<davem@davemloft.net>, <kuba@kernel.org>, <ast@kernel.org>,
	<daniel@iogearbox.net>, <yhs@fb.com>, <andrii@kernel.org>,
	<kpsingh@chromium.org>, <revest@google.com>,
	<linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>
Subject: Re: [PATCH bpf-next v4 6/6] bpf: Test bpf_sk_storage_get in tcp iterators
Date: Thu, 3 Dec 2020 18:05:51 -0800	[thread overview]
Message-ID: <20201204020551.egjexugorxumgarv@kafai-mbp.dhcp.thefacebook.com> (raw)
In-Reply-To: <20201202205527.984965-6-revest@google.com>

On Wed, Dec 02, 2020 at 09:55:27PM +0100, Florent Revest wrote:
> This extends the existing bpf_sk_storage_get test where a socket is
> created and tagged with its creator's pid by a task_file iterator.
> 
> A TCP iterator is now also used at the end of the test to negate the
> values already stored in the local storage. The test therefore expects
> -getpid() to be stored in the local storage.
> 
> Signed-off-by: Florent Revest <revest@google.com>
> Acked-by: Yonghong Song <yhs@fb.com>
> ---
>  .../selftests/bpf/prog_tests/bpf_iter.c        | 13 +++++++++++++
>  .../progs/bpf_iter_bpf_sk_storage_helpers.c    | 18 ++++++++++++++++++
>  2 files changed, 31 insertions(+)
> 
> diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
> index 9336d0f18331..b8362147c9e3 100644
> --- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
> +++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
> @@ -978,6 +978,8 @@ static void test_bpf_sk_storage_delete(void)
>  /* This creates a socket and its local storage. It then runs a task_iter BPF
>   * program that replaces the existing socket local storage with the tgid of the
>   * only task owning a file descriptor to this socket, this process, prog_tests.
> + * It then runs a tcp socket iterator that negates the value in the existing
> + * socket local storage, the test verifies that the resulting value is -pid.
>   */
>  static void test_bpf_sk_storage_get(void)
>  {
> @@ -994,6 +996,10 @@ static void test_bpf_sk_storage_get(void)
>  	if (CHECK(sock_fd < 0, "socket", "errno: %d\n", errno))
>  		goto out;
>  
> +	err = listen(sock_fd, 1);
> +	if (CHECK(err != 0, "listen", "errno: %d\n", errno))
> +		goto out;

		goto close_socket;

> +
>  	map_fd = bpf_map__fd(skel->maps.sk_stg_map);
>  
>  	err = bpf_map_update_elem(map_fd, &sock_fd, &val, BPF_NOEXIST);
> @@ -1007,6 +1013,13 @@ static void test_bpf_sk_storage_get(void)
>  	      "map value wasn't set correctly (expected %d, got %d, err=%d)\n",
>  	      getpid(), val, err);
The failure of this CHECK here should "goto close_socket;" now.

Others LGTM.

Acked-by: Martin KaFai Lau <kafai@fb.com>

>  
> +	do_dummy_read(skel->progs.negate_socket_local_storage);
> +
> +	err = bpf_map_lookup_elem(map_fd, &sock_fd, &val);
> +	CHECK(err || val != -getpid(), "bpf_map_lookup_elem",
> +	      "map value wasn't set correctly (expected %d, got %d, err=%d)\n",
> +	      -getpid(), val, err);
> +
>  close_socket:
>  	close(sock_fd);
>  out:

  reply	other threads:[~2020-12-04  2:07 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-02 20:55 [PATCH bpf-next v4 1/6] net: Remove the err argument from sock_from_file Florent Revest
2020-12-02 20:55 ` [PATCH bpf-next v4 2/6] bpf: Add a bpf_sock_from_file helper Florent Revest
2020-12-02 20:55 ` [PATCH bpf-next v4 3/6] bpf: Expose bpf_sk_storage_* to iterator programs Florent Revest
2020-12-02 20:55 ` [PATCH bpf-next v4 4/6] bpf: Add an iterator selftest for bpf_sk_storage_delete Florent Revest
2020-12-02 20:55 ` [PATCH bpf-next v4 5/6] bpf: Add an iterator selftest for bpf_sk_storage_get Florent Revest
2020-12-04  1:39   ` Martin KaFai Lau
2020-12-02 20:55 ` [PATCH bpf-next v4 6/6] bpf: Test bpf_sk_storage_get in tcp iterators Florent Revest
2020-12-04  2:05   ` Martin KaFai Lau [this message]
2020-12-04 11:37     ` Florent Revest

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=20201204020551.egjexugorxumgarv@kafai-mbp.dhcp.thefacebook.com \
    --to=kafai@fb.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=kpsingh@chromium.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=revest@chromium.org \
    --cc=revest@google.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=yhs@fb.com \
    --subject='Re: [PATCH bpf-next v4 6/6] bpf: Test bpf_sk_storage_get in tcp iterators' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).