From: Jakub Sitnicki <jakub@cloudflare.com>
To: Lorenz Bauer <lmb@cloudflare.com>
Cc: John Fastabend <john.fastabend@gmail.com>,
Daniel Borkmann <daniel@iogearbox.net>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
kernel-team@cloudflare.com, netdev@vger.kernel.org,
bpf@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 3/5] bpf: convert sock map and hash to map_copy_value
Date: Wed, 11 Mar 2020 14:55:47 +0100 [thread overview]
Message-ID: <87v9nbxafw.fsf@cloudflare.com> (raw)
In-Reply-To: <20200310174711.7490-4-lmb@cloudflare.com>
On Tue, Mar 10, 2020 at 06:47 PM CET, Lorenz Bauer wrote:
> Migrate sockmap and sockhash to use map_copy_value instead of
> map_lookup_elem_sys_only.
>
> Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
> ---
> net/core/sock_map.c | 48 ++++++++++++++++++++++++++++++---------------
> 1 file changed, 32 insertions(+), 16 deletions(-)
>
> diff --git a/net/core/sock_map.c b/net/core/sock_map.c
> index a7075b3b4489..03e04426cd21 100644
> --- a/net/core/sock_map.c
> +++ b/net/core/sock_map.c
> @@ -344,19 +344,34 @@ static void *sock_map_lookup(struct bpf_map *map, void *key)
> return __sock_map_lookup_elem(map, *(u32 *)key);
> }
>
> -static void *sock_map_lookup_sys(struct bpf_map *map, void *key)
> +static int __sock_map_copy_value(struct bpf_map *map, struct sock *sk,
> + void *value)
> +{
> + switch (map->value_size) {
> + case sizeof(u64):
> + sock_gen_cookie(sk);
> + *(u64 *)value = atomic64_read(&sk->sk_cookie);
You could use sock_gen_cookie return value to merge the two above
statements into one. sock_gen_cookie also reads out the value.
> + return 0;
> +
> + default:
> + return -ENOSPC;
> + }
> +}
> +
> +static int sock_map_copy_value(struct bpf_map *map, void *key, void *value)
> {
> struct sock *sk;
> + int ret = -ENOENT;
>
> - if (map->value_size != sizeof(u64))
> - return ERR_PTR(-ENOSPC);
> -
> + rcu_read_lock();
> sk = __sock_map_lookup_elem(map, *(u32 *)key);
> if (!sk)
> - return ERR_PTR(-ENOENT);
> + goto out;
>
> - sock_gen_cookie(sk);
> - return &sk->sk_cookie;
> + ret = __sock_map_copy_value(map, sk, value);
> +out:
> + rcu_read_unlock();
> + return ret;
> }
>
> static int __sock_map_delete(struct bpf_stab *stab, struct sock *sk_test,
> @@ -636,7 +651,7 @@ const struct bpf_map_ops sock_map_ops = {
> .map_alloc = sock_map_alloc,
> .map_free = sock_map_free,
> .map_get_next_key = sock_map_get_next_key,
> - .map_lookup_elem_sys_only = sock_map_lookup_sys,
> + .map_copy_value = sock_map_copy_value,
> .map_update_elem = sock_map_update_elem,
> .map_delete_elem = sock_map_delete_elem,
> .map_lookup_elem = sock_map_lookup,
> @@ -1030,19 +1045,20 @@ static void sock_hash_free(struct bpf_map *map)
> kfree(htab);
> }
>
> -static void *sock_hash_lookup_sys(struct bpf_map *map, void *key)
> +static int sock_hash_copy_value(struct bpf_map *map, void *key, void *value)
> {
> struct sock *sk;
> + int ret = -ENOENT;
>
> - if (map->value_size != sizeof(u64))
> - return ERR_PTR(-ENOSPC);
> -
> + rcu_read_lock();
> sk = __sock_hash_lookup_elem(map, key);
> if (!sk)
> - return ERR_PTR(-ENOENT);
> + goto out;
>
> - sock_gen_cookie(sk);
> - return &sk->sk_cookie;
> + ret = __sock_map_copy_value(map, sk, value);
> +out:
> + rcu_read_unlock();
> + return ret;
> }
>
> static void *sock_hash_lookup(struct bpf_map *map, void *key)
> @@ -1139,7 +1155,7 @@ const struct bpf_map_ops sock_hash_ops = {
> .map_update_elem = sock_hash_update_elem,
> .map_delete_elem = sock_hash_delete_elem,
> .map_lookup_elem = sock_hash_lookup,
> - .map_lookup_elem_sys_only = sock_hash_lookup_sys,
> + .map_copy_value = sock_hash_copy_value,
> .map_release_uref = sock_hash_release_progs,
> .map_check_btf = map_check_no_btf,
> };
next prev parent reply other threads:[~2020-03-11 13:55 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-10 17:47 [PATCH 0/5] Return fds from privileged sockhash/sockmap lookup Lorenz Bauer
2020-03-10 17:47 ` [PATCH 1/5] bpf: add map_copy_value hook Lorenz Bauer
2020-03-10 17:47 ` [PATCH 2/5] bpf: convert queue and stack map to map_copy_value Lorenz Bauer
2020-03-11 14:00 ` Jakub Sitnicki
2020-03-11 22:31 ` John Fastabend
2020-03-10 17:47 ` [PATCH 3/5] bpf: convert sock map and hash " Lorenz Bauer
2020-03-11 13:55 ` Jakub Sitnicki [this message]
2020-03-10 17:47 ` [PATCH 4/5] bpf: sockmap, sockhash: return file descriptors from privileged lookup Lorenz Bauer
2020-03-11 23:27 ` John Fastabend
2020-03-17 10:17 ` Lorenz Bauer
2020-03-17 15:18 ` Jakub Sitnicki
2020-03-17 18:16 ` John Fastabend
2020-03-10 17:47 ` [PATCH 5/5] bpf: sockmap, sockhash: test looking up fds Lorenz Bauer
2020-03-11 13:52 ` Jakub Sitnicki
2020-03-11 17:24 ` Lorenz Bauer
2020-03-11 13:44 ` [PATCH 0/5] Return fds from privileged sockhash/sockmap lookup Jakub Sitnicki
2020-03-11 22:40 ` John Fastabend
2020-03-12 1:58 ` Alexei Starovoitov
2020-03-12 9:16 ` Lorenz Bauer
2020-03-12 17:58 ` Alexei Starovoitov
2020-03-12 19:32 ` John Fastabend
2020-03-13 11:03 ` Lorenz Bauer
2020-03-13 10:48 ` Lorenz Bauer
2020-03-14 2:58 ` Alexei Starovoitov
2020-03-17 9:55 ` Lorenz Bauer
2020-03-17 19:05 ` John Fastabend
2020-03-20 15:12 ` Lorenz Bauer
2020-04-07 3:08 ` Alexei Starovoitov
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=87v9nbxafw.fsf@cloudflare.com \
--to=jakub@cloudflare.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=john.fastabend@gmail.com \
--cc=kernel-team@cloudflare.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lmb@cloudflare.com \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).