From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA5AA3346B0 for ; Tue, 6 Jan 2026 15:04:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767711897; cv=none; b=NwJaxO8/FwYDVFQNy1UEdrgoLeU25dS+VWwmI9bQC9d+ohxEyHtTRsaPfBsxrMx4uX2ZAOrholMDjHVA4ncz3J/+vgeQECg2j2El1S2vJXAxDCo37Q2CjxU+VmKfRCh5s81dES4Kd3bd2RXU7rNbtMzqaN+anvD8zetD1K/Of3Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767711897; c=relaxed/simple; bh=K8FNQhu5SnEcTiEsafwMNNxOn2K2Q9Ac3Y0d7g04XP0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WAYXXXslLP7Aen2CI/+zp7dCw9rXhqnClkSrWatCJ7xcD4OAYvuZlEok7FYYQD0hGImBK6zpG9xyFTY91oMvkkAa66FhTlShG5hehWMNNxI+XOdDZHPdnWUvdd8pd60gtaczZdaVEj3aAtImXyxpCgsB4WVz2dRAyxQHnxjmakQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nWs7LeQR; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nWs7LeQR" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-7e1651ae0d5so914763b3a.1 for ; Tue, 06 Jan 2026 07:04:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767711895; x=1768316695; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=R1gvuv/xyGr58xg9+znTKspBZ7TugLg/fG73JU/AoDE=; b=nWs7LeQRXbgUOg8TlDt5j4BBqvLcRKmTW7zj67NLvw1KV8WF7eMinuwr89ZoNmsPRf FXWcqH9WYdrrM3mmyztNXRTAGdK6OMYhAbDosf3WMTz0UISlWGW6/hKaPwJi/BPCTgN9 K4B6C9e0ZJlAdN1xXDv/jK6tyElgXUb6Zo6nSc0NS68IejhikgJA94THyWJMJ3thJ1LX nFp8iehNmqEainK6EyV0YEnhpGdJeScv4APiyLyjm1bJNEJVautiiYso1UTS/hxxH0TT TVlARMQanYS97rRq5kc+KG1vF9hRaxwGf2IDs+KTOiObF1cm/NlkGfcpHjxhiQ/RYSwj 788A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767711895; x=1768316695; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=R1gvuv/xyGr58xg9+znTKspBZ7TugLg/fG73JU/AoDE=; b=Xc8d6kgD6V8Y3KCMXz4bfCB8byPmHP2/EyboZJKjk6iZw/6FYS4w+ykTs1Li9kDGJI z6S4UxWA5WtrsdAbzwrn6mw7dNIVIPkKH3XBBQV/vIzjWnYQ8suhzNAtP5WooD9sq7r/ cKIIj+vxuLF5gGbHWidlcF51lkVEUlL+Zzhf+4utNXMg7tj3ILY9GUQb8jZR4fWHivvm TmnFiNtXRKSvKi+KdHqCWGOEAXYsuSHkZO0CfvAnLeifxJ4wDB8+V/cg9SOF5DTO2N5O kB57O/EkH3qCxqtTP3/DXNBcTWHbaTcPTMSIBQghTnr9PZBx8Xpi6XO4chSlli+jc+zy s8ag== X-Forwarded-Encrypted: i=1; AJvYcCWdcTwlgADNHARy6CbmYf/G8KWoND4VUXRwZdSJx6WG/cVGVwgoAVnw8sRlzwlEoKTak74SZ90znGbuF74=@vger.kernel.org X-Gm-Message-State: AOJu0YwMp+u3sX8PEWREAPRetjKzV5dOO6B9ZbjezVYDYMf0UoZY5OyF XoyfaRU+QrkEJut1ClMiupEADhnmqWA0012bT6f2VDPbxvDUEmhj/jmG X-Gm-Gg: AY/fxX6VlQYELCnjC+t7GJXGOKYqMdhYr9Ztfa6NpGdEl8rZLgHNDqNfeFCLV2+Ck/F Xx9kHFrqMyUem4KGWQ/zoR9cpNZ8QBFlgCa4hg7ilXgtYaYFL1EPWi53jpIgHHZCC4GTp6VAV3N O28/J42VDvT1kAIUFoW61R/b7DnyD3oZBu+9EkySs//0Y5ihLPqw43m+2Sm/LHQqdGH47yBtgLG f8/zQqLtWSO47U4Mj2kUfrOULPSmMgWVyqKXYk2HAxPE5aTsqYHcq6E/15d8ywOuWAWQfEo0WF3 109yTZTR0Y+hEZwkIRSCU7CAxzdoTYK2DkLu7qqd6HPrknWdWtwuBanas4+qYZxIE1vs2YfmzoJ FNwQi80hl3OCCx/Gi+EpumtVK+VP4Ya2i3JucFquSMNxw3aOw6RB7VjIbM8dkQfLeYvqz4O5Y8n jdSKXyeVuG X-Google-Smtp-Source: AGHT+IFU3Mhn1OWQ/XPfwYIXmQDx2yFG2njwZ4vCzwkyE0zpboeIRz229vtkdBQ3LSp9Eg2BDinhtg== X-Received: by 2002:a05:6a20:4310:b0:35f:5fc4:d88c with SMTP id adf61e73a8af0-38982246c6emr2858508637.13.1767711894829; Tue, 06 Jan 2026 07:04:54 -0800 (PST) Received: from minh.. ([14.187.47.150]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-c4cbfc2f481sm2674231a12.10.2026.01.06.07.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jan 2026 07:04:54 -0800 (PST) From: Bui Quang Minh To: netdev@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH net v3 0/3] virtio-net: fix the deadlock when disabling rx NAPI Date: Tue, 6 Jan 2026 22:04:35 +0700 Message-ID: <20260106150438.7425-1-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Calling napi_disable() on an already disabled napi can cause the deadlock. In commit 4bc12818b363 ("virtio-net: disable delayed refill when pausing rx"), to avoid the deadlock, when pausing the RX in virtnet_rx_pause[_all](), we disable and cancel the delayed refill work. However, in the virtnet_rx_resume_all(), we enable the delayed refill work too early before enabling all the receive queue napis. The deadlock can be reproduced by running selftests/drivers/net/hw/xsk_reconfig.py with multiqueue virtio-net device and inserting a cond_resched() inside the for loop in virtnet_rx_resume_all() to increase the success rate. Because the worker processing the delayed refilled work runs on the same CPU as virtnet_rx_resume_all(), a reschedule is needed to cause the deadlock. In real scenario, the contention on netdev_lock can cause the reschedule. Due to the complexity of delayed refill worker, in this series, we remove it. When we fail to refill the receive buffer, we will retry in the next NAPI poll instead. - Patch 1: removes delayed refill worker schedule and retry refill in next NAPI - Patch 2, 3: removes and clean up unused delayed refill worker code For testing, I've run the following tests with no issue so far - selftests/drivers/net/hw/xsk_reconfig.py which sets up the XDP zerocopy without providing any descriptors to the fill ring. As a result, try_fill_recv will always fail. - Send TCP packets from host to guest while guest is nearly OOM and some try_fill_recv calls fail. Changes in v3: - Patch 1: return budget when needing to retry in next NAPI in virtnet_receive, fix comments and commit message - Patch 2: edit the commit message - Link to v2: https://lore.kernel.org/netdev/20260102152023.10773-1-minhquangbui99@gmail.com/ Changes in v2: - Remove the delayed refill worker to simplify the logic instead of trying to fix it - Link to v1: https://lore.kernel.org/netdev/20251223152533.24364-1-minhquangbui99@gmail.com/ Link to the previous approach and discussion: https://lore.kernel.org/netdev/20251212152741.11656-1-minhquangbui99@gmail.com/ Thanks, Quang Minh. Bui Quang Minh (3): virtio-net: don't schedule delayed refill worker virtio-net: remove unused delayed refill worker virtio-net: clean up __virtnet_rx_pause/resume drivers/net/virtio_net.c | 164 +++++++++------------------------------ 1 file changed, 35 insertions(+), 129 deletions(-) -- 2.43.0