Skip to contentSkip to conversation

igc: Add interrupt support

PATCH Superseded Sasha Neftin 3 participants 3 messages Aug 23, 2018 – Aug 27, 2018

Subsystems (2)

v6 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

PATCH v6 4/11 igc: Add interrupt support

This patch set adds interrupt support for the igc interfaces.

Sasha Neftin (v2):
fixed comments

Sasha Neftin (v3):
minor cosmetic changes

Sasha Neftin (v4):
address comments
move IGC_NO_QUEUE to .h file
add header to irqreturn_t igc_msix_other method fix comment in igc_write_ivar method
fix xmas tree layout
fix code indentation
replace e1000_ prefix with igc_ prefix introduce BIT() macro

Sasha Neftin (v5):
fix xmas tree tree layout
fix code indentation

Sasha Neftin (v6):
minor cosmetic changes

---
 drivers/net/ethernet/intel/igc/igc.h         |  131 +++
 drivers/net/ethernet/intel/igc/igc_defines.h |   40 +
 drivers/net/ethernet/intel/igc/igc_hw.h      |   84 ++
 drivers/net/ethernet/intel/igc/igc_main.c    | 1030 ++++++++++++++++++
 4 files changed, 1285 insertions(+)
drivers/net/ethernet/intel/igc/igc.h +131 -0
index cccc02b999c1..a279bf2716b9 100644
@@ -28,6 +28,17 @@
 extern char igc_driver_name[];
 extern char igc_driver_version[];
 
+/* Interrupt defines */
+#define IGC_START_ITR			648 /* ~6000 ints/sec */
+#define IGC_FLAG_HAS_MSI		BIT(0)
+#define IGC_FLAG_QUEUE_PAIRS		BIT(4)
+#define IGC_FLAG_HAS_MSIX		BIT(13)
+
+#define IGC_START_ITR			648 /* ~6000 ints/sec */
+#define IGC_4K_ITR			980
+#define IGC_20K_ITR			196
+#define IGC_70K_ITR			56
+
 /* Transmit and receive queues */
 #define IGC_MAX_RX_QUEUES		4
 #define IGC_MAX_TX_QUEUES		4
@@ -42,10 +53,100 @@ enum igc_state_t {
 	__IGC_PTP_TX_IN_PROGRESS,
 };
 
