From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 26F272E11C7; Mon, 20 Apr 2026 15:52:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776700374; cv=none; b=FQqvM94BFul0Jho9iTLt6cnVhuxV5JrpOjDL2Au8fydYIAci8VeeFsULUuchIlBL8+EtbU4G7Bnp20umaU8ar6tn0pUfQ+6BFJB5TjZf/iSvZzBi1xuL0pFG6Rf6mPnYcG/e5v4CC9qX+tpN4eEglYM1wFBqrq+Y/vJ2WiXIpkg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776700374; c=relaxed/simple; bh=lUwtUu+0GvLAe0pEgXRRV9ihErEaDwwIcKZKZ0mCGZM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cpewUq+UtofW3dxzWQ/zf3eIVG6JsWttdce4Mye+nqNvfa+SaykLiXbDvk9VvshzVIKnFOM+Bjg4PUZbhoBF9cA0hYPCjFt0/5qxW+Fzxf7mtAQh2MQr6Q1quD/rjo6j7lodddYSRzyNWSe1L1WUKHny3gXAAe0V8tDo9ClcGk4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=W670MHCR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="W670MHCR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B30FEC19425; Mon, 20 Apr 2026 15:52:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776700374; bh=lUwtUu+0GvLAe0pEgXRRV9ihErEaDwwIcKZKZ0mCGZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W670MHCRnYftPLH1NWYMIJlrHVUV5bjN9kfHzZAcgeMkALOz0BlvN3OX3bGkLUo4h 5RXUU4HaAgZ324aH+NI+/StWhLTnim+AD83QdH3YX9nP/DlHllX3t47BNeF8K5nhc5 FxRtKCoSttl/aD4YrDj3OZRmFrPLaA8DD6KHevFM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Maciej Fijalkowski , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.19 104/220] xsk: fix XDP_UMEM_SG_FLAG issues Date: Mon, 20 Apr 2026 17:40:45 +0200 Message-ID: <20260420153937.779498174@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260420153934.013228280@linuxfoundation.org> References: <20260420153934.013228280@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Maciej Fijalkowski [ Upstream commit 93e84fe45b752d17a5a46b306ed78f0133bbc719 ] 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 Link: https://patch.msgid.link/20260402154958.562179-4-maciej.fijalkowski@intel.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- 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 23e8861e8b25e..ebac60a3d8a17 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 51526034c42ac..6799ab6672f3e 100644 --- a/net/xdp/xsk_buff_pool.c +++ b/net/xdp/xsk_buff_pool.c @@ -252,6 +252,10 @@ int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_sock *umem_xs, return -EINVAL; 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.53.0