Skip to contentSkip to conversation

Patch "ibmveth: calculate gso_segs for large packets" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Apr 19, 2017

Subsystems (4)
Network drivers Stable branch PowerPC IBM Power Virtual Ethernet Device Driver
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ibmveth: calculate gso_segs for large packets

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ibmveth-calculate-gso_segs-for-large-packets.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 94acf164dc8f1184e8d0737be7125134c2701dbe Mon Sep 17 00:00:00 2001

From: Thomas Falcon <[email protected]>
Date: Tue, 13 Dec 2016 18:15:09 -0600
Subject: ibmveth: calculate gso_segs for large packets

From: Thomas Falcon <[email protected]>

commit 94acf164dc8f1184e8d0737be7125134c2701dbe upstream.

Include calculations to compute the number of segments that comprise an aggregated large packet.

Signed-off-by Thomas Falcon <[email protected]>
Reviewed-by Marcelo Ricardo Leitner <[email protected]>
Reviewed-by Jonathan Maxwell <[email protected]>
Signed-off-by David S. Miller <[email protected]>
Signed-off-by Sumit Semwal <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/net/ethernet/ibm/ibmveth.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/net/ethernet/ibm/ibmveth.c +10 -2
@@ -1179,7 +1179,9 @@ map_failed:
 
 static void ibmveth_rx_mss_helper(struct sk_buff *skb, u16 mss, int lrg_pkt)
 {
+	struct tcphdr *tcph;
 	int offset = 0;
+	int hdr_len;
 
 	/* only TCP packets will be aggregated */
 	if (skb->protocol == htons(ETH_P_IP)) {

@@ -1206,14 +1208,20 @@ static void ibmveth_rx_mss_helper(struct
 	/* if mss is not set through Large Packet bit/mss in rx buffer,
 	 * expect that the mss will be written to the tcp header checksum.
 	 */
+	tcph = (struct tcphdr *)(skb->data + offset);
 	if (lrg_pkt) {
 		skb_shinfo(skb)->gso_size = mss;
 	} else if (offset) {
-		struct tcphdr *tcph = (struct tcphdr *)(skb->data + offset);
-
 		skb_shinfo(skb)->gso_size = ntohs(tcph->check);
 		tcph->check = 0;
 	}
+
+	if (skb_shinfo(skb)->gso_size) {
+		hdr_len = offset + tcph->doff * 4;
+		skb_shinfo(skb)->gso_segs =
+				DIV_ROUND_UP(skb->len - hdr_len,
+					     skb_shinfo(skb)->gso_size);
+	}
 }
 
 static int ibmveth_poll(struct napi_struct *napi, int budget)

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/ibmveth-calculate-gso_segs-for-large-packets.patch