Skip to contentSkip to conversation

cxgb4: add UDP Segmentation Offload support

PATCH In review Rahul Lakkireddy 2 participants 9 messages Nov 22, 2019 – Nov 23, 2019

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

v2 cover cxgb4: add UDP Segmentation Offload support

This series of patches add UDP Segmentation Offload (USO) supported by Chelsio T5/T6 NICs.

Patch 1 updates the current Scatter Gather List (SGL) DMA unmap logic for USO requests.

Patch 2 adds USO support for NIC and MQPRIO QoS offload Tx path.

Patch 3 adds missing stats for MQPRIO QoS offload Tx path.

Thanks,
Rahul

v2:
- Remove inline keyword from write_eo_udp_wr() in sge.c in patch 2. Let the compiler decide.

Rahul Lakkireddy (3):
cxgb4/chcr: update SGL DMA unmap for USO
cxgb4: add UDP segmentation offload support
cxgb4: add stats for MQPRIO QoS offload Tx path

 drivers/crypto/chelsio/chcr_ipsec.c           |  27 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h    |  21 +-
 .../ethernet/chelsio/cxgb4/cxgb4_debugfs.c    |   2 +
 .../ethernet/chelsio/cxgb4/cxgb4_ethtool.c    |  16 +-
 .../net/ethernet/chelsio/cxgb4/cxgb4_main.c   |  11 +-
 .../ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c  |   2 +-
 drivers/net/ethernet/chelsio/cxgb4/sge.c      | 290 ++++++++++--------
 drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h |  14 +-
 8 files changed, 218 insertions(+), 165 deletions(-)
Signature · 1 line
2.24.0
#1 lore raw

PATCH v2 1/3 cxgb4/chcr: update SGL DMA unmap for USO

The FW_ETH_TX_EO_WR used for sending UDP Segmentation Offload (USO) requests expects the headers to be part of the descriptor and the payload to be part of the SGL containing the DMA mapped addresses. Hence, the DMA address in the first entry of the SGL can start after the packet headers. Currently, unmap_sgl() tries to unmap from this wrong offset, instead of the originally mapped DMA address.

So, use existing unmap_skb() instead, which takes originally saved DMA addresses as input. Update all necessary Tx paths to save the original DMA addresses, so that unmap_skb() can unmap them properly.

v2:
- No change.

---
 drivers/crypto/chelsio/chcr_ipsec.c           |  27 ++--
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h    |  19 ++-
 .../ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c  |   2 +-
 drivers/net/ethernet/chelsio/cxgb4/sge.c      | 119 +++++-------------
 4 files changed, 52 insertions(+), 115 deletions(-)
drivers/crypto/chelsio/chcr_ipsec.c +13 -14
index 24355680f30a..9da0f93a330b 100644
@@ -673,16 +673,16 @@ static inline void txq_advance(struct sge_txq *q, unsigned int n)
 int chcr_ipsec_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct xfrm_state *x = xfrm_input_state(skb);
+	unsigned int last_desc, ndesc, flits = 0;
 	struct ipsec_sa_entry *sa_entry;
 	u64 *pos, *end, *before, *sgl;
+	struct tx_sw_desc *sgl_sdesc;
 	int qidx, left, credits;
-	unsigned int flits = 0, ndesc;
-	struct adapter *adap;
+	bool immediate = false;
 	struct sge_eth_txq *q;
+	struct adapter *adap;
 	struct port_info *pi;
-	dma_addr_t addr[MAX_SKB_FRAGS + 1];
 	struct sec_path *sp;
-	bool immediate = false;
 
 	if (!x->xso.offload_handle)
 		return NETDEV_TX_BUSY;
@@ -715,8 +715,14 @@ out_free:       dev_kfree_skb_any(skb);
 		return NETDEV_TX_BUSY;
 	}
 
+	last_desc = q->q.pidx + ndesc - 1;
+	if (last_desc >= q->q.size)
+		last_desc -= q->q.size;
+	sgl_sdesc = &q->q.sdesc[last_desc];
+
 	if (!immediate &&
-	    unlikely(cxgb4_map_skb(adap->pdev_dev, skb, addr) < 0)) {
+	    unlikely(cxgb4_map_skb(adap->pdev_dev, skb, sgl_sdesc->addr) < 0)) {
+		memset(sgl_sdesc->addr, 0, sizeof(sgl_sdesc->addr));
 		q->mapping_err++;
 		goto out_free;
 	}
