Received-SPF: pass (google.com: domain of linux-kernel+bounces-5055-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Vladimir Oltean <vladimir.oltean@nxp.com>
To: netdev@vger.kernel.org
Cc: bpf@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Randy Dunlap <rdunlap@infradead.org>,
	Tony Nguyen <anthony.l.nguyen@intel.com>,
	=?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= <bjorn@kernel.org>,
	Magnus Karlsson <magnus.karlsson@intel.com>,
	Maciej Fijalkowski <maciej.fijalkowski@intel.com>,
	Jonathan Lemon <jonathan.lemon@gmail.com>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	Paolo Abeni <pabeni@redhat.com>,
	Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Jesper Dangaard Brouer <hawk@kernel.org>,
	John Fastabend <john.fastabend@gmail.com>,
	Larysa Zaremba <larysa.zaremba@intel.com>
Subject: [PATCH net-next] xsk: make struct xsk_cb_desc available outside CONFIG_XDP_SOCKETS
Date: Tue, 19 Dec 2023 13:02:05 +0200
Message-Id: <20231219110205.1289506-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?zpFIn5TdmqYRwQx2VWZDwFa0z6o3TterblzuFOxE+QBpkJXuSCGCqQXem+uA?=
 =?us-ascii?Q?0nIOqa/H5jtwLg4N7BraDQmvlii55fdURFjih2AcZEDlvpXmMFZR67Kur3vW?=
 =?us-ascii?Q?bBa+my/GYROZMb0GsYHOQYzOAaOhtgiVq2j6zoQr1+el+spBrIrEFGBsrYso?=
 =?us-ascii?Q?/0jm78LZ3FD1DPx1Ma2xiZrz7MJc+pc+ietf+ga7GlJ7N9hikmVxC0Jrjb1y?=
 =?us-ascii?Q?IYsXqSAajys2LTYr2wyyPEYLMZrMFp13w55txXJaEGKcw559FPFauCYAjV1F?=
 =?us-ascii?Q?CJ3tgMiAHE9yttzta3AtXkagV2zxZYo/HGV+yxGNGqMiyprcAfmgRfhIo5mw?=
 =?us-ascii?Q?NYTjmaId50FrW1FlLi955NMJiNrejyIOorX4aZ3V+V6K14wkDtcpP3p1gTRr?=
 =?us-ascii?Q?JKam3WF+yaZnCptiA/k0ofSRQnsCLz4QxMDRMvEBBx99CjzNhBA5SLgEld9Y?=
 =?us-ascii?Q?2opMT/oONDgWAVrM6QwhiITJmm1bnbqZ07hXsCK+UmVBxJkY7FcyC2QyWU+D?=
 =?us-ascii?Q?zyTz2SyoHU4Q74GVc7pwO+XYbryViRYNOySud0CYGe9NNx43Ceb81Pl1dnr9?=
 =?us-ascii?Q?Le8YXVgkQ8s5sjeqyu/fG/hFWQVN+wmz9qPxaWaDvQoGyXOm0GhNpygFo22F?=
 =?us-ascii?Q?xSefX5RYKl6YG1opCWeAvlNwzTpTFAwDLU0I25kiYVz+8SHSHlwCm9Kc4NJ1?=
 =?us-ascii?Q?z9dK6IfzfcglVvq54A/FyyXXzyYrX3PDGe4Xi/I9T79t7hXsuqC17Y9kIeAk?=
 =?us-ascii?Q?4ZMydhv2tkYhbMw1zsfuKqPboVp0NhuQsAryAkE9r5ITDJ28JO9CjKJOTHxJ?=
 =?us-ascii?Q?zG9NTWhYpcJrZxCm9M6+VcPmPs1xc56JeJZGWZAZoRVAJnzNsG+FwuY0eGry?=
 =?us-ascii?Q?8huft9MrAlqrcC64kvmRMfNVZrc2Ieh21in+oXDZhXHNy5vFxFczes+sRTlI?=
 =?us-ascii?Q?ZVBITuyC5O+LUHPlb9AamzHdS+/KF7xMLxFjpW0x6fypFBodYTDhb77vmfVy?=
 =?us-ascii?Q?X1FEji538bH1j+DcKbL39siiJ+HOjsVZUoKEWYjBtFSfG3KGiFDibWhGiGo7?=
 =?us-ascii?Q?dPpd3jspOrZ7EcZcxLFE3zEyLM+cF+0WLHjiBJdxtUeI7x6Mol5BFG9PLYli?=
 =?us-ascii?Q?W4yKqKnybrxJZkQA5aDTbrSN4whX8VdR0S0SVuomDz4xbK6GWV+xj2EMGhPT?=
 =?us-ascii?Q?xtrAQ2ez59F7CzdJABQ3DSnrAjNhSmcQB2rwzhtgEYvSou6UodgjD52pGAfj?=
 =?us-ascii?Q?GNsWzTSLzrHQS+2SjCWBd2LkS59ZiDmdntuy2Eo73tyLr/NbhIPEGTUIDrmo?=
 =?us-ascii?Q?hgOBKbRCGMMlQFjx1r9L2dAZJd7hwkz83X6OnJa3U3rdPkz1fcCOFwxaKsjN?=
 =?us-ascii?Q?qYZ8ll1OTtBryP5buy9CI5txY+tdYHT49Gi+awv9/s9RyNOqLDYXRNoJHbgy?=
 =?us-ascii?Q?o1U3dsG+3pgj3aQzYPHXez6VC/xvxVufknzr2oo7AhTbqpMhS7/oZY0zxO02?=
 =?us-ascii?Q?j9HzCeFx34TQpZHnij8Q0aa3p+Y3OBYWNLCodo1sM2TUzTK7nb+L8S8Y0UpM?=
 =?us-ascii?Q?w4nRMRie+5mlNGg8ffbN8+p5eYP2it2pymbhgkF8LQ4hfLo/L/yui2nsOogz?=
 =?us-ascii?Q?nw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 221647b1-c994-4b8d-7415-08dc0081fd34
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2023 11:02:28.0762
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: T4OalOmGZHKAKuX+JCiE+Bn+v3OirmBVQdy+geYSeNdWZQxeBSe3W4sVX7g4fyYUrIGOKRrwYDuy6iiVQp1dCQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6853

The ice driver fails to build when CONFIG_XDP_SOCKETS is disabled.

drivers/net/ethernet/intel/ice/ice_base.c:533:21: error:
variable has incomplete type 'struct xsk_cb_desc'
        struct xsk_cb_desc desc = {};
                           ^
include/net/xsk_buff_pool.h:15:8: note:
forward declaration of 'struct xsk_cb_desc'
struct xsk_cb_desc;
       ^

Fixes: d68d707dcbbf ("ice: Support XDP hints in AF_XDP ZC mode")
Closes: https://lore.kernel.org/netdev/8b76dad3-8847-475b-aa17-613c9c978f7a@infradead.org/
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
Posting to net-next since this tree is broken at this stage, not only
bpf-next.

 include/net/xdp_sock_drv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/net/xdp_sock_drv.h b/include/net/xdp_sock_drv.h
index b62bb8525a5f..526c1e7f505e 100644
--- a/include/net/xdp_sock_drv.h
+++ b/include/net/xdp_sock_drv.h
@@ -12,14 +12,14 @@
 #define XDP_UMEM_MIN_CHUNK_SHIFT 11
 #define XDP_UMEM_MIN_CHUNK_SIZE (1 << XDP_UMEM_MIN_CHUNK_SHIFT)
 
-#ifdef CONFIG_XDP_SOCKETS
-
 struct xsk_cb_desc {
 	void *src;
 	u8 off;
 	u8 bytes;
 };
 
+#ifdef CONFIG_XDP_SOCKETS
+
 void xsk_tx_completed(struct xsk_buff_pool *pool, u32 nb_entries);
 bool xsk_tx_peek_desc(struct xsk_buff_pool *pool, struct xdp_desc *desc);
 u32 xsk_tx_peek_release_desc_batch(struct xsk_buff_pool *pool, u32 max);
-- 
2.34.1