Commit 2fc6b26a authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Jakub Kicinski
Browse files

ice: use generic unrolled_count() macro 



ice, same as i40e, has a custom loop unrolling macros for unrolling
Tx descriptors filling on XSk xmit.
Replace ice defs with generic unrolled_count(), which is also more
convenient as it allows passing defines as its argument, not hardcoded
values, while the loop declaration will still be usual for-loop.

Signed-off-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Acked-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Link: https://patch.msgid.link/20250206182630.3914318-4-aleksander.lobakin@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9144e6f4

drivers/net/ethernet/intel/ice/ice_xsk.c

+3 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/* Copyright (c) 2019, Intel Corporation. */



#include <linux/bpf_trace.h>

#include <linux/unroll.h>

#include <net/xdp_sock_drv.h>

#include <net/xdp.h>

#include "ice.h"
@@ -989,7 +990,8 @@ static void ice_xmit_pkt_batch(struct ice_tx_ring *xdp_ring, 
	struct ice_tx_desc *tx_desc;

	u32 i;



	loop_unrolled_for(i = 0; i < PKTS_PER_BATCH; i++) {

	unrolled_count(PKTS_PER_BATCH)

	for (i = 0; i < PKTS_PER_BATCH; i++) {

		dma_addr_t dma;



		dma = xsk_buff_raw_get_dma(xsk_pool, descs[i].addr);

drivers/net/ethernet/intel/ice/ice_xsk.h

+0 −8
Original line number Diff line number Diff line
@@ -7,14 +7,6 @@ 


#define PKTS_PER_BATCH 8



#ifdef __clang__

#define loop_unrolled_for _Pragma("clang loop unroll_count(8)") for

#elif __GNUC__ >= 8

#define loop_unrolled_for _Pragma("GCC unroll 8") for

#else

#define loop_unrolled_for for

#endif



struct ice_vsi;



#ifdef CONFIG_XDP_SOCKETS