Commit 09f9d7a8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ena-driver-xdp-changes' 

David Arinzon says:

====================
ENA driver XDP changes

This patchset contains multiple XDP-related changes
in the ENA driver, including moving the XDP code to
dedicated files.
====================

Link: https://lore.kernel.org/r/20240101190855.18739-1-darinzon@amazon.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4ebb1f95 782345d2

Documentation/networking/device_drivers/ethernet/amazon/ena.rst

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ ena_common_defs.h Common definitions for ena_com layer. 
ena_regs_defs.h     Definition of ENA PCI memory-mapped (MMIO) registers.

ena_netdev.[ch]     Main Linux kernel driver.

ena_ethtool.c       ethtool callbacks.

ena_xdp.[ch]        XDP files

ena_pci_id_tbl.h    Supported device IDs.

=================   ======================================================

drivers/net/ethernet/amazon/ena/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 


obj-$(CONFIG_ENA_ETHERNET) += ena.o



ena-y := ena_netdev.o ena_com.o ena_eth_com.o ena_ethtool.o
 
ena-y := ena_netdev.o ena_com.o ena_eth_com.o ena_ethtool.o ena_xdp.o

drivers/net/ethernet/amazon/ena/ena_ethtool.c

+8 −10
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/pci.h>



#include "ena_netdev.h"

#include "ena_xdp.h"



struct ena_stats {

	char name[ETH_GSTRING_LEN];
@@ -262,17 +263,14 @@ static void ena_queue_strings(struct ena_adapter *adapter, u8 **data) 
					ena_stats->name);

		}



		if (!is_xdp) {

			/* RX stats, in XDP there isn't a RX queue

			 * counterpart

			 */

		/* In XDP there isn't an RX queue counterpart */

		if (is_xdp)

			continue;



		for (j = 0; j < ENA_STATS_ARRAY_RX; j++) {

			ena_stats = &ena_stats_rx_strings[j];



				ethtool_sprintf(data,

						"queue_%u_rx_%s", i,

						ena_stats->name);

			}

			ethtool_sprintf(data, "queue_%u_rx_%s", i, ena_stats->name);

		}

	}

}

drivers/net/ethernet/amazon/ena/ena_netdev.c

+64 −625

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/amazon/ena/ena_netdev.h

+43 −56
Original line number Diff line number Diff line
@@ -110,19 +110,6 @@ 


#define ENA_MMIO_DISABLE_REG_READ	BIT(0)



/* The max MTU size is configured to be the ethernet frame size without

 * the overhead of the ethernet header, which can have a VLAN header, and

 * a frame check sequence (FCS).

 * The buffer size we share with the device is defined to be ENA_PAGE_SIZE

 */



#define ENA_XDP_MAX_MTU (ENA_PAGE_SIZE - ETH_HLEN - ETH_FCS_LEN -	\

			 VLAN_HLEN - XDP_PACKET_HEADROOM -		\

			 SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))



#define ENA_IS_XDP_INDEX(adapter, index) (((index) >= (adapter)->xdp_first_ring) && \

	((index) < (adapter)->xdp_first_ring + (adapter)->xdp_num_queues))



struct ena_irq {

	irq_handler_t handler;

	void *data;
@@ -138,13 +125,18 @@ struct ena_napi { 
	struct napi_struct napi;

	struct ena_ring *tx_ring;

	struct ena_ring *rx_ring;

	struct ena_ring *xdp_ring;

	u32 qid;

	struct dim dim;

};



struct ena_tx_buffer {

	union {

		struct sk_buff *skb;

		/* XDP buffer structure which is used for sending packets in

		 * the xdp queues

		 */

		struct xdp_frame *xdpf;

	};

