Received-SPF: pass (google.com: domain of linux-kernel+bounces-5078-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 19 Dec 2023 12:26:50 +0100
From: Larysa Zaremba <larysa.zaremba@intel.com>
To: Vladimir Oltean <vladimir.oltean@nxp.com>
CC: <netdev@vger.kernel.org>, <bpf@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>, Randy Dunlap <rdunlap@infradead.org>, "Tony
 Nguyen" <anthony.l.nguyen@intel.com>, =?iso-8859-1?Q?Bj=F6rn_T=F6pel?=
	<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>
Subject: Re: [PATCH net-next] xsk: make struct xsk_cb_desc available outside
 CONFIG_XDP_SOCKETS
Message-ID: <ZYF9+lhYT1i7dvDT@lzaremba-mobl.ger.corp.intel.com>
References: <20231219110205.1289506-1-vladimir.oltean@nxp.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20231219110205.1289506-1-vladimir.oltean@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UdJ9kqPui9hFCSRSm8GVlf1BwuUB6OxsWGFuYX5maM7xzVr9DfwYXf3jFWKO?=
 =?us-ascii?Q?OhAjvcTJgC4IkX3ytgOlxn3qDCyK5r2mmbZ0govK6k/gCS2TD5WBQ0UbK58E?=
 =?us-ascii?Q?GvBJEIDDYvsC9etYERlYZhJTUUYwKqvX5tLkhSdEdr+Y82olKnzlRizkz2n9?=
 =?us-ascii?Q?SDsuA+7rsuIs/FWhTpxHXxqFcLAMtN+ftMZjqc7jglySU5VcG8NNjLedV+84?=
 =?us-ascii?Q?wJ362haOQaIq62UaFiQXm85aUMAEToQmeMlvaFAB/8W2bAt78vtDGjYkNWbe?=
 =?us-ascii?Q?uVEidJboBroStyjJ5hYq3S8bmjWy5doDrc/J4C58bsRK2zuO4BELirYw+CvD?=
 =?us-ascii?Q?LjcKZhGSLEeUdcCfkwSLmkDkqidV2yzN+Tb2vdX0SBXrfglZq57zyU19GACZ?=
 =?us-ascii?Q?07DGGZX98h2rKZ11eDFYDtDXpWyltLsML4HwhZ35DBSjGRSMLnd2hbJAKQ+L?=
 =?us-ascii?Q?y0tTtw8PbLI6tIqMkrKNmAm5m7IkMu9LM3jfOTmgKZh6cijciQFOThVFQP9G?=
 =?us-ascii?Q?mVLn1KhHO6d5k3iR/Pjc/mT3EeFdv2Uh53033AxeFvTuUAXT53XE2ljqBFbH?=
 =?us-ascii?Q?LUZlQoHOEhNJZgn60LtX9AEbUoE4s6wjApOHGBVG/pThVg7yNlWEm6Uxlfap?=
 =?us-ascii?Q?KMx8QiOerX+fti8afUzXZFFIBCkF8trZj9mNaAN17IjTX+/vIcOFatX1/dl/?=
 =?us-ascii?Q?m0seqPPaVc/2mQGjFumaY1MoM+Jp4TNZ6fKZoga1ww4B5anj2o5Mi5+pRZVy?=
 =?us-ascii?Q?evDQxm6tDlTIM+ubxFNl4xbfxejtAz1+Om9hKOXhKbczP5ta6hWyY0fpiKOd?=
 =?us-ascii?Q?i+eQqQ4ORq7ltPqL9vp6hl9N1GeFTzKVKo8wb+eGHh6PsNSwIBQBGxC5v827?=
 =?us-ascii?Q?n1/O3e7eU4jf4Tso67fFXfNlmVY3FOSu/IbDLCu5PNSEPDzuqprieJmNqxh6?=
 =?us-ascii?Q?NP+6KwlzWOoMm1BTDASFjHB40NKgKLSnQNgsxE9yfAaakOHfZzkKdPOV7aqm?=
 =?us-ascii?Q?xFa+X+TefvO8DwZUakf/YNLYQUg1ofln7Xw6AtU4/ph7shCcvo7tGC0PTzmA?=
 =?us-ascii?Q?ZBoC9fWKBcpLHOfMg9x6MBLcMWDobUmMkcQe8Qd7DEXuHxCA/xxLzrQFN8Gy?=
 =?us-ascii?Q?QjaXiD3s7XeE3hbJhntv1p4iRuncTg2pPXCP5//Nz2Hg1S/srXiPt1cm2OiX?=
 =?us-ascii?Q?feabsvPsrIdwwVhNa2iGBMGg9AS9PoyzSPgx5tX+sIHhHNJwZ0ioP5IgOZwv?=
 =?us-ascii?Q?Jw40OKKPmE74e6h/prSYk4uxZTpryD4uaGX77G3w19DYV7c2X3lrBhDp4mwO?=
 =?us-ascii?Q?mgyODxJw8AWG8/TFK4AJB9+Odyz8+I/qPZ2k5LVVdWzcSveD2RB703ubrNm3?=
 =?us-ascii?Q?mJ/1cJKDLZ8zICwzD4bSHseLjuwmqpFJBauRfoE9vQLhuxKRWAE0g1k9QMnz?=
 =?us-ascii?Q?JNoRAU3biOZck/7OYJKYsgL0nk1WsqB3Jv5ZU9ebfnDF6bpe8u7MK0UMAHCe?=
 =?us-ascii?Q?HgHsfft8EUm41hO944jFY+DbWP38DPjSWhMvZGEt8Oh+tb6mtxhRkOutR3Zi?=
 =?us-ascii?Q?Bn+qQRpfnvPOrQLhLNOlm5tDGz8F92sunBbqIxbEc6AXZk2zLQG2vQH9WtSw?=
 =?us-ascii?Q?Ow=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 4e684319-c093-4d13-6180-08dc00856a10
X-MS-Exchange-CrossTenant-AuthSource: SN7PR11MB7540.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2023 11:26:59.1039
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Q0l2Qoak5/p+UUThtiVlJ0IVRqR/jdD6Q2KX/6BqfKGQ5V2GfemeHO7lwi8r0DbRAKLs+qt9nwnpSwqdpdWGOis8WyJgrpBAAlTvzj1Pl0k=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR11MB6084
X-OriginatorOrg: intel.com

On Tue, Dec 19, 2023 at 01:02:05PM +0200, Vladimir Oltean wrote:
> 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>

This probably should go through bpf-next. Other than that, fix looks fine:

Acked-by: Larysa Zaremba <larysa.zaremba@intel.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
>