Commit f70b864c authored by Sriram Yagnaraman's avatar Sriram Yagnaraman Committed by Jakub Kicinski
Browse files

igb: Remove static qualifiers 



Remove static qualifiers on the following functions to be able to call
from XSK specific file that is added in the later patches:
- igb_xdp_tx_queue_mapping()
- igb_xdp_ring_update_tail()
- igb_clean_tx_ring()
- igb_clean_rx_ring()
- igb_xdp_xmit_back()
- igb_process_skb_fields()

While at it, inline igb_xdp_tx_queue_mapping() and
igb_xdp_ring_update_tail(). These functions are small enough and used in
XDP hot paths.

Signed-off-by: default avatarSriram Yagnaraman <sriram.yagnaraman@est.tech>
[Kurt: Split patches, inline small XDP functions]
Signed-off-by: default avatarKurt Kanzenbach <kurt@linutronix.de>
Acked-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Tested-by: default avatarGeorge Kuruvinakunnel <george.kuruvinakunnel@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Link: https://patch.msgid.link/20250106221929.956999-2-anthony.l.nguyen@intel.com


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

drivers/net/ethernet/intel/igb/igb.h

+29 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/i2c-algo-bit.h>

#include <linux/pci.h>

#include <linux/mdio.h>

#include <linux/lockdep.h>



#include <net/xdp.h>
@@ -731,12 +732,18 @@ int igb_setup_tx_resources(struct igb_ring *); 
int igb_setup_rx_resources(struct igb_ring *);

void igb_free_tx_resources(struct igb_ring *);

void igb_free_rx_resources(struct igb_ring *);

void igb_clean_tx_ring(struct igb_ring *tx_ring);

void igb_clean_rx_ring(struct igb_ring *rx_ring);

void igb_configure_tx_ring(struct igb_adapter *, struct igb_ring *);

void igb_configure_rx_ring(struct igb_adapter *, struct igb_ring *);

void igb_setup_tctl(struct igb_adapter *);

void igb_setup_rctl(struct igb_adapter *);

void igb_setup_srrctl(struct igb_adapter *, struct igb_ring *);

netdev_tx_t igb_xmit_frame_ring(struct sk_buff *, struct igb_ring *);

int igb_xdp_xmit_back(struct igb_adapter *adapter, struct xdp_buff *xdp);

void igb_process_skb_fields(struct igb_ring *rx_ring,

			    union e1000_adv_rx_desc *rx_desc,

			    struct sk_buff *skb);

void igb_alloc_rx_buffers(struct igb_ring *, u16);

void igb_update_stats(struct igb_adapter *);

bool igb_has_link(struct igb_adapter *adapter);
@@ -797,6 +804,28 @@ static inline struct netdev_queue *txring_txq(const struct igb_ring *tx_ring) 
	return netdev_get_tx_queue(tx_ring->netdev, tx_ring->queue_index);

}



/* This function assumes __netif_tx_lock is held by the caller. */

static inline void igb_xdp_ring_update_tail(struct igb_ring *ring)

{

	lockdep_assert_held(&txring_txq(ring)->_xmit_lock);



	/* Force memory writes to complete before letting h/w know there

	 * are new descriptors to fetch.

	 */

	wmb();

	writel(ring->next_to_use, ring->tail);

}



static inline struct igb_ring *igb_xdp_tx_queue_mapping(struct igb_adapter *adapter)

{

	unsigned int r_idx = smp_processor_id();



	if (r_idx >= adapter->num_tx_queues)

		r_idx = r_idx % adapter->num_tx_queues;



	return adapter->tx_ring[r_idx];

}



int igb_add_filter(struct igb_adapter *adapter,

		   struct igb_nfc_filter *input);

int igb_erase_filter(struct igb_adapter *adapter,

drivers/net/ethernet/intel/igb/igb_main.c

+6 −31
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <linux/bpf_trace.h>

#include <linux/pm_runtime.h>

#include <linux/etherdevice.h>

#include <linux/lockdep.h>

#ifdef CONFIG_IGB_DCA

#include <linux/dca.h>

#endif
@@ -116,8 +115,6 @@ static void igb_configure_tx(struct igb_adapter *); 
static void igb_configure_rx(struct igb_adapter *);

static void igb_clean_all_tx_rings(struct igb_adapter *);

static void igb_clean_all_rx_rings(struct igb_adapter *);

static void igb_clean_tx_ring(struct igb_ring *);

static void igb_clean_rx_ring(struct igb_ring *);

static void igb_set_rx_mode(struct net_device *);

static void igb_update_phy_info(struct timer_list *);

static void igb_watchdog(struct timer_list *);
@@ -2919,29 +2916,7 @@ static int igb_xdp(struct net_device *dev, struct netdev_bpf *xdp) 
	}

}



/* This function assumes __netif_tx_lock is held by the caller. */

static void igb_xdp_ring_update_tail(struct igb_ring *ring)

{

	lockdep_assert_held(&txring_txq(ring)->_xmit_lock);



	/* Force memory writes to complete before letting h/w know there

	 * are new descriptors to fetch.

	 */

	wmb();

	writel(ring->next_to_use, ring->tail);

}



static struct igb_ring *igb_xdp_tx_queue_mapping(struct igb_adapter *adapter)

{

	unsigned int r_idx = smp_processor_id();



	if (r_idx >= adapter->num_tx_queues)

		r_idx = r_idx % adapter->num_tx_queues;



	return adapter->tx_ring[r_idx];

}



static int igb_xdp_xmit_back(struct igb_adapter *adapter, struct xdp_buff *xdp)

int igb_xdp_xmit_back(struct igb_adapter *adapter, struct xdp_buff *xdp)

{

	struct xdp_frame *xdpf = xdp_convert_buff_to_frame(xdp);

	int cpu = smp_processor_id();
@@ -4888,7 +4863,7 @@ static void igb_free_all_tx_resources(struct igb_adapter *adapter) 
 *  igb_clean_tx_ring - Free Tx Buffers

 *  @tx_ring: ring to be cleaned

 **/

static void igb_clean_tx_ring(struct igb_ring *tx_ring)

void igb_clean_tx_ring(struct igb_ring *tx_ring)

{

	u16 i = tx_ring->next_to_clean;

	struct igb_tx_buffer *tx_buffer = &tx_ring->tx_buffer_info[i];
@@ -5007,7 +4982,7 @@ static void igb_free_all_rx_resources(struct igb_adapter *adapter) 
 *  igb_clean_rx_ring - Free Rx Buffers per Queue

 *  @rx_ring: ring to free buffers from

 **/

static void igb_clean_rx_ring(struct igb_ring *rx_ring)

void igb_clean_rx_ring(struct igb_ring *rx_ring)

{

	u16 i = rx_ring->next_to_clean;
@@ -8786,7 +8761,7 @@ static bool igb_cleanup_headers(struct igb_ring *rx_ring, 
 *  order to populate the hash, checksum, VLAN, timestamp, protocol, and

 *  other fields within the skb.

 **/

static void igb_process_skb_fields(struct igb_ring *rx_ring,

void igb_process_skb_fields(struct igb_ring *rx_ring,

			    union e1000_adv_rx_desc *rx_desc,

			    struct sk_buff *skb)

{