netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Julian Wiedmann <jwi@linux.ibm.com>
To: David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
	linux-s390 <linux-s390@vger.kernel.org>,
	Heiko Carstens <heiko.carstens@de.ibm.com>,
	Ursula Braun <ubraun@linux.ibm.com>,
	Julian Wiedmann <jwi@linux.ibm.com>
Subject: [PATCH net-next 07/11] s390/qeth: indicate contiguous TX buffer elements
Date: Tue,  5 May 2020 18:25:55 +0200	[thread overview]
Message-ID: <20200505162559.14138-8-jwi@linux.ibm.com> (raw)
In-Reply-To: <20200505162559.14138-1-jwi@linux.ibm.com>

The TX path usually maps the full content of a page into a buffer
element. But there's specific skb layouts (ie. linearized TSO skbs)
where the HW header (1) requires a separate buffer element, and (2) is
page-contiguous with the packet data that's mapped into the next buffer
element.
Flag such buffer elements accordingly, so that HW can optimize its data
access for them.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
---
 drivers/s390/net/qeth_core_main.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 9c9a6edb5384..4d1d053eebb7 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -4110,8 +4110,16 @@ static unsigned int qeth_fill_buffer(struct qeth_qdio_out_buffer *buf,
 		buffer->element[element].addr = virt_to_phys(hdr);
 		buffer->element[element].length = hd_len;
 		buffer->element[element].eflags = SBAL_EFLAGS_FIRST_FRAG;
-		/* remember to free cache-allocated HW header: */
-		buf->is_header[element] = ((void *)hdr != skb->data);
+
+		/* HW header is allocated from cache: */
+		if ((void *)hdr != skb->data)
+			buf->is_header[element] = 1;
+		/* HW header was pushed and is contiguous with linear part: */
+		else if (length > 0 && !PAGE_ALIGNED(data) &&
+			 (data == (char *)hdr + hd_len))
+			buffer->element[element].eflags |=
+				SBAL_EFLAGS_CONTIGUOUS;
+
 		element++;
 	}
 
-- 
2.17.1


  parent reply	other threads:[~2020-05-05 16:26 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-05 16:25 [PATCH net-next 00/11] s390/qeth: updates 2020-05-05 Julian Wiedmann
2020-05-05 16:25 ` [PATCH net-next 01/11] s390/qeth: keep track of LP2LP capability for csum offload Julian Wiedmann
2020-05-05 16:25 ` [PATCH net-next 02/11] s390/qeth: process local address events Julian Wiedmann
2020-05-05 16:25 ` [PATCH net-next 03/11] s390/qeth: add debugfs file for local IP addresses Julian Wiedmann
2020-05-05 16:25 ` [PATCH net-next 04/11] s390/qeth: extract helpers for next-hop lookup Julian Wiedmann
2020-05-05 16:25 ` [PATCH net-next 05/11] s390/qeth: don't use restricted offloads for local traffic Julian Wiedmann
2020-05-05 16:25 ` [PATCH net-next 06/11] s390/qeth: merge TX skb mapping code Julian Wiedmann
2020-05-05 16:25 ` Julian Wiedmann [this message]
2020-05-05 16:25 ` [PATCH net-next 08/11] s390/qeth: set TX IRQ marker on last buffer in a group Julian Wiedmann
2020-05-05 16:25 ` [PATCH net-next 09/11] s390/qeth: return error when starting a reset fails Julian Wiedmann
2020-05-05 16:25 ` [PATCH net-next 10/11] s390/qeth: allow reset via ethtool Julian Wiedmann
2020-05-05 17:21   ` Jakub Kicinski
2020-05-05 18:23     ` Julian Wiedmann
2020-05-05 18:29       ` Jakub Kicinski
2020-05-05 19:57         ` Julian Wiedmann
2020-05-05 20:09           ` Edwin Peer
2020-05-05 21:28           ` Jakub Kicinski
2020-05-06  7:56             ` Julian Wiedmann
2020-05-06 19:09               ` Jakub Kicinski
2020-05-05 16:25 ` [PATCH net-next 11/11] s390/qeth: clean up Kconfig help text Julian Wiedmann

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=20200505162559.14138-8-jwi@linux.ibm.com \
    --to=jwi@linux.ibm.com \
    --cc=davem@davemloft.net \
    --cc=heiko.carstens@de.ibm.com \
    --cc=linux-s390@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=ubraun@linux.ibm.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).