netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Wilder <dwilder@us.ibm.com>
To: netdev@vger.kernel.org
Cc: tlfalcon@linux.ibm.com, cris.forno@ibm.com,
	pradeeps@linux.vnet.ibm.com, wilder@us.ibm.com,
	willemdebruijn.kernel@gmail.com, kuba@kernel.org
Subject: [ PATCH v2 2/2] ibmveth: Identify ingress large send packets.
Date: Tue, 13 Oct 2020 16:20:14 -0700	[thread overview]
Message-ID: <20201013232014.26044-3-dwilder@us.ibm.com> (raw)
In-Reply-To: <20201013232014.26044-1-dwilder@us.ibm.com>

Ingress large send packets are identified by either:
The IBMVETH_RXQ_LRG_PKT flag in the receive buffer
or with a -1 placed in the ip header checksum.
The method used depends on firmware version. Frame
geometry and sufficient header validation is performed by the
hypervisor eliminating the need for further header checks here.

Fixes: 7b5967389f5a ("ibmveth: set correct gso_size and gso_type")
Signed-off-by: David Wilder <dwilder@us.ibm.com>
Reviewed-by: Thomas Falcon <tlfalcon@linux.ibm.com>
Reviewed-by: Cristobal Forno <cris.forno@ibm.com>
Reviewed-by: Pradeep Satyanarayana <pradeeps@linux.vnet.ibm.com>
---
 drivers/net/ethernet/ibm/ibmveth.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index 3935a7e22ce5..7ef3369953b6 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1349,6 +1349,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
 			int offset = ibmveth_rxq_frame_offset(adapter);
 			int csum_good = ibmveth_rxq_csum_good(adapter);
 			int lrg_pkt = ibmveth_rxq_large_packet(adapter);
+			__sum16 iph_check = 0;
 
 			skb = ibmveth_rxq_get_buffer(adapter);
 
@@ -1385,7 +1386,17 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
 			skb_put(skb, length);
 			skb->protocol = eth_type_trans(skb, netdev);
 
-			if (length > netdev->mtu + ETH_HLEN) {
+			/* PHYP without PLSO support places a -1 in the ip
+			 * checksum for large send frames.
+			 */
+			if (skb->protocol == cpu_to_be16(ETH_P_IP)) {
+				struct iphdr *iph = (struct iphdr *)skb->data;
+
+				iph_check = iph->check;
+			}
+
+			if ((length > netdev->mtu + ETH_HLEN) ||
+			    lrg_pkt || iph_check == 0xffff) {
 				ibmveth_rx_mss_helper(skb, mss, lrg_pkt);
 				adapter->rx_large_packets++;
 			}
-- 
1.8.3.1


  parent reply	other threads:[~2020-10-13 23:21 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-13 23:20 [ PATCH v2 0/2] ibmveth gso fix David Wilder
2020-10-13 23:20 ` [ PATCH v2 1/2] ibmveth: Switch order of ibmveth_helper calls David Wilder
2020-10-14 16:22   ` Willem de Bruijn
2020-10-15  3:23   ` Jakub Kicinski
2020-10-13 23:20 ` David Wilder [this message]
2020-10-14 16:23   ` [ PATCH v2 2/2] ibmveth: Identify ingress large send packets Willem de Bruijn
2020-10-15  3:23 ` [ PATCH v2 0/2] ibmveth gso fix Jakub Kicinski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201013232014.26044-3-dwilder@us.ibm.com \
    --to=dwilder@us.ibm.com \
    --cc=cris.forno@ibm.com \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pradeeps@linux.vnet.ibm.com \
    --cc=tlfalcon@linux.ibm.com \
    --cc=wilder@us.ibm.com \
    --cc=willemdebruijn.kernel@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).