Received-SPF: pass (google.com: domain of linux-kernel+bounces-15416-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Wed, 3 Jan 2024 11:54:37 +0100
From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To: Arnd Bergmann <arnd@kernel.org>
CC: Jesse Brandeburg <jesse.brandeburg@intel.com>, Tony Nguyen
	<anthony.l.nguyen@intel.com>, Jakub Kicinski <kuba@kernel.org>, Arnd Bergmann
	<arnd@arndb.de>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet
	<edumazet@google.com>, Paolo Abeni <pabeni@redhat.com>, Simon Horman
	<horms@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, Larysa Zaremba
	<larysa.zaremba@intel.com>, Piotr Raczynski <piotr.raczynski@intel.com>,
	Amritha Nambiar <amritha.nambiar@intel.com>, Alexei Starovoitov
	<ast@kernel.org>, <intel-wired-lan@lists.osuosl.org>,
	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ice: fix building withouto XDP
Message-ID: <ZZU87SZcE/6i8lyo@boxer>
References: <20240103102458.3687963-1-arnd@kernel.org>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20240103102458.3687963-1-arnd@kernel.org>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?W1Wx3XkEdJ3koVR3cY3vU5PtR5qPAV5y4BBNER2WRy2FQpm1gQwavi2x9mcY?=
 =?us-ascii?Q?Ptk+1ncIPrtPa0WyidMmlNwRhyawaWYjbf+FktGpe5oP7RPeDu4j7Bp2HBtG?=
 =?us-ascii?Q?1eo1TGSYXt4iIeuwM26+ndwB7VSazC6u6zj1DegzqdRfLp6TCbf98UIa1lB5?=
 =?us-ascii?Q?yUElF+BS6HEf2Lb7WNPEWRrnRMJADS5e2jSqEXKvuxJQQzSKJwNB1phDU9GI?=
 =?us-ascii?Q?NeaOc4zoiW/Iea+FjwpzI/2CNjLzELia7TOA614HObZ4AQjnONjK3AQMCkts?=
 =?us-ascii?Q?TRFTLJ4rBBlpF+f5pCupXPOmaZJwv6vOGhs1Q8FtoL1AXAVMxYdRrvmTtAzT?=
 =?us-ascii?Q?J+98dHaLjQ1uziqNgGyIM1Rg1cil1NAAVCWwGeMK7zHxzoE3Ao8022WRBCM/?=
 =?us-ascii?Q?/4VPOtJqjM45MJgn8a1eNsTfhsDCb+1oVwOzzdP97vfeFypZgD82oYTtR+G0?=
 =?us-ascii?Q?kvjGRDyDj7ZYRJlG7r6henUTj/Q4YaMCQqWPJraWb9NruwnGmL+3Ge7Lck98?=
 =?us-ascii?Q?L2XwEMfbVa+DMsIitnZ8JZzU0lDSxWRN4aDEQAJ2YeRLvkNcBx+zQ8yRJwXY?=
 =?us-ascii?Q?T6Qqw7HTpF+Ox6i+GnBhiAX1Jk/y6rSdY3C1fCDLIjDkGT1rCFIDOAXAW+5Y?=
 =?us-ascii?Q?HEBYEpACtok/SUP4v2IevpzvcvQR5llH2ua+wCkfjtBhLA5wgUWmDYkCCNIr?=
 =?us-ascii?Q?3on47P9LD1PbVsLzsQZ4gMvmqlwtECsG2cSQYx6/6g5lf/9wnIJ0bLIRYWMW?=
 =?us-ascii?Q?joD/q1rlmE7AFF1nhenlmd97fv98qIGWulMrT7H1bT5Ekd6oURL38qKNB+mw?=
 =?us-ascii?Q?9LBx487Y3AQ3MsTLSIt23vwTffyeuJU0pviKkVieJ8bBh+caSBToKCabl4Li?=
 =?us-ascii?Q?2Qhhs6VDsaImp3UTk4IunxyzFTtFOyMoF6WI2u2MMuiRmunu/esrvqSQiDLz?=
 =?us-ascii?Q?yo3C7qMVDZh6mT0rjCgH35THtGuMwLjiqtXKt5+1Uy9+mo/64H4SXz2xdfnF?=
 =?us-ascii?Q?V3u4w5Jlh807HnWizrU1oZNt2V8P3Tr7nvUF4U2oN5jZb2uptRzOveoXoPmK?=
 =?us-ascii?Q?rnI+ksMALw9r5j7Y+LuC1cNDysUu4J067gJgGlyJbIVFgKK5N3+ybBLiboJL?=
 =?us-ascii?Q?/hJDcM9k1hy8iToo82fziEz0qYml5pWDIyOggSthxSMEqVCaVeDD8P7zkRqU?=
 =?us-ascii?Q?Y1l/NWXmSVpdtD19eXPgKn3jwd80jmiINgbwIMa4qmWwf1TMgVa6MTPGkDHw?=
 =?us-ascii?Q?cVaPKE1RmGQ/OajNEHDBN3/i4MYkwO50EdJtoEw/poB5X/q9+1sLahIhSFW7?=
 =?us-ascii?Q?5Blfq9GhfA2iihuhxjVTDMTZ/rUz/4xlBYc4H7xSqRixW1u8pUap0BqD6m0y?=
 =?us-ascii?Q?oZ5vPa/2bAKYjE/s0ubUkpn/trpdMbVIwnMdKvNQzetd60k4wWu/hQhV4o4U?=
 =?us-ascii?Q?06oZkFGGXCVx3YsEzNIG3KkFItheoSZb8RsE08DkUZZXEgFjB1VVhptoZn2I?=
 =?us-ascii?Q?qWhcp5kYNH/GnLdEDs8Zfe11kUGmeXO6R0hLrZGCsla9QgAsR4jhH5kVr+N+?=
 =?us-ascii?Q?hoc+aLldA2Gb4Us3rrtBg8bmfKWETP1KIfuOiwsYoj1CwYEPZ8sG9IA6tIyl?=
 =?us-ascii?Q?4g=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 1db51223-efd7-47d0-24d8-08dc0c4a6471
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB6117.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 10:54:43.3206
 (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: hbZ0m3iEV8SDdY+qI4AhtCir65N21ZetxAXAq87JkjsrU+W/0IJopeNXuOd33aP1AhK+3Yzwy1zWMFAP42QdmIq35If5mesmMVOyu5YX1q0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB6943
X-OriginatorOrg: intel.com

On Wed, Jan 03, 2024 at 11:24:45AM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The newly added function fails to build when struct xsk_cb_desc is
> not defined:
> 
> drivers/net/ethernet/intel/ice/ice_base.c: In function 'ice_xsk_pool_fill_cb':
> drivers/net/ethernet/intel/ice/ice_base.c:525:16: error: variable 'desc' has initializer but incomplete type
> 
> Hide this part in the same #ifdef that controls the structure definition.

Hey Arnd,

this has been fixed by Vladimir:
https://lore.kernel.org/netdev/20231219110205.1289506-1-vladimir.oltean@nxp.com/

in a way that we don't have to wrap driver code with ifdefs.

Thanks!

> 
> Fixes: d68d707dcbbf ("ice: Support XDP hints in AF_XDP ZC mode")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/net/ethernet/intel/ice/ice_base.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c
> index 6e3694145f59..0d1aeb7ca108 100644
> --- a/drivers/net/ethernet/intel/ice/ice_base.c
> +++ b/drivers/net/ethernet/intel/ice/ice_base.c
> @@ -521,6 +521,7 @@ static int ice_setup_rx_ctx(struct ice_rx_ring *ring)
>  
>  static void ice_xsk_pool_fill_cb(struct ice_rx_ring *ring)
>  {
> +#ifdef CONFIG_XDP_SOCKETS
>  	void *ctx_ptr = &ring->pkt_ctx;
>  	struct xsk_cb_desc desc = {};
>  
> @@ -530,6 +531,7 @@ static void ice_xsk_pool_fill_cb(struct ice_rx_ring *ring)
>  		   sizeof(struct xdp_buff);
>  	desc.bytes = sizeof(ctx_ptr);
>  	xsk_pool_fill_cb(ring->xsk_pool, &desc);
> +#endif
>  }
>  
>  /**
> -- 
> 2.39.2
>