bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Toke Høiland-Jørgensen" <toke@redhat.com>
To: Martin Lau <kafai@fb.com>
Cc: "daniel\@iogearbox.net" <daniel@iogearbox.net>,
	Alexei Starovoitov <ast@fb.com>,
	"bpf\@vger.kernel.org" <bpf@vger.kernel.org>,
	"netdev\@vger.kernel.org" <netdev@vger.kernel.org>,
	Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Subject: Re: [PATCH bpf] xdp: Handle device unregister for devmap_hash map type
Date: Thu, 17 Oct 2019 12:27:11 +0200	[thread overview]
Message-ID: <87imonfz0g.fsf@toke.dk> (raw)
In-Reply-To: <20191016162357.b2kdf6cflw3c5gzb@kafai-mbp.dhcp.thefacebook.com>

Martin Lau <kafai@fb.com> writes:

> On Wed, Oct 16, 2019 at 03:28:02PM +0200, Toke Høiland-Jørgensen wrote:
>> It seems I forgot to add handling of devmap_hash type maps to the device
>> unregister hook for devmaps. This omission causes devices to not be
>> properly released, which causes hangs.
>> 
>> Fix this by adding the missing handler.
>> 
>> Fixes: 6f9d451ab1a3 ("xdp: Add devmap_hash map type for looking up devices by hashed index")
>> Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
>> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
>> ---
>>  kernel/bpf/devmap.c | 34 ++++++++++++++++++++++++++++++++++
>>  1 file changed, 34 insertions(+)
>> 
>> diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
>> index d27f3b60ff6d..deb9416341e9 100644
>> --- a/kernel/bpf/devmap.c
>> +++ b/kernel/bpf/devmap.c
>> @@ -719,6 +719,35 @@ const struct bpf_map_ops dev_map_hash_ops = {
>>  	.map_check_btf = map_check_no_btf,
>>  };
>>  
>> +static void dev_map_hash_remove_netdev(struct bpf_dtab *dtab,
>> +				       struct net_device *netdev)
>> +{
>> +	int i;
>> +
>> +	for (i = 0; i < dtab->n_buckets; i++) {
>> +		struct bpf_dtab_netdev *dev, *odev;
>> +		struct hlist_head *head;
>> +
>> +		head = dev_map_index_hash(dtab, i);
>> +		dev = hlist_entry_safe(rcu_dereference_raw(hlist_first_rcu(head)),
>> +				       struct bpf_dtab_netdev,
>> +				       index_hlist);
>> +
>> +		while (dev) {
>> +			odev = (netdev == dev->dev) ? dev : NULL;
>> +			dev = hlist_entry_safe(rcu_dereference_raw(hlist_next_rcu(&dev->index_hlist)),
>> +					       struct bpf_dtab_netdev,
>> +					       index_hlist);
>> +
>> +			if (odev) {
>> +				hlist_del_rcu(&odev->index_hlist);
> Would it race with the dev_map_hash's update/delete side?

Oh, right, seems I forgot to grab the lock; will send a v2!

-Toke


  reply	other threads:[~2019-10-17 10:27 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-16 13:28 Toke Høiland-Jørgensen
2019-10-16 16:24 ` Martin Lau
2019-10-17 10:27   ` Toke Høiland-Jørgensen [this message]
2019-10-16 20:09 ` Tetsuo Handa
2019-10-17 10:28   ` Toke Høiland-Jørgensen
2019-10-17 15:23     ` Alexei Starovoitov
2019-10-17 15:40       ` Toke Høiland-Jørgensen
2019-10-17 19:17 ` Andrii Nakryiko
2019-10-18 10:31   ` Toke Høiland-Jørgensen
2019-10-18 16:28     ` Andrii Nakryiko

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=87imonfz0g.fsf@toke.dk \
    --to=toke@redhat.com \
    --cc=ast@fb.com \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=kafai@fb.com \
    --cc=netdev@vger.kernel.org \
    --cc=penguin-kernel@I-love.SAKURA.ne.jp \
    --subject='Re: [PATCH bpf] xdp: Handle device unregister for devmap_hash map type' \
    /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).