+struct igc_tx_queue_stats {
+	u64 packets;
+	u64 bytes;
+	u64 restart_queue;
+};
+
+struct igc_rx_queue_stats {
+	u64 packets;
+	u64 bytes;
+	u64 drops;
+	u64 csum_err;
+	u64 alloc_failed;
+};
+
+struct igc_rx_packet_stats {
+	u64 ipv4_packets;      /* IPv4 headers processed */
+	u64 ipv4e_packets;     /* IPv4E headers with extensions processed */
+	u64 ipv6_packets;      /* IPv6 headers processed */
+	u64 ipv6e_packets;     /* IPv6E headers with extensions processed */
+	u64 tcp_packets;       /* TCP headers processed */
+	u64 udp_packets;       /* UDP headers processed */
+	u64 sctp_packets;      /* SCTP headers processed */
+	u64 nfs_packets;       /* NFS headers processe */
+	u64 other_packets;
+};
+
+struct igc_ring_container {
+	struct igc_ring *ring;          /* pointer to linked list of rings */
+	unsigned int total_bytes;       /* total bytes processed this int */
+	unsigned int total_packets;     /* total packets processed this int */
+	u16 work_limit;                 /* total work allowed per interrupt */
+	u8 count;                       /* total number of rings in vector */
+	u8 itr;                         /* current ITR setting for ring */
+};
+
+struct igc_ring {
+	struct igc_q_vector *q_vector;  /* backlink to q_vector */
+	struct net_device *netdev;      /* back pointer to net_device */
+	struct device *dev;             /* device for dma mapping */
+	union {                         /* array of buffer info structs */
+		struct igc_tx_buffer *tx_buffer_info;
+		struct igc_rx_buffer *rx_buffer_info;
+	};
+	void *desc;                     /* descriptor ring memory */
+	unsigned long flags;            /* ring specific flags */
+	void __iomem *tail;             /* pointer to ring tail register */
+	dma_addr_t dma;                 /* phys address of the ring */
+	unsigned int size;              /* length of desc. ring in bytes */
+
+	u16 count;                      /* number of desc. in the ring */
+	u8 queue_index;                 /* logical index of the ring*/
+	u8 reg_idx;                     /* physical index of the ring */
+
+	/* everything past this point are written often */
+	u16 next_to_clean;
+	u16 next_to_use;
+	u16 next_to_alloc;
+
+	union {
+		/* TX */
+		struct {
+			struct igc_tx_queue_stats tx_stats;
+		};
+		/* RX */
+		struct {
+			struct igc_rx_queue_stats rx_stats;
+			struct igc_rx_packet_stats pkt_stats;
+#ifdef CONFIG_IGC_DISABLE_PACKET_SPLIT
+			u16 rx_buffer_len;
+#else
+			struct sk_buff *skb;
+#endif
+		};
+	};
+} ____cacheline_internodealigned_in_smp;
+
 struct igc_q_vector {
 	struct igc_adapter *adapter;    /* backlink */
+	void __iomem *itr_register;
+	u32 eims_value;                 /* EIMS mask value */
+
+	u16 itr_val;
+	u8 set_itr;
+
+	struct igc_ring_container rx, tx;
 
 	struct napi_struct napi;
+
+	struct rcu_head rcu;    /* to avoid race with update stats on free */
+	char name[IFNAMSIZ + 9];
+	struct net_device poll_dev;
+
+	/* for dynamic allocation of rings associated with this q_vector */
+	struct igc_ring ring[0] ____cacheline_internodealigned_in_smp;
 };
 
 struct igc_mac_addr {
@@ -65,13 +166,35 @@ struct igc_adapter {
 	unsigned long state;
 	unsigned int flags;
 	unsigned int num_q_vectors;
+
+	struct msix_entry *msix_entries;
+
+	/* TX */
+	u16 tx_work_limit;
+	int num_tx_queues;
+	struct igc_ring *tx_ring[IGC_MAX_TX_QUEUES];
+
+	/* RX */
+	int num_rx_queues;
+	struct igc_ring *rx_ring[IGC_MAX_RX_QUEUES];
+
+	struct timer_list watchdog_timer;
+	struct timer_list dma_err_timer;
+	struct timer_list phy_info_timer;
+
 	u16 link_speed;
 	u16 link_duplex;
 
 	u8 port_num;
 
 	u8 __iomem *io_addr;
+	/* Interrupt Throttle Rate */
+	u32 rx_itr_setting;
+	u32 tx_itr_setting;
+
+	struct work_struct reset_task;
 	struct work_struct watchdog_task;
+	struct work_struct dma_err_task;
 
 	int msg_enable;
 	u32 max_frame_size;
@@ -81,8 +204,16 @@ struct igc_adapter {
 
 	/* structs defined in igc_hw.h */
 	struct igc_hw hw;
+	struct igc_hw_stats stats;
 
 	struct igc_q_vector *q_vector[MAX_Q_VECTORS];
+	u32 eims_enable_mask;
+	u32 eims_other;
+
+	u16 tx_ring_count;
+	u16 rx_ring_count;
+
+	u32 rss_queues;
 
 	struct igc_mac_addr *mac_table;
 };
drivers/net/ethernet/intel/igc/igc_defines.h +40 -0
index 3817cbc0a6ad..fcd14dfb7517 100644
@@ -45,4 +45,44 @@
 #define IGC_STATUS_SPEED_100	0x00000040      /* Speed 100Mb/s */
 #define IGC_STATUS_SPEED_1000	0x00000080      /* Speed 1000Mb/s */
 
+/* Interrupt Cause Read */
+#define IGC_ICR_TXDW		BIT(0)	/* Transmit desc written back */
+#define IGC_ICR_TXQE		BIT(1)	/* Transmit Queue empty */
+#define IGC_ICR_LSC		BIT(2)	/* Link Status Change */
+#define IGC_ICR_RXSEQ		BIT(3)	/* Rx sequence error */
+#define IGC_ICR_RXDMT0		BIT(4)	/* Rx desc min. threshold (0) */
+#define IGC_ICR_RXO		BIT(6)	/* Rx overrun */
+#define IGC_ICR_RXT0		BIT(7)	/* Rx timer intr (ring 0) */
+#define IGC_ICR_DRSTA		BIT(30)	/* Device Reset Asserted */
+#define IGC_ICS_RXT0		IGC_ICR_RXT0      /* Rx timer intr */
+
+#define IMS_ENABLE_MASK ( \
+	IGC_IMS_RXT0   |    \
+	IGC_IMS_TXDW   |    \
+	IGC_IMS_RXDMT0 |    \
+	IGC_IMS_RXSEQ  |    \
+	IGC_IMS_LSC)
+
+/* Interrupt Mask Set */
+#define IGC_IMS_TXDW		IGC_ICR_TXDW	/* Tx desc written back */
+#define IGC_IMS_RXSEQ		IGC_ICR_RXSEQ	/* Rx sequence error */
+#define IGC_IMS_LSC		IGC_ICR_LSC	/* Link Status Change */
+#define IGC_IMS_DOUTSYNC	IGC_ICR_DOUTSYNC /* NIC DMA out of sync */
+#define IGC_IMS_DRSTA		IGC_ICR_DRSTA	/* Device Reset Asserted */
+#define IGC_IMS_RXT0		IGC_ICR_RXT0	/* Rx timer intr */
+#define IGC_IMS_RXDMT0		IGC_ICR_RXDMT0	/* Rx desc min. threshold */
+
+#define IGC_QVECTOR_MASK	0x7FFC		/* Q-vector mask */
+#define IGC_ITR_VAL_MASK	0x04		/* ITR value mask */
+
+#define IGC_ICR_DOUTSYNC	0x10000000 /* NIC DMA out of sync */
+#define IGC_EITR_CNT_IGNR	0x80000000 /* Don't reset counters on write */
+#define IGC_IVAR_VALID		0x80
+#define IGC_GPIE_NSICR		0x00000001
+#define IGC_GPIE_MSIX_MODE	0x00000010
+#define IGC_GPIE_EIAME		0x40000000
+#define IGC_GPIE_PBA		0x80000000
+
+#define IGC_N0_QUEUE -1
+
 #endif /* _IGC_DEFINES_H_ */
drivers/net/ethernet/intel/igc/igc_hw.h +84 -0

90 lines not on this page · raw message

drivers/net/ethernet/intel/igc/igc_main.c +1030 -0

1,093 lines not on this page · raw message

Signature · 1 line
2.18.0
#1 lore raw

PATCH v6 4/11 igc: Add interrupt support

On 8/23/2018 12:06 AM, Sasha Neftin wrote:

[...]

Quoted 42 lines
drivers/net/ethernet/intel/igc/igc_main.c +42 -0
+
+/**
+ *  igc_request_msix - Initialize MSI-X interrupts
+ *  @adapter: Pointer to adapter structure
+ *
+ *  igc_request_msix allocates MSI-X vectors and requests interrupts from the
+ *  kernel.
+ **/
+static int igc_request_msix(struct igc_adapter *adapter)
+{
+	int i = 0, err = 0, vector = 0, free_vector = 0;
+	struct net_device *netdev = adapter->netdev;
+
+	err = request_irq(adapter->msix_entries[vector].vector,
+			  &igc_msix_other, 0, netdev->name, adapter);
+	if (err)
+		goto err_out;
+
+	for (i = 0; i < adapter->num_q_vectors; i++) {
+		struct igc_q_vector *q_vector = adapter->q_vector[i];
+
+		vector++;
+
+		q_vector->itr_register = adapter->io_addr + IGC_EITR(vector);
+
+		if (q_vector->rx.ring && q_vector->tx.ring)
+			sprintf(q_vector->name, "%s-TxRx-%u", netdev->name,
+				q_vector->rx.ring->queue_index);
+		else if (q_vector->tx.ring)
+			sprintf(q_vector->name, "%s-tx-%u", netdev->name,
+				q_vector->tx.ring->queue_index);
+		else if (q_vector->rx.ring)
+			sprintf(q_vector->name, "%s-rx-%u", netdev->name,
+				q_vector->rx.ring->queue_index);
+		else
+			sprintf(q_vector->name, "%s-unused", netdev->name);
+
+		err = request_irq(adapter->msix_entries[vector].vector,
+				  igc_msix_ring, 0, q_vector->name,
+				  q_vector);
+		if (err)
+			goto err_free;

drivers/net/ethernet/intel/igc/igc_main.c static void igc_set_default_mac_filter(struct igc_adapter *adapter) · line 531

Quoted 10 lines
drivers/net/ethernet/intel/igc/igc_main.c +10 -0
+	}
+
+	igc_configure_msix(adapter);
+	return 0;
+
+err_free:
+	/* free already assigned IRQs */
+	free_irq(adapter->msix_entries[free_vector++].vector, adapter);
+
+	vector--;

You might set free_vector to 0 here rather than in the definition above, just in case someone in the future decides to use it elsewhere in the function and leave junk in it.

Quoted 8 lines
drivers/net/ethernet/intel/igc/igc_main.c +8 -0
+	for (i = 0; i < vector; i++) {
+		free_irq(adapter->msix_entries[free_vector++].vector,
+			 adapter->q_vector[i]);
+	}
+err_out:
+	return err;
+}
+

[...]

drivers/net/ethernet/intel/igc/igc_main.c static void igc_set_default_mac_filter(struct igc_adapter *adapter) · line 938

Quoted 2 lines
drivers/net/ethernet/intel/igc/igc_main.c +2 -0
+
+	/*populate entry values*/

Fix comment spacing

sln

#2 lore raw

PATCH v6 4/11 igc: Add interrupt support

Quoted 53 lines · Shannon Nelson

On 8/23/2018 12:06 AM, Sasha Neftin wrote:

[...]

Quoted 49 lines
drivers/net/ethernet/intel/igc/igc_main.c +6 -0
+
+/**
+ *? igc_request_msix - Initialize MSI-X interrupts
+ *? @adapter: Pointer to adapter structure
+ *
+ *? igc_request_msix allocates MSI-X vectors and requests interrupts 

from the
+ *? kernel.
+ **/

(quoted diff) +40 -0
+static int igc_request_msix(struct igc_adapter *adapter)
+{
+??? int i = 0, err = 0, vector = 0, free_vector = 0;
+??? struct net_device *netdev = adapter->netdev;
+
+??? err = request_irq(adapter->msix_entries[vector].vector,
+????????????? &igc_msix_other, 0, netdev->name, adapter);
+??? if (err)
+??????? goto err_out;
+
+??? for (i = 0; i < adapter->num_q_vectors; i++) {
+??????? struct igc_q_vector *q_vector = adapter->q_vector[i];
+
+??????? vector++;
+
+??????? q_vector->itr_register = adapter->io_addr + IGC_EITR(vector);
+
+??????? if (q_vector->rx.ring && q_vector->tx.ring)
+??????????? sprintf(q_vector->name, "%s-TxRx-%u", netdev->name,
+??????????????? q_vector->rx.ring->queue_index);
+??????? else if (q_vector->tx.ring)
+??????????? sprintf(q_vector->name, "%s-tx-%u", netdev->name,
+??????????????? q_vector->tx.ring->queue_index);
+??????? else if (q_vector->rx.ring)
+??????????? sprintf(q_vector->name, "%s-rx-%u", netdev->name,
+??????????????? q_vector->rx.ring->queue_index);
+??????? else
+??????????? sprintf(q_vector->name, "%s-unused", netdev->name);
+
+??????? err = request_irq(adapter->msix_entries[vector].vector,
+????????????????? igc_msix_ring, 0, q_vector->name,
+????????????????? q_vector);
+??????? if (err)
+??????????? goto err_free;
+??? }
+
+??? igc_configure_msix(adapter);
+??? return 0;
+
+err_free:
Quoted 9 lines
Quoted 4 lines

+??? /* free already assigned IRQs */
+??? free_irq(adapter->msix_entries[free_vector++].vector, adapter); +
+??? vector--;

You might set free_vector to 0 here rather than in the definition above, just in case someone in the future decides to use it elsewhere in the function and leave junk in it.

i will consult with my colleagues about this suggestion.

Quoted 11 lines
Quoted 8 lines

+??? for (i = 0; i < vector; i++) {
+??????? free_irq(adapter->msix_entries[free_vector++].vector, +???????????? adapter->q_vector[i]);
+??? }

drivers/net/ethernet/intel/igc/igc_main.c +4 -0
+err_out:
+??? return err;
+}
+

[...]

Quoted 5 lines
Quoted 2 lines

+
+??? /*populate entry values*/

Fix comment spacing

I need to fix that. Thanks.

Quoted 1 line

sln