Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jakub Sitnicki <jakub@cloudflare.com>
To: Cong Wang <xiyou.wangcong@gmail.com>
Cc: John Fastabend <john.fastabend@gmail.com>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Lorenz Bauer <lmb@cloudflare.com>,
	Alexei Starovoitov <ast@kernel.org>,
	Andrii Nakryiko <andrii@kernel.org>,
	Linux Kernel Network Developers <netdev@vger.kernel.org>,
	bpf <bpf@vger.kernel.org>
Subject: Re: [PATCH bpf] bpf, sockmap, udp: sk_prot needs inuse_idx set for proc stats
Date: Wed, 14 Jul 2021 17:56:30 +0200	[thread overview]
Message-ID: <87wnpsris1.fsf@cloudflare.com> (raw)
In-Reply-To: <CAM_iQpVV1XRTsbyEbG_GTb4GHHx47m+TOYYw_z3euX3UYvDt9Q@mail.gmail.com>

On Wed, Jul 14, 2021 at 02:51 AM CEST, Cong Wang wrote:
> On Tue, Jul 13, 2021 at 12:44 AM Jakub Sitnicki <jakub@cloudflare.com> wrote:
>>
>> Proc socket stats use sk_prot->inuse_idx value to record inuse sock stats.
>> We currently do not set this correctly from sockmap side. The result is
>> reading sock stats '/proc/net/sockstat' gives incorrect values. The
>> socket counter is incremented correctly, but because we don't set the
>> counter correctly when we replace sk_prot we may omit the decrement.
>>
>> To get the correct inuse_idx value move the core_initcall that initializes
>> the udp proto handlers to late_initcall. This way it is initialized after
>> UDP has the chance to assign the inuse_idx value from the register protocol
>> handler.
>
> Interesting. What about IPv6 module? Based on my understanding, it should
> always be loaded before we can trigger udp_bpf_check_v6_needs_rebuild().
> If so, your patch is complete.

That's my understanding as well. The lazy update_proto call chain is:

sock_map_update_common
  sock_map_link
    sock_map_init_proto
      psock->psock_update_sk_prot
        udp_bpf_update_proto
          udp_bpf_check_v6_needs_rebuild

If that happens we are being passed an AF_INET6 socket. Socket has been
created so IPv6 module must have been loaded.

>>
>> Fixes: 5e21bb4e8125 ("bpf, test: fix NULL pointer dereference on invalid expected_attach_type")
>
> Should be commit edc6741cc66059532ba621928e3f1b02a53a2f39
> (bpf: Add sockmap hooks for UDP sockets), right?

Thanks. Fixed in v2.

      reply	other threads:[~2021-07-14 15:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-13  7:44 Jakub Sitnicki
2021-07-14  0:28 ` John Fastabend
2021-07-14  0:51 ` Cong Wang
2021-07-14 15:56   ` Jakub Sitnicki [this message]

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=87wnpsris1.fsf@cloudflare.com \
    --to=jakub@cloudflare.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=john.fastabend@gmail.com \
    --cc=lmb@cloudflare.com \
    --cc=netdev@vger.kernel.org \
    --cc=xiyou.wangcong@gmail.com \
    --subject='Re: [PATCH bpf] bpf, sockmap, udp: sk_prot needs inuse_idx set for proc stats' \
    /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).