@@ -742,17 +748,10 @@ out_free:       dev_kfree_skb_any(skb);
 		cxgb4_inline_tx_skb(skb, &q->q, sgl);
 		dev_consume_skb_any(skb);
 	} else {
-		int last_desc;
-
 		cxgb4_write_sgl(skb, &q->q, (void *)sgl, end,
-				0, addr);
+				0, sgl_sdesc->addr);
 		skb_orphan(skb);
-
-		last_desc = q->q.pidx + ndesc - 1;
-		if (last_desc >= q->q.size)
-			last_desc -= q->q.size;
-		q->q.sdesc[last_desc].skb = skb;
-		q->q.sdesc[last_desc].sgl = (struct ulptx_sgl *)sgl;
+		sgl_sdesc->skb = skb;
 	}
 	txq_advance(&q->q, ndesc);
 
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +7 -12
index 3121ed83d8e2..61a2cf62f694 100644
@@ -735,7 +735,12 @@ struct tx_desc {
 	__be64 flit[8];
 };
 
-struct tx_sw_desc;
+struct ulptx_sgl;
+
+struct tx_sw_desc {
+	struct sk_buff *skb; /* SKB to free after getting completion */
+	dma_addr_t addr[MAX_SKB_FRAGS + 1]; /* DMA mapped addresses */
+};
 
 struct sge_txq {
 	unsigned int  in_use;       /* # of in-use Tx descriptors */
@@ -814,15 +819,10 @@ enum sge_eosw_state {
 	CXGB4_EO_STATE_FLOWC_CLOSE_REPLY, /* Waiting for FLOWC close reply */
 };
 
-struct sge_eosw_desc {
-	struct sk_buff *skb; /* SKB to free after getting completion */
-	dma_addr_t addr[MAX_SKB_FRAGS + 1]; /* DMA mapped addresses */
-};
-
 struct sge_eosw_txq {
 	spinlock_t lock; /* Per queue lock to synchronize completions */
 	enum sge_eosw_state state; /* Current ETHOFLD State */
-	struct sge_eosw_desc *desc; /* Descriptor ring to hold packets */
+	struct tx_sw_desc *desc; /* Descriptor ring to hold packets */
 	u32 ndesc; /* Number of descriptors */
 	u32 pidx; /* Current Producer Index */
 	u32 last_pidx; /* Last successfully transmitted Producer Index */
@@ -1151,11 +1151,6 @@ enum {
 	SCHED_CLASS_RATEMODE_ABS = 1,   /* Kb/s */
 };
 
-struct tx_sw_desc {                /* SW state per Tx descriptor */
-	struct sk_buff *skb;
-	struct ulptx_sgl *sgl;
-};
-
 /* Support for "sched_queue" command to allow one or more NIC TX Queues
  * to be bound to a TX Scheduling Class.
  */
drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c +1 -1
index db55673b77bd..477973d2e341 100644
@@ -70,7 +70,7 @@ static int cxgb4_init_eosw_txq(struct net_device *dev,
 			       u32 eotid, u32 hwqid)
 {
 	struct adapter *adap = netdev2adap(dev);
-	struct sge_eosw_desc *ring;
+	struct tx_sw_desc *ring;
 
 	memset(eosw_txq, 0, sizeof(*eosw_txq));
 
drivers/net/ethernet/chelsio/cxgb4/sge.c +31 -88

207 lines not on this page · raw message

Signature · 1 line
2.24.0
#2 lore raw

Re: [PATCH net-next v2 1/3] cxgb4/chcr: update SGL DMA unmap for USO

Quoted 21 lines · Rahul Lakkireddy

The FW_ETH_TX_EO_WR used for sending UDP Segmentation Offload (USO) requests expects the headers to be part of the descriptor and the payload to be part of the SGL containing the DMA mapped addresses. Hence, the DMA address in the first entry of the SGL can start after the packet headers. Currently, unmap_sgl() tries to unmap from this wrong offset, instead of the originally mapped DMA address.

So, use existing unmap_skb() instead, which takes originally saved DMA addresses as input. Update all necessary Tx paths to save the original DMA addresses, so that unmap_skb() can unmap them properly.

v2:
- No change.

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +0 -0
index 3121ed83d8e2..61a2cf62f694 100644

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h struct tx_desc { · line 738

Quoted 5 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +1 -1
@@ -735,7 +735,12 @@ struct tx_desc {
 	__be64 flit[8];
 };
 
-struct tx_sw_desc;
+struct ulptx_sgl;

From this patch alone the forward declaration of struct ulptx_sgl; appears unnecessary or a left over from some previous version of the code?

Quoted 7 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +4 -0
+struct tx_sw_desc {
+	struct sk_buff *skb; /* SKB to free after getting completion */
+	dma_addr_t addr[MAX_SKB_FRAGS + 1]; /* DMA mapped addresses */
+};
 
 struct sge_txq {
 	unsigned int  in_use;       /* # of in-use Tx descriptors */
#3 lore raw

Re: [PATCH net-next v2 1/3] cxgb4/chcr: update SGL DMA unmap for USO

Quoted 6 lines · Jakub Kicinski

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h struct tx_desc { · line 738

Quoted 2 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +1 -1
-struct tx_sw_desc;
+struct ulptx_sgl;  

From this patch alone the forward declaration of struct ulptx_sgl; appears unnecessary or a left over from some previous version of the code?

Okay, taking that back, looks like compiler treats use of struct type in another struct as a forward declaration. Interesting.

#4 lore raw

PATCH v2 2/3 cxgb4: add UDP segmentation offload support

In reply to Rahul Lakkireddy

Implement and export UDP segmentation offload (USO) support for both NIC and MQPRIO QoS offload Tx path. Update appropriate logic in Tx to parse GSO info in skb and configure FW_ETH_TX_EO_WR request needed to perform USO.

v2:
- Remove inline keyword from write_eo_udp_wr() in sge.c. Let the compiler decide.

---
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h    |   1 +
 .../ethernet/chelsio/cxgb4/cxgb4_debugfs.c    |   1 +
 .../ethernet/chelsio/cxgb4/cxgb4_ethtool.c    |   3 +
 .../net/ethernet/chelsio/cxgb4/cxgb4_main.c   |  11 +-
 drivers/net/ethernet/chelsio/cxgb4/sge.c      | 159 ++++++++++++------
 drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h |  14 +-
 6 files changed, 139 insertions(+), 50 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +1 -0
index 61a2cf62f694..04cb8909feeb 100644
@@ -772,6 +772,7 @@ struct sge_eth_txq {                /* state for an SGE Ethernet Tx queue */
 	u8 dbqt;                    /* SGE Doorbell Queue Timer in use */
 	unsigned int dbqtimerix;    /* SGE Doorbell Queue Timer Index */
 	unsigned long tso;          /* # of TSO requests */
+	unsigned long uso;          /* # of USO requests */
 	unsigned long tx_cso;       /* # of Tx checksum offloads */
 	unsigned long vlan_ins;     /* # of Tx VLAN insertions */
 	unsigned long mapping_err;  /* # of I/O MMU packet mapping errors */
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c +1 -0
index a13b03f771cc..fa229d0f1016 100644
@@ -2748,6 +2748,7 @@ do { \
 		RL("RxDrops:", stats.rx_drops);
 		RL("RxBadPkts:", stats.bad_rx_pkts);
 		TL("TSO:", tso);
+		TL("USO:", uso);
 		TL("TxCSO:", tx_cso);
 		TL("VLANins:", vlan_ins);
 		TL("TxQFull:", q.stops);
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +3 -0
index 76538f4cd595..f57457453561 100644
@@ -91,6 +91,7 @@ static const char stats_strings[][ETH_GSTRING_LEN] = {
 	"rx_bg3_frames_trunc    ",
 
 	"tso                    ",
+	"uso                    ",
 	"tx_csum_offload        ",
 	"rx_csum_good           ",
 	"vlan_extractions       ",
@@ -220,6 +221,7 @@ static void get_strings(struct net_device *dev, u32 stringset, u8 *data)
  */
 struct queue_port_stats {
 	u64 tso;
+	u64 uso;
 	u64 tx_csum;
 	u64 rx_csum;
 	u64 vlan_ex;
@@ -247,6 +249,7 @@ static void collect_sge_port_stats(const struct adapter *adap,
 	memset(s, 0, sizeof(*s));
 	for (i = 0; i < p->nqsets; i++, rx++, tx++) {
 		s->tso += tx->tso;
+		s->uso += tx->uso;
 		s->tx_csum += tx->tx_cso;
 		s->rx_csum += rx->stats.rx_cso;
 		s->vlan_ex += rx->stats.vlan_ex;
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +9 -2
index e8a1826a1e90..12ff69b3ba91 100644
@@ -1136,11 +1136,17 @@ static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb,
 
 	if (dev->num_tc) {
 		struct port_info *pi = netdev2pinfo(dev);
+		u8 ver, proto;
+
+		ver = ip_hdr(skb)->version;
+		proto = (ver == 6) ? ipv6_hdr(skb)->nexthdr :
+				     ip_hdr(skb)->protocol;
 
 		/* Send unsupported traffic pattern to normal NIC queues. */
 		txq = netdev_pick_tx(dev, skb, sb_dev);
 		if (xfrm_offload(skb) || is_ptp_enabled(skb, dev) ||
-		    ip_hdr(skb)->protocol != IPPROTO_TCP)
+		    skb->encapsulation ||
+		    (proto != IPPROTO_TCP && proto != IPPROTO_UDP))
 			txq = txq % pi->nqsets;
 
 		return txq;
@@ -5838,7 +5844,8 @@ static void free_some_resources(struct adapter *adapter)
 		t4_fw_bye(adapter, adapter->pf);
 }
 
-#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN)
+#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN | \
+		   NETIF_F_GSO_UDP_L4)
 #define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \
 		   NETIF_F_GRO | NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)
 #define SEGMENT_SIZE 128
drivers/net/ethernet/chelsio/cxgb4/sge.c +112 -47

259 lines not on this page · raw message

drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h +13 -1
index 414e5cca293e..ac4fb43bdec6 100644
@@ -536,7 +536,8 @@ struct fw_eth_tx_pkt_wr {
 };
 
 enum fw_eth_tx_eo_type {
-	FW_ETH_TX_EO_TYPE_TCPSEG = 1,
+	FW_ETH_TX_EO_TYPE_UDPSEG = 0,
+	FW_ETH_TX_EO_TYPE_TCPSEG,
 };
 
 struct fw_eth_tx_eo_wr {
@@ -544,6 +545,17 @@ struct fw_eth_tx_eo_wr {
 	__be32 equiq_to_len16;
 	__be64 r3;
 	union fw_eth_tx_eo {
+		struct fw_eth_tx_eo_udpseg {
+			__u8   type;
+			__u8   ethlen;
+			__be16 iplen;
+			__u8   udplen;
+			__u8   rtplen;
+			__be16 r4;
+			__be16 mss;
+			__be16 schedpktsize;
+			__be32 plen;
+		} udpseg;
 		struct fw_eth_tx_eo_tcpseg {
 			__u8   type;
 			__u8   ethlen;
Signature · 1 line
2.24.0
#5 lore raw

Re: [PATCH net-next v2 2/3] cxgb4: add UDP segmentation offload support

Quoted 16 lines · Rahul Lakkireddy

Implement and export UDP segmentation offload (USO) support for both NIC and MQPRIO QoS offload Tx path. Update appropriate logic in Tx to parse GSO info in skb and configure FW_ETH_TX_EO_WR request needed to perform USO.

v2:
- Remove inline keyword from write_eo_udp_wr() in sge.c. Let the compiler decide.

drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +0 -0
index 76538f4cd595..f57457453561 100644

drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c static const char stats_strings[][ETH_GSTRING_LEN] = { · line 94

Quoted 4 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +1 -0
@@ -91,6 +91,7 @@ static const char stats_strings[][ETH_GSTRING_LEN] = {
 	"rx_bg3_frames_trunc    ",
 
 	"tso                    ",
+	"uso                    ",

Oh wow, the spaces, people's inventiveness when it comes to ethtool free form strings knows no bounds..

That's not a review comment, I just wanted to say that :)

Quoted 9 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +0 -0
 	"tx_csum_offload        ",
 	"rx_csum_good           ",
 	"vlan_extractions       ",
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +0 -0
index e8a1826a1e90..12ff69b3ba91 100644

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb, · line 1143

Quoted 8 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +5 -0
@@ -1136,11 +1136,17 @@ static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb,
 
 	if (dev->num_tc) {
 		struct port_info *pi = netdev2pinfo(dev);
+		u8 ver, proto;
+
+		ver = ip_hdr(skb)->version;
+		proto = (ver == 6) ? ipv6_hdr(skb)->nexthdr :
+				     ip_hdr(skb)->protocol;

Checking ip version now looks potentially like a fix?

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb, · line 1148

Quoted 5 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +1 -1
 		/* Send unsupported traffic pattern to normal NIC queues. */
 		txq = netdev_pick_tx(dev, skb, sb_dev);
 		if (xfrm_offload(skb) || is_ptp_enabled(skb, dev) ||
-		    ip_hdr(skb)->protocol != IPPROTO_TCP)
+		    skb->encapsulation ||

The addition of encapsulation check also looks unrelated?

Quoted 14 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +3 -1
+		    (proto != IPPROTO_TCP && proto != IPPROTO_UDP))
 			txq = txq % pi->nqsets;
 
 		return txq;
@@ -5838,7 +5844,8 @@ static void free_some_resources(struct adapter *adapter)
 		t4_fw_bye(adapter, adapter->pf);
 }
 
-#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN)
+#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN | \
+		   NETIF_F_GSO_UDP_L4)
 #define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \
 		   NETIF_F_GRO | NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)
 #define SEGMENT_SIZE 128
#6 lore raw

Re: [PATCH net-next v2 2/3] cxgb4: add UDP segmentation offload support

Quoted 37 lines · Jakub Kicinski
Quoted 16 lines · Rahul Lakkireddy

Implement and export UDP segmentation offload (USO) support for both NIC and MQPRIO QoS offload Tx path. Update appropriate logic in Tx to parse GSO info in skb and configure FW_ETH_TX_EO_WR request needed to perform USO.

v2:
- Remove inline keyword from write_eo_udp_wr() in sge.c. Let the compiler decide.

drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +0 -0
index 76538f4cd595..f57457453561 100644

drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c static const char stats_strings[][ETH_GSTRING_LEN] = { · line 94

Quoted 4 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +1 -0
@@ -91,6 +91,7 @@ static const char stats_strings[][ETH_GSTRING_LEN] = {
 	"rx_bg3_frames_trunc    ",
 
 	"tso                    ",
+	"uso                    ",

Oh wow, the spaces, people's inventiveness when it comes to ethtool free form strings knows no bounds..

That's not a review comment, I just wanted to say that :)

Quoted 10 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +0 -0
 	"tx_csum_offload        ",
 	"rx_csum_good           ",
 	"vlan_extractions       ",
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +0 -0
index e8a1826a1e90..12ff69b3ba91 100644
@@ -1136,11 +1136,17 @@ static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb,
 
Quoted 10 lines

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb, · line 1143

Quoted 7 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +5 -0
 	if (dev->num_tc) {
 		struct port_info *pi = netdev2pinfo(dev);
+		u8 ver, proto;
+
+		ver = ip_hdr(skb)->version;
+		proto = (ver == 6) ? ipv6_hdr(skb)->nexthdr :
+				     ip_hdr(skb)->protocol;

Checking ip version now looks potentially like a fix?

Yes, the earlier check was not considering IPv6 header when extracting the protocol field for comparison, used to decide whether the traffic can be sent on the TC-MQPRIO QoS offload Tx path added very recently just a couple of weeks ago.

Quoted 8 lines

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb, · line 1148

Quoted 5 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +1 -1
 		/* Send unsupported traffic pattern to normal NIC queues. */
 		txq = netdev_pick_tx(dev, skb, sb_dev);
 		if (xfrm_offload(skb) || is_ptp_enabled(skb, dev) ||
-		    ip_hdr(skb)->protocol != IPPROTO_TCP)
+		    skb->encapsulation ||

The addition of encapsulation check also looks unrelated?

UDP traffic was not supported on the TC-MQPRIO QoS offload Tx path before this patch. VxLAN and Geneve UDP tunnel packets need to be handled differently and hence the above check to send these packets through the normal Tx path for now. The support for them on QoS offload path will be enabled by a future patchset.

Quoted 4 lines

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb, · line 1152

Quoted 4 lines
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +1 -0
+		    (proto != IPPROTO_TCP && proto != IPPROTO_UDP))
 			txq = txq % pi->nqsets;
 
 		return txq;

Thanks,
Rahul

#7 lore raw

PATCH v2 3/3 cxgb4: add stats for MQPRIO QoS offload Tx path

In reply to Rahul Lakkireddy

Export necessary stats for traffic flowing through MQPRIO QoS offload Tx path.

v2:
- No change.

---
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |  1 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c |  1 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 13 ++++++++++++-
 drivers/net/ethernet/chelsio/cxgb4/sge.c           | 14 ++++++++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +1 -0
index 04cb8909feeb..a70ac2097892 100644
@@ -850,6 +850,7 @@ struct sge_eohw_txq {
 	struct sge_txq q; /* HW Txq */
 	struct adapter *adap; /* Backpointer to adapter */
 	unsigned long tso; /* # of TSO requests */
+	unsigned long uso; /* # of USO requests */
 	unsigned long tx_cso; /* # of Tx checksum offloads */
 	unsigned long vlan_ins; /* # of Tx VLAN insertions */
 	unsigned long mapping_err; /* # of I/O MMU packet mapping errors */
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c +1 -0
index fa229d0f1016..93868dca186a 100644
@@ -2797,6 +2797,7 @@ do { \
 		RL("RxAN", stats.an);
 		RL("RxNoMem", stats.nomem);
 		TL("TSO:", tso);
+		TL("USO:", uso);
 		TL("TxCSO:", tx_cso);
 		TL("VLANins:", vlan_ins);
 		TL("TxQFull:", q.stops);
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +12 -1
index f57457453561..20ab3b6285a2 100644
@@ -242,9 +242,10 @@ static void collect_sge_port_stats(const struct adapter *adap,
 				   const struct port_info *p,
 				   struct queue_port_stats *s)
 {
-	int i;
 	const struct sge_eth_txq *tx = &adap->sge.ethtxq[p->first_qset];
 	const struct sge_eth_rxq *rx = &adap->sge.ethrxq[p->first_qset];
+	struct sge_eohw_txq *eohw_tx;
+	unsigned int i;
 
 	memset(s, 0, sizeof(*s));
 	for (i = 0; i < p->nqsets; i++, rx++, tx++) {
@@ -257,6 +258,16 @@ static void collect_sge_port_stats(const struct adapter *adap,
 		s->gro_pkts += rx->stats.lro_pkts;
 		s->gro_merged += rx->stats.lro_merged;
 	}
+
+	if (adap->sge.eohw_txq) {
+		eohw_tx = &adap->sge.eohw_txq[p->first_qset];
+		for (i = 0; i < p->nqsets; i++, eohw_tx++) {
+			s->tso += eohw_tx->tso;
+			s->uso += eohw_tx->uso;
+			s->tx_csum += eohw_tx->tx_cso;
+			s->vlan_ins += eohw_tx->vlan_ins;
+		}
+	}
 }
 
 static void collect_adapter_stats(struct adapter *adap, struct adapter_stats *s)
drivers/net/ethernet/chelsio/cxgb4/sge.c +14 -0
index 53f9a821c29f..97cda501e7e8 100644
@@ -2262,6 +2262,19 @@ static void ethofld_hard_xmit(struct net_device *dev,
 				d->addr);
 	}
 
+	if (skb_shinfo(skb)->gso_size) {
+		if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4)
+			eohw_txq->uso++;
+		else
+			eohw_txq->tso++;
+		eohw_txq->tx_cso += skb_shinfo(skb)->gso_segs;
+	} else if (skb->ip_summed == CHECKSUM_PARTIAL) {
+		eohw_txq->tx_cso++;
+	}
+
+	if (skb_vlan_tag_present(skb))
+		eohw_txq->vlan_ins++;
+
 	txq_advance(&eohw_txq->q, ndesc);
 	cxgb4_ring_tx_db(adap, &eohw_txq->q, ndesc);
 	eosw_txq_advance_index(&eosw_txq->last_pidx, 1, eosw_txq->ndesc);
@@ -4546,6 +4559,7 @@ int t4_sge_alloc_ethofld_txq(struct adapter *adap, struct sge_eohw_txq *txq,
 	spin_lock_init(&txq->lock);
 	txq->adap = adap;
 	txq->tso = 0;
+	txq->uso = 0;
 	txq->tx_cso = 0;
 	txq->vlan_ins = 0;
 	txq->mapping_err = 0;
Signature · 1 line
2.24.0
#8 lore raw
In reply to Rahul Lakkireddy
Quoted 8 lines · Rahul Lakkireddy

This series of patches add UDP Segmentation Offload (USO) supported by Chelsio T5/T6 NICs.

Patch 1 updates the current Scatter Gather List (SGL) DMA unmap logic for USO requests.

Patch 2 adds USO support for NIC and MQPRIO QoS offload Tx path.

Quoted 8 lines

Patch 3 adds missing stats for MQPRIO QoS offload Tx path.

Thanks,
Rahul

v2:
- Remove inline keyword from write_eo_udp_wr() in sge.c in patch 2. Let the compiler decide.

Okay, these are good enough, so applied to net-next. Thanks!