From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 8A4302571AD for ; Wed, 22 Oct 2025 15:57:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761148664; cv=none; b=PJgySbCmAdcflAVWGVrXrCXFdCqNqu/BnGN8dkjwjDkXESWP/5Z1WP3MSQezeiAjmGKwy175LQacUa3O6aWgbRb3nW64i1EpcoF+7RW+KMEW9TQlrwY3LMl+MOh1bgqKp2tFJtGN0YTzCZ8FwHpCsgYrvg/8sQCcgzseLZtr8V4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761148664; c=relaxed/simple; bh=dbCAjiJaJQiN/J2VVY9g9g6U74sYQAol3HyEtlrFnUU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=dFc9iEiS39GrKMMP06L0tdH17zC/ce53HiHLxvG2b5EO3nbir9rvjT8F+cHuyaY8WV8etgjLMQt/CuF3GgFyLdQw0kd3tP4A83NMP5rL3IMlLl/NOW/owTz+SSGwUIV05w8Q+zn0tOXXykvckaxuAAg8rmjbs8TFpL4YncxKVcA= 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=Sx0L1Zn/; arc=none smtp.client-ip=209.85.216.44 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="Sx0L1Zn/" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-339d7c403b6so6746253a91.2 for ; Wed, 22 Oct 2025 08:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761148662; x=1761753462; 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=naY20CMWDzYHs1ZYgUoMtzuy7r6fuKt6p40K/aayGos=; b=Sx0L1Zn/+YbNgKBEhcPK3WoKkgnjYXr4nOcunJGN5Ffgl84cJ88khAUfZlBsDiWWH0 2DEch3dt4YsmRHODqLmjLmgsM4dIGKrSHC1dRHJF+ZJ/DwDMeNNV+Y3O7gmxnBS2PPs+ XgUsM2J1FYxvFAjSck/cO8AVIcGK5LufwCtStvs6y8j8P9mRKis1sowE+MJHJ+Ld21yD lNsExRIrGFUw+2GuDiD7MeTa4wh2GK1QmfQ85WUdB4lq1hAuwSCKpO3FQdw997mTt7Ww O3mVEuaBR8c4+egdqbsxNeUSf+mMwGbNRwKGQmjrFSFxITXgXHZI+1dw+0NZ4UhZkvmc sMqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761148662; x=1761753462; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=naY20CMWDzYHs1ZYgUoMtzuy7r6fuKt6p40K/aayGos=; b=xD3IPIs8vlIeIz4YwB8huXhyL0Bv81lfwkeXXQyHDA0hkLznLaSHjca1aExCL6HT5N qq+FlaQBtdbtGCHdOttqimpNc9SkK5uDJ5njYpAX2LOwOiVaokZ3O5nV0ZSIZ6AISCns SzmXQHac9mYKDdeAN+EFBv/7n+NIItvkG+tvVWTyVBmRZU7DaLUm0I2A8sAnv1kpBdDy Pd764QCSs0JpOPaF8ED19gVBoBBLZJoPWzTCfO4blKzU7JnHwcrzYNpPA3FH+UlBLe5Q ox0EiXrd6JUWLYg2A4LzyOeLf/8ui/1kMIzbbrG+P8tv0rObQQeDVI6+POONJCbM4r9V LQWA== X-Forwarded-Encrypted: i=1; AJvYcCVCuZsqJ8myxG7u5bhCjzVLq0Ky83P9s2Xt8f8lulfqlfj3FfjOiBjwBOxin4dzpFN4gxs=@vger.kernel.org X-Gm-Message-State: AOJu0Yy/HUaju63C9RB11ImD0zHFYedTVbSbjp3JpSnGPY93R1O9RT0S uV9BKhSWk+tMerz6j8KdjoEjEbjWzrLHwVgD8dk0df228NNEKQHCtqmv X-Gm-Gg: ASbGncskzazyctOvLYbH15EkTfzckxL0rtkuJCz9ggCzdbP7QB3cvIOtFqgA7LafAz8 Sa7ycHsc6FLhFHt2YuALnMkfLVA8jhHU5HoM9Ws5jmuT318BaqMvT2jet/7GBMQ/Uzwa/qddhqw Eq9b5a2tUEKoQV9XzLc9XTj270egk9Hp6gDuxbzlVdDM/wQDDp4ImcyD9YYMTkSRy5CMEsBTG4S TyexowWqg1XUjvXaji2ouioBlE6h06C01IVSdW2YzqBLfKBuibUSaebMZPh11NGd4p5j5VS9juf M+eGffHvhsmFe7Az99Kw8mcA+ohsbUR0iJLhKyCkK4/pJHFryAEPIdTp18M00rABK6AoNRHZQO0 jZU44gWlUJWjh6IiWWnRD5rH56A8R5EScfEXn4SqdM5aeLS69wrp503ql17cCWbDnK0zG9EMocK hZFaubdIdOjw== X-Google-Smtp-Source: AGHT+IGff1qulcywTryt+y1hQgxYYHQojnwIuJuCP1ttfYIhTSd/04VrdxcFUc0K86XacXDYxdgD8Q== X-Received: by 2002:a17:902:e88e:b0:24b:25f:5f81 with SMTP id d9443c01a7336-290c9ca72bcmr272142045ad.17.1761148661728; Wed, 22 Oct 2025 08:57:41 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f4c:210:1e3:b1:dcbf:ab83]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-2930975631dsm21990425ad.20.2025.10.22.08.57.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 08:57:41 -0700 (PDT) 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 , stable@vger.kernel.org Subject: [PATCH net v2] virtio-net: drop the multi-buffer XDP packet in zerocopy Date: Wed, 22 Oct 2025 22:56:30 +0700 Message-ID: <20251022155630.49272-1-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In virtio-net, we have not yet supported multi-buffer XDP packet in zerocopy mode when there is a binding XDP program. However, in that case, when receiving multi-buffer XDP packet, we skip the XDP program and return XDP_PASS. As a result, the packet is passed to normal network stack which is an incorrect behavior (e.g. a XDP program for packet count is installed, multi-buffer XDP packet arrives and does go through XDP program. As a result, the packet count does not increase but the packet is still received from network stack).This commit instead returns XDP_ABORTED in that case. Fixes: 99c861b44eb1 ("virtio_net: xsk: rx: support recv merge mode") Cc: stable@vger.kernel.org Acked-by: Jason Wang Reviewed-by: Xuan Zhuo Signed-off-by: Bui Quang Minh --- Changes in v2: - Return XDP_ABORTED instead of XDP_DROP, make clearer explanation in commit message --- drivers/net/virtio_net.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index a757cbcab87f..8e8a179aaa49 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1379,9 +1379,14 @@ static struct sk_buff *virtnet_receive_xsk_merge(struct net_device *dev, struct ret = XDP_PASS; rcu_read_lock(); prog = rcu_dereference(rq->xdp_prog); - /* TODO: support multi buffer. */ - if (prog && num_buf == 1) - ret = virtnet_xdp_handler(prog, xdp, dev, xdp_xmit, stats); + if (prog) { + /* TODO: support multi buffer. */ + if (num_buf == 1) + ret = virtnet_xdp_handler(prog, xdp, dev, xdp_xmit, + stats); + else + ret = XDP_ABORTED; + } rcu_read_unlock(); switch (ret) { -- 2.43.0