	/* num of ena desc for this specific skb

	 * (includes data desc and metadata desc)

	 */
@@ -152,16 +144,14 @@ struct ena_tx_buffer { 
	/* num of buffers used by this skb */

	u32 num_of_bufs;



	/* XDP buffer structure which is used for sending packets in

	 * the xdp queues

	 */

	struct xdp_frame *xdpf;

	/* Total size of all buffers in bytes */

	u32 total_tx_size;



	/* Indicate if bufs[0] map the linear data of the skb. */

	u8 map_linear_data;



	/* Used for detect missing tx packets to limit the number of prints */

	u32 print_once;

	u8 print_once;

	/* Save the last jiffies to detect missing tx packets

	 *

	 * sets to non zero value on ena_start_xmit and set to zero on
@@ -421,47 +411,44 @@ static inline void ena_reset_device(struct ena_adapter *adapter, 
	set_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags);

}



enum ena_xdp_errors_t {

	ENA_XDP_ALLOWED = 0,

	ENA_XDP_CURRENT_MTU_TOO_LARGE,

	ENA_XDP_NO_ENOUGH_QUEUES,

};



enum ENA_XDP_ACTIONS {

	ENA_XDP_PASS		= 0,

	ENA_XDP_TX		= BIT(0),

	ENA_XDP_REDIRECT	= BIT(1),

	ENA_XDP_DROP		= BIT(2)

};

int handle_invalid_req_id(struct ena_ring *ring, u16 req_id,

			  struct ena_tx_buffer *tx_info, bool is_xdp);



#define ENA_XDP_FORWARDED (ENA_XDP_TX | ENA_XDP_REDIRECT)



static inline bool ena_xdp_present(struct ena_adapter *adapter)

/* Increase a stat by cnt while holding syncp seqlock on 32bit machines */

static inline void ena_increase_stat(u64 *statp, u64 cnt,

				     struct u64_stats_sync *syncp)

{

	return !!adapter->xdp_bpf_prog;

	u64_stats_update_begin(syncp);

	(*statp) += cnt;

	u64_stats_update_end(syncp);

}



static inline bool ena_xdp_present_ring(struct ena_ring *ring)

static inline void ena_ring_tx_doorbell(struct ena_ring *tx_ring)

{

	return !!ring->xdp_bpf_prog;

}



static inline bool ena_xdp_legal_queue_count(struct ena_adapter *adapter,

					     u32 queues)

{

	return 2 * queues <= adapter->max_num_io_queues;

}



static inline enum ena_xdp_errors_t ena_xdp_allowed(struct ena_adapter *adapter)

{

	enum ena_xdp_errors_t rc = ENA_XDP_ALLOWED;



	if (adapter->netdev->mtu > ENA_XDP_MAX_MTU)

		rc = ENA_XDP_CURRENT_MTU_TOO_LARGE;

	else if (!ena_xdp_legal_queue_count(adapter, adapter->num_io_queues))

		rc = ENA_XDP_NO_ENOUGH_QUEUES;



	return rc;

	ena_com_write_sq_doorbell(tx_ring->ena_com_io_sq);

	ena_increase_stat(&tx_ring->tx_stats.doorbells, 1, &tx_ring->syncp);

}



int ena_xmit_common(struct ena_adapter *adapter,

		    struct ena_ring *ring,

		    struct ena_tx_buffer *tx_info,

		    struct ena_com_tx_ctx *ena_tx_ctx,

		    u16 next_to_use,

		    u32 bytes);

void ena_unmap_tx_buff(struct ena_ring *tx_ring,

		       struct ena_tx_buffer *tx_info);

void ena_init_io_rings(struct ena_adapter *adapter,

		       int first_index, int count);

int ena_create_io_tx_queues_in_range(struct ena_adapter *adapter,

				     int first_index, int count);

int ena_setup_tx_resources_in_range(struct ena_adapter *adapter,

				    int first_index, int count);

void ena_free_all_io_tx_resources_in_range(struct ena_adapter *adapter,

					   int first_index, int count);

void ena_free_all_io_tx_resources(struct ena_adapter *adapter);

void ena_down(struct ena_adapter *adapter);

int ena_up(struct ena_adapter *adapter);

void ena_unmask_interrupt(struct ena_ring *tx_ring, struct ena_ring *rx_ring);

void ena_update_ring_numa_node(struct ena_ring *tx_ring,

			       struct ena_ring *rx_ring);

#endif /* !(ENA_H) */