From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 89BD918E050 for ; Thu, 3 Apr 2025 07:24:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743665054; cv=none; b=GmPsO5N+sdKf7UHUgFf3LXqiSs6fHzQk3EZ+2mqoYRNM8yxI1XV88lkYXEeS6LGgLqhKiivpipSzycJnJRUM02wvgteOt6LOijHNmAB/5RZSiiJ1J4brNhE+211k3+/nHDu8Se2kTcA5sqVZoxfH7NqlBBLv4eUgEGJLsHjfz5k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743665054; c=relaxed/simple; bh=BmGXNVrTqxXAkUExqcGcIkfGVthayzRf/XdQRf0ErJs=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=QKYdqfCmUnwLKKSCKzB3zVlpNgm14XWZANU5aYluyPDOLm+88F2L7CUihaJAVjHdYF8QzOaVxmxU5mSR3ahVzExgtODx0zmIftW7bM9CTwg2Qp2JDch7VxWKKCCl4kkgufF/Eyvi7jap+ra9cu8+sxFBYKIf6pZm2RuoOXaObDw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=fZye6mhy; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fZye6mhy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743665051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i4GpbdVAioAsBhxItBe3Gp1I1aqveVV1B4xHRWy2NlY=; b=fZye6mhylmx+dpbsv2k4N6OZMzqaOgsvd/qgqR3DLbEhi59sHTr3QISe97Kbsb37eQ8zkz LOCrYZC5lSV2SNy/d5dycRKQ6pMfY3l5n4acDkgOSsJDRl5qsmBRUyR3wLZ9wsafMeyTU5 q6vcxp/WPWcnxpEcj91COc/s4cm6nYI= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-637-5damY6v1NaOdIGI765qW8g-1; Thu, 03 Apr 2025 03:24:10 -0400 X-MC-Unique: 5damY6v1NaOdIGI765qW8g-1 X-Mimecast-MFC-AGG-ID: 5damY6v1NaOdIGI765qW8g_1743665049 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-39123912ff0so232726f8f.2 for ; Thu, 03 Apr 2025 00:24:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743665049; x=1744269849; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=i4GpbdVAioAsBhxItBe3Gp1I1aqveVV1B4xHRWy2NlY=; b=YVdEwyj7Q07dDwEF9XSLLN7miXSS1RC1RPFegFKBSNgHFrHzMGOFaci0YbOvueVWvL EGTISgBKKEFqKYd9Rs2oSrqJtBQK6ZdxM7rVre6txdWqVuYdjOc8WDADdJj4lsCYJX5/ LzuaBozfKc7oMGjN34/obBqoBktRGNOnek8ShQQIUc8N8M7+/ucf5xv/hstNL9jZpeTJ UQ/G4O8l0oxYBaLQ7615iDnqCV/LLOe8ZK1oDkJL9no0wXEUzWzup6TCgGt6/zkj3cLp R716VRfcOWY3h+gpBzJ52xJcJkEgngzIA8so6Z+vmy/uIpbxLo5K8PWEHeiqfIkMbX+Z 5K2Q== X-Forwarded-Encrypted: i=1; AJvYcCX7SsXXDmCC6SOTCZtKzLHpFXaJfYbp/1cflfSaIgZjPE6c9SsOFIx1K7GP4psJ6qQb0sNUN4vkDQ9kYZ/Oww==@lists.linux.dev X-Gm-Message-State: AOJu0YzI4823RuNqN54oDj705JPbGeACCIlfq8tA9e6DVYDn8ORdntB5 D9EKUMWGoMu75iaBH8JUe717SB/xOdGMkI/KFBg9LjPBw1IqEumxeRpMakA90cJT0VlDdzE6q26 3DCSnk8azd5wCB5d0OUDOGgcZRfXkZnBKcLrDRsJJYT+pnxaEAf14t1zNCOmWaHjT X-Gm-Gg: ASbGncs+Wj6VEs0yfGyh+RAT1qyjoIaa7+E7MRBAW2eWjeQ6WkYA8KoiCjPW23GHVkd 4eqvIv9sxJcfL0+1Ts/foR0IcD6FUVo7k1GS0S/qLRKm6gi0zD5VwV6er2bpi1LwjdSGCbwjbpn epkLZ8Uab/6I3W2woHDg6Ws86UvWzBWFarptzNZofUbTeY5vPIlJXfBSisu+3FBnRDdbKnvcOum XuLQZ8a6TdY8FG4GAC0IgHCVX+vdJ7CC54sZMfQtx9Q3CwAtAIjRCjvZck6DfvlgE11KvXOG0wb fLZPkXtOk2NBkQjQhG4aFYj78dEHPhZSRBQGwgqs5/Sp/g== X-Received: by 2002:a5d:6d8a:0:b0:39c:dcc:f589 with SMTP id ffacd0b85a97d-39c120dd036mr17302218f8f.20.1743665049150; Thu, 03 Apr 2025 00:24:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFLjiN+esCynIJ2+bi2OUprGrFibkCQORORxWzFxwa+nAcvodEQofseNEFH/q+D6t/l5rRnhg== X-Received: by 2002:a5d:6d8a:0:b0:39c:dcc:f589 with SMTP id ffacd0b85a97d-39c120dd036mr17302194f8f.20.1743665048726; Thu, 03 Apr 2025 00:24:08 -0700 (PDT) Received: from [192.168.88.253] (146-241-68-231.dyn.eolo.it. [146.241.68.231]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c3020d68esm975281f8f.67.2025.04.03.00.24.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Apr 2025 00:24:08 -0700 (PDT) Message-ID: <4b3bea7c-110d-48eb-bcf6-58f4b2cd1999@redhat.com> Date: Thu, 3 Apr 2025 09:24:06 +0200 Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] virtio-net: disable delayed refill when setting up xdp To: Bui Quang Minh , virtualization@lists.linux.dev Cc: "Michael S . Tsirkin" , Jason Wang , Xuan Zhuo , Andrew Lunn , Eric Dumazet , Jakub Kicinski , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , =?UTF-8?Q?Eugenio_P=C3=A9rez?= , "David S . Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org References: <20250402054210.67623-1-minhquangbui99@gmail.com> From: Paolo Abeni In-Reply-To: <20250402054210.67623-1-minhquangbui99@gmail.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: oTOh_lrMX6UeDEREiGrNWhGWog9mixErJqsIFO_cCrw_1743665049 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 4/2/25 7:42 AM, Bui Quang Minh wrote: > When setting up XDP for a running interface, we call napi_disable() on > the receive queue's napi. In delayed refill_work, it also calls > napi_disable() on the receive queue's napi. This can leads to deadlock > when napi_disable() is called on an already disabled napi. This commit > fixes this by disabling future and cancelling all inflight delayed > refill works before calling napi_disabled() in virtnet_xdp_set. > > Fixes: 4941d472bf95 ("virtio-net: do not reset during XDP set") > Signed-off-by: Bui Quang Minh > --- > drivers/net/virtio_net.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 7e4617216a4b..33406d59efe2 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -5956,6 +5956,15 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, > if (!prog && !old_prog) > return 0; > > + /* > + * Make sure refill_work does not run concurrently to > + * avoid napi_disable race which leads to deadlock. > + */ > + if (netif_running(dev)) { > + disable_delayed_refill(vi); > + cancel_delayed_work_sync(&vi->refill); AFAICS at this point refill_work() could still be running, why don't you need to call flush_delayed_work()? @Jason: somewhat related, why virtnet_close() does not use flush_delayed_work(), too? Thanks, Paolo