Skip to contentSkip to conversation

Driver: Vmxnet3: Copy TCP header to mapped frame for IPv6 packets

PATCH In review Shrikrishna Khare 2 participants 3 messages Feb 28, 2015 – Mar 1, 2015

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

PATCH 1/1 Driver: Vmxnet3: Copy TCP header to mapped frame for IPv6 packets

Allows for packet parsing to be done by the fast path. This performance optimization already exists for IPv4. Add similar logic for IPv6.

---
 drivers/net/vmxnet3/vmxnet3_drv.c | 26 ++++++++++++++++----------
 drivers/net/vmxnet3/vmxnet3_int.h |  5 +++--
 2 files changed, 19 insertions(+), 12 deletions(-)
drivers/net/vmxnet3/vmxnet3_drv.c +16 -10
index 294214c..9216e6a 100644
@@ -819,6 +819,7 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
 			   struct vmxnet3_adapter *adapter)
 {
 	struct Vmxnet3_TxDataDesc *tdd;
+	u8 protocol = 0;
 
 	if (ctx->mss) {	/* TSO */
 		ctx->eth_ip_hdr_size = skb_transport_offset(skb);
@@ -831,16 +832,20 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
 			if (ctx->ipv4) {
 				const struct iphdr *iph = ip_hdr(skb);
 
-				if (iph->protocol == IPPROTO_TCP)
-					ctx->l4_hdr_size = tcp_hdrlen(skb);
-				else if (iph->protocol == IPPROTO_UDP)
-					ctx->l4_hdr_size = sizeof(struct udphdr);
-				else
-					ctx->l4_hdr_size = 0;
-			} else {
-				/* for simplicity, don't copy L4 headers */
-				ctx->l4_hdr_size = 0;
+				protocol = iph->protocol;
+			} else if (ctx->ipv6) {
+				const struct ipv6hdr *ipv6h = ipv6_hdr(skb);
+
+				protocol = ipv6h->nexthdr;
 			}
+
+			if (protocol == IPPROTO_TCP)
+				ctx->l4_hdr_size = tcp_hdrlen(skb);
+			else if (protocol == IPPROTO_UDP)
+				ctx->l4_hdr_size = sizeof(struct udphdr);
+			else
+				ctx->l4_hdr_size = 0;
+
 			ctx->copy_size = min(ctx->eth_ip_hdr_size +
 					 ctx->l4_hdr_size, skb->len);
 		} else {
@@ -887,7 +892,7 @@ vmxnet3_prepare_tso(struct sk_buff *skb,
 		iph->check = 0;
 		tcph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr, 0,
 						 IPPROTO_TCP, 0);
-	} else {
+	} else if (ctx->ipv6) {
 		struct ipv6hdr *iph = ipv6_hdr(skb);
 
 		tcph->check = ~csum_ipv6_magic(&iph->saddr, &iph->daddr, 0,
@@ -938,6 +943,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
 	count = txd_estimate(skb);
 
 	ctx.ipv4 = (vlan_get_protocol(skb) == cpu_to_be16(ETH_P_IP));
+	ctx.ipv6 = (vlan_get_protocol(skb) == cpu_to_be16(ETH_P_IPV6));
 
 	ctx.mss = skb_shinfo(skb)->gso_size;
 	if (ctx.mss) {
drivers/net/vmxnet3/vmxnet3_int.h +3 -2
index cd71c77..6bb769a 100644
@@ -69,10 +69,10 @@
 /*
  * Version numbers
  */
-#define VMXNET3_DRIVER_VERSION_STRING   "1.3.4.0-k"
+#define VMXNET3_DRIVER_VERSION_STRING   "1.3.5.0-k"
 
 /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
-#define VMXNET3_DRIVER_VERSION_NUM      0x01030400
+#define VMXNET3_DRIVER_VERSION_NUM      0x01030500
 
 #if defined(CONFIG_PCI_MSI)
 	/* RSS only makes sense if MSI-X is supported. */
@@ -211,6 +211,7 @@ struct vmxnet3_tq_driver_stats {
 
 struct vmxnet3_tx_ctx {
 	bool   ipv4;
+	bool   ipv6;
 	u16 mss;
 	u32 eth_ip_hdr_size; /* only valid for pkts requesting tso or csum
 				 * offloading
Signature · 1 line
1.8.5.6
#1 lore raw

Hello.

Quoted 14 lines · Shrikrishna Khare

Allows for packet parsing to be done by the fast path. This performance optimization already exists for IPv4. Add similar logic for IPv6.

---
  drivers/net/vmxnet3/vmxnet3_drv.c | 26 ++++++++++++++++----------
  drivers/net/vmxnet3/vmxnet3_int.h |  5 +++--
  2 files changed, 19 insertions(+), 12 deletions(-)
drivers/net/vmxnet3/vmxnet3_drv.c +0 -0
index 294214c..9216e6a 100644

[...]

Quoted 17 lines
drivers/net/vmxnet3/vmxnet3_drv.c +4 -9
@@ -831,16 +832,20 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
  			if (ctx->ipv4) {
  				const struct iphdr *iph = ip_hdr(skb);
 
-				if (iph->protocol == IPPROTO_TCP)
-					ctx->l4_hdr_size = tcp_hdrlen(skb);
-				else if (iph->protocol == IPPROTO_UDP)
-					ctx->l4_hdr_size = sizeof(struct udphdr);
-				else
-					ctx->l4_hdr_size = 0;
-			} else {
-				/* for simplicity, don't copy L4 headers */
-				ctx->l4_hdr_size = 0;
+				protocol = iph->protocol;
+			} else if (ctx->ipv6) {
+				const struct ipv6hdr *ipv6h = ipv6_hdr(skb);
+

drivers/net/vmxnet3/vmxnet3_drv.c vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq, · line 848

Quoted 10 lines
drivers/net/vmxnet3/vmxnet3_drv.c +9 -0
+				protocol = ipv6h->nexthdr;
  			}
+
+			if (protocol == IPPROTO_TCP)
+				ctx->l4_hdr_size = tcp_hdrlen(skb);
+			else if (protocol == IPPROTO_UDP)
+				ctx->l4_hdr_size = sizeof(struct udphdr);
+			else
+				ctx->l4_hdr_size = 0;
+

I think the above is asking to be a 'switch (protocol)' instead.

WBR, Sergei

#2 lore raw
Quoted 52 lines · Sergei Shtylyov

Hello.

Quoted 15 lines · Shrikrishna Khare

Allows for packet parsing to be done by the fast path. This performance optimization already exists for IPv4. Add similar logic for IPv6.

---
  drivers/net/vmxnet3/vmxnet3_drv.c | 26 ++++++++++++++++----------
  drivers/net/vmxnet3/vmxnet3_int.h |  5 +++--
  2 files changed, 19 insertions(+), 12 deletions(-)
drivers/net/vmxnet3/vmxnet3_drv.c +0 -0
index 294214c..9216e6a 100644

[...]

Quoted 19 lines
drivers/net/vmxnet3/vmxnet3_drv.c +4 -9
@@ -831,16 +832,20 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct
 vmxnet3_tx_queue *tq,
  			if (ctx->ipv4) {
  				const struct iphdr *iph = ip_hdr(skb);
 
-				if (iph->protocol == IPPROTO_TCP)
-					ctx->l4_hdr_size = tcp_hdrlen(skb);
-				else if (iph->protocol == IPPROTO_UDP)
-					ctx->l4_hdr_size = sizeof(struct
 udphdr);
-				else
-					ctx->l4_hdr_size = 0;
-			} else {
-				/* for simplicity, don't copy L4 headers */
-				ctx->l4_hdr_size = 0;
+				protocol = iph->protocol;
+			} else if (ctx->ipv6) {
+				const struct ipv6hdr *ipv6h = ipv6_hdr(skb);
+

drivers/net/vmxnet3/vmxnet3_drv.c vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct · line 850

Quoted 10 lines
drivers/net/vmxnet3/vmxnet3_drv.c +9 -0
+				protocol = ipv6h->nexthdr;
  			}
+
+			if (protocol == IPPROTO_TCP)
+				ctx->l4_hdr_size = tcp_hdrlen(skb);
+			else if (protocol == IPPROTO_UDP)
+				ctx->l4_hdr_size = sizeof(struct udphdr);
+			else
+				ctx->l4_hdr_size = 0;
+

I think the above is asking to be a 'switch (protocol)' instead.

Quoted 3 lines

WBR, Sergei

Thanks for the review, Sergei. Would fix it, and resubmit the patch.

Thanks,
Shri