From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx1-f50.google.com (mail-yx1-f50.google.com [74.125.224.50]) (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 62BF54119F9 for ; Mon, 14 Sep 2026 21:42:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789422157; cv=none; b=iIqlQZKvhEtdxntIMM0W1jvgGxdZ23HvpIPlMWTIzAzQ+vG2ASj62zhhp2GNBeOwVVKreuSD8DqEwUg07/mMNnXpiLnUsPAfT8lDSxVjN5nStAzVrGc7uXOw7nYJEpbWGJk2BwQMrGw6AYcX9TTT8LeIpwAn9D/AR8GItKm9wFM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789422157; c=relaxed/simple; bh=zM/5sCogXE0YOG63To/lzdc1QqgX00LZ1grZde3zn50=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CJOxZglF1WriG0CEkgS5cO5b2gOYx2eA5pr6Brvil9k8mq0/pMFjxwL1ClNF+htvQNi30lXao9JL2tC2Z9ozgMIQ5oxCS0K78LkQnWkNd4vhQF5CLzbOmMEbyx5l2TV7VDMA4A7N4Umwk9ODfVtE69djlErbQSM6LkmQfc76zHI= 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=QhAQMywD; arc=none smtp.client-ip=74.125.224.50 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="QhAQMywD" Received: by mail-yx1-f50.google.com with SMTP id 956f58d0204a3-66fca0709caso3680420d50.1 for ; Mon, 14 Sep 2026 14:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789422155; x=1790026955; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=1kaT/+Urj02Jq9w2IAQAcv6O5zq4BSwo1l2yqqveMaw=; b=QhAQMywDQi51sykbmEvfyCqLzjt+stvxOtDdYwIeikf8RCfrtVZE/QZLGulXiYzhQs DETYeV5X88nMUquvQ5W+haFstF7zs7mvBqgrk0Sm+FOPaWW6+EnZogZgkfH1gx99DXuv 4oRgFtQdK4j/KHp8M9KU4FMx1R/AWImGct13wCKvgH1mfGKMlSQKiC2h8oKtKNquueVU 228CYDQr6296dBw4GcDC5+qwT96SOHQoVDhUND8Ssh8PbKkDWnFSLWgNYcoy6fuGvZ6J GgLC9FIlKGugxYLY2AYLP+nk4u+DxDHzEPkDWqv2P/ZmaXz9QRDRb59puw/vx2ji3csu +VnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789422155; x=1790026955; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=1kaT/+Urj02Jq9w2IAQAcv6O5zq4BSwo1l2yqqveMaw=; b=dOacfVvvWg+04ddf8ZyY4jhYeDyyVO2vccaWjCkacw5KiY2WRdSYoZrH9DcNiNwggJ WAPGOHq+I/fdyacDrJCP8jH8PLZEFfrNMAU9v2N9UYsY1zV7/A0Z/y4U84AEw0WnqnRg /dqIpwwFoQyQTOIVk9F5rjKa31brjOrsLjJ2J4+boj1n/gqXbibZ3SYjdN61l+D4YTCi aGcqSPqZ/U5kxAoFHpwxiycTcm0D6NoNgLgQSbmSvxv7GVmRqPxBn9Ge5bzKZmNoQ/th WD/RjVdZlWqD5kiI1cGj9MPIsbwEECUbBAXfx8J8lUThBe0hIkkgaWpIn5jYwi4MfAA/ BJ1g== X-Forwarded-Encrypted: i=1; AKwUvByvOAWj1QXn2VRo9EVQ3cPEmUu1u4H8KYbbBpMug0IL3jR/yMfWwzRXIF/e19OYmuZX3tQhODk=@vger.kernel.org X-Gm-Message-State: AFuF++kfJjcMqPW8meZ9E0V6ywDffpXcYefClxrxD1f3wO7cVsQisJ00 DnfGmaqx2T9adHWxN9JrG27Ur4NyQH7FdOgQiz3jGC8bV+DTRMqXkwKW X-Gm-Gg: AYBFou3aIVDnEbYcyYEJRm4YAXwB7z5YdEJWLrZ5yP9iN3ytQ0HrXP1HilCAzD9W/vW Suub0nIN9gvLV+70J2u37s6e+BbRSsD96IhMfjbIzkSUZIqwmJscBJrmFG+b1/r8NIMf6uZFE2F kCVLTrMFnssz9e/n2tMX0F4Wrt7ZL3WlGSJJbGvibFGqUjjmBQQwbLREeilGITIcwd37DuqZNet 1r0rM/q96jqBxEVsc03anL7Nw2Jexcwxtl51E7eyQw5p4clG6ri53Fem13Vv8QHn2XJZIKv7Cz2 MJ6f/BENmR+UtwcbyJglbwYtTx54b4ZjhpX4+v0BHwQTLN6WA1aquASxnsV3iYF4EiOMIogXz59 1EEApX5IeAqPwlGc4s0xPmppGhGPpVyAZVbOJ15Eon59GpZkgZEQX/AdeBfaOrcCeZcW5rRMU90 x66GbljB70FKheMomcZ7qUBbRkrIbuaC1dIlXa6L1qea7QrVBh3TC+RSqUiWSj+S4sD8VyLPM2K bffEzY1WygtpHrZ+U5AAyx0HeROx6tlWSf0wT+RBl9oSfWDoaTaAWwCsyJRNS/iP//GGfuGhxM= X-Received: by 2002:a05:690e:4419:b0:66f:c1be:a645 with SMTP id 956f58d0204a3-6714e076e39mr862992d50.55.1789422155378; Mon, 14 Sep 2026 14:42:35 -0700 (PDT) Received: from willemb.c.googlers.com.com (111.46.245.35.bc.googleusercontent.com. [35.245.46.111]) by smtp.gmail.com with ESMTPSA id 00721157ae682-88486086224sm41718997b3.10.2026.09.14.14.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2026 14:42:34 -0700 (PDT) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, edumazet@google.com, pabeni@redhat.com, horms@kernel.org, andrew+netdev@lunn.ch, Willem de Bruijn , stable@vger.kernel.org, mst@redhat.com, jasowangio@gmail.com Subject: [PATCH net 1/2] virtio_net: copy zerocopy frags in start_xmit without NAPI Date: Mon, 14 Sep 2026 17:37:42 -0400 Message-ID: <20260914214229.1674102-2-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.55.0.1032.g73a4cd73de-goog In-Reply-To: <20260914214229.1674102-1-willemdebruijn.kernel@gmail.com> References: <20260914214229.1674102-1-willemdebruijn.kernel@gmail.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Willem de Bruijn Virtio-net without NAPI frees completed skbs lazily on the next start_xmit. Senders waiting for in-flight zerocopy buffers can deadlock if they cannot transmit more packets, as then no commpleted packets will be freed. When !use_napi, virtio-net already calls skb_orphan to avoid waiting up for transmitted skbs to be freed. For zerocopy packets that require deep copying on orphan (i.e. those that do not set SKBFL_DONT_ORPHAN, such as PACKET_TX_RING), call skb_orphan_frags before orphaning to release the buffers. This fixes the tpacket_snd slot reuse bug on skb_orphan for virtio-net, and prevents PACKET_TX_RING from running out of slots. This fix also touches vhost_net zerocopy packets, which also do not set SKBFL_DONT_ORPHAN. This is fine: vhost_net packets only encounter virtio-net in nested virtualization, and only if napi_tx is explicitly disabled (it has been default-enabled since Linux 4.12). In that rare case, copying the frags is desirable anyway to prevent holding guest descriptors pinned across unbounded intervals. This is a prerequisite for the next patch, which converts PACKET_TX_RING to standard zerocopy completion. Without this patch first, a bounded ring sender can stall indefinitely behind a virtio-net virtqueue that cannot reclaim. Fixes: 5cd8d46ea156 ("packet: copy user buffers before orphan or clone") Cc: stable@vger.kernel.org Cc: mst@redhat.com Cc: jasowangio@gmail.com Signed-off-by: Willem de Bruijn --- drivers/net/virtio_net.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index e34c52d059d3..1ce528c18f9e 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3349,6 +3349,13 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) else virtqueue_disable_cb(sq->vq); + if (!use_napi && + unlikely(skb_orphan_frags(skb, GFP_ATOMIC))) { + DEV_STATS_INC(dev, tx_dropped); + dev_kfree_skb_any(skb); + return NETDEV_TX_OK; + } + /* timestamp packet in software */ skb_tx_timestamp(skb); -- 2.55.0.1032.g73a4cd73de-goog