From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 AF7E93E92A9; Thu, 2 Apr 2026 15:50:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775145039; cv=none; b=MRQoDPBmsMzOwU9wfDGI4PNmLiYT8Q2aDboEBjnD9R076PEJGpDg1SwlFkshNOsz9TeYLbERzXdIc/ClRvk9CrpWRbeYCYNWAtqVGF4aYnvn21qxLbA19HKB4LcrITqEbf9F8ss0HSSclwhbbrpBLQxulROsTnrhSNHZjIBaSJc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775145039; c=relaxed/simple; bh=l9P74l0iH7RMHENl4dmwUCA1v8Gfepgd7IEQZy7HSE8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=jn/x8LG6Zdx5+etIhk5X1gEJffy9SLl2HYgrXvxnb+tOld7WsZAM3i8c58CKMBDsOcE/inptlBufw2uArBoeOPdJJ1jp1KVv3sYeoo3gzi4zWfqkP7IExtZdtEn4A4HIjKBov7eW88mvunPXo20dl4aWjzo+C+0oapsDUdiCqAY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=B+Agegg6; arc=none smtp.client-ip=198.175.65.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="B+Agegg6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1775145039; x=1806681039; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=l9P74l0iH7RMHENl4dmwUCA1v8Gfepgd7IEQZy7HSE8=; b=B+Agegg6dmbJxKLThvFyq1iEab8rPIvYQch6OTyCs5WJ5DZEYBIpIuh5 9lfrS8FcJyEe1SHshjmsXi7BNgAy16P6A9jciKeFpWVHtkihwtEVCK43Q JlUdde6robXAytWe3eUm3CSwbK0n6lgsF4l/DGR+LWNlNaFZdN9f8jwJK OBwTlZMm9z2h8yBc87r+SwlFOBEUKENze6u/R7OqeD1S5dmN/a2JtlXIg 0BZqy0enGeoNfM5URlVqbdxjo7RhhAY2AG9CCejI6KPDLtxP3Re6aqtmC qzRbt2egHBMVis8yqaEAyHgvcc5HPUs4YlXILdHlbzkoD8zDfW/Z/uZLe g==; X-CSE-ConnectionGUID: nv9f0lJjTgioGcMA2zMjCQ== X-CSE-MsgGUID: KxI2CDy7ROCWsZ7mu8P7sQ== X-IronPort-AV: E=McAfee;i="6800,10657,11747"; a="75927973" X-IronPort-AV: E=Sophos;i="6.23,156,1770624000"; d="scan'208";a="75927973" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2026 08:50:39 -0700 X-CSE-ConnectionGUID: U9NOBAgnTAu5gB4gFkiCxQ== X-CSE-MsgGUID: +xxQ09qAR0uFdKtHg2Hdkw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,156,1770624000"; d="scan'208";a="224157635" Received: from boxer.igk.intel.com ([10.102.20.173]) by fmviesa008.fm.intel.com with ESMTP; 02 Apr 2026 08:50:36 -0700 From: Maciej Fijalkowski To: netdev@vger.kernel.org Cc: bpf@vger.kernel.org, magnus.karlsson@intel.com, stfomichev@gmail.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, larysa.zaremba@intel.com, aleksander.lobakin@intel.com, bjorn@kernel.org, Maciej Fijalkowski Subject: [PATCH v6 net 3/8] xsk: fix XDP_UMEM_SG_FLAG issues Date: Thu, 2 Apr 2026 17:49:53 +0200 Message-Id: <20260402154958.562179-4-maciej.fijalkowski@intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20260402154958.562179-1-maciej.fijalkowski@intel.com> References: <20260402154958.562179-1-maciej.fijalkowski@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently xp_assign_dev_shared() is missing XDP_USE_SG being propagated to flags so set it in order to preserve mtu check that is supposed to be done only when no multi-buffer setup is in picture. Also, this flag has the same value as XDP_UMEM_TX_SW_CSUM so we could get unexpected SG setups for software Tx checksums. Since csum flag is UAPI, modify value of XDP_UMEM_SG_FLAG. Fixes: d609f3d228a8 ("xsk: add multi-buffer support for sockets sharing umem") Reviewed-by: Björn Töpel Signed-off-by: Maciej Fijalkowski --- include/net/xdp_sock.h | 2 +- net/xdp/xsk_buff_pool.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h index 23e8861e8b25..ebac60a3d8a1 100644 --- a/include/net/xdp_sock.h +++ b/include/net/xdp_sock.h @@ -14,7 +14,7 @@ #include #include -#define XDP_UMEM_SG_FLAG (1 << 1) +#define XDP_UMEM_SG_FLAG BIT(3) struct net_device; struct xsk_queue; diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c index 37b7a68b89b3..729602a3cec0 100644 --- a/net/xdp/xsk_buff_pool.c +++ b/net/xdp/xsk_buff_pool.c @@ -247,6 +247,10 @@ int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_sock *umem_xs, struct xdp_umem *umem = umem_xs->umem; flags = umem->zc ? XDP_ZEROCOPY : XDP_COPY; + + if (umem->flags & XDP_UMEM_SG_FLAG) + flags |= XDP_USE_SG; + if (umem_xs->pool->uses_need_wakeup) flags |= XDP_USE_NEED_WAKEUP; -- 2.43.0