From: Eric Dumazet <eric.dumazet-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Ming Lei <ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
Cc: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>,
Greg Kroah-Hartman
<gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>,
Oliver Neukum <oneukum-l3A5Bk7waGM@public.gmane.org>,
Freddy Xin <freddy-knRN6Y/kmf1NUHwG+Fw1Kw@public.gmane.org>,
Ben Hutchings
<bhutchings-s/n/eUQHGBpZroRs9YW3xA@public.gmane.org>,
Grant Grundler <grundler-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH net-next] ax88179_178a: avoid copy of tx tcp packets
Date: Thu, 01 Aug 2013 06:49:52 -0700 [thread overview]
Message-ID: <1375364992.10515.141.camel@edumazet-glaptop> (raw)
In-Reply-To: <1375363300.10515.135.camel@edumazet-glaptop>
From: Eric Dumazet <edumazet-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
ax88179_tx_fixup() has quite complex code trying to push 8 bytes
of control data (len/mss), but fails to do it properly for TCP packets,
incurring an extra copy and point of memory allocation failure.
Lets use the simple and approved way.
dev->needed_headroom being 8, all frames should have 8 bytes of
headroom, so the extra copy should be unlikely anyway.
This patch should improve performance for TCP xmits.
Reported-by: Ming Lei <ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
Tested-by: Ming Lei <ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
Signed-off-by: Eric Dumazet <edumazet-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
---
drivers/net/usb/ax88179_178a.c | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
index 2bc87e3..e2120d6 100644
--- a/drivers/net/usb/ax88179_178a.c
+++ b/drivers/net/usb/ax88179_178a.c
@@ -1166,31 +1166,18 @@ ax88179_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
int frame_size = dev->maxpacket;
int mss = skb_shinfo(skb)->gso_size;
int headroom;
- int tailroom;
tx_hdr1 = skb->len;
tx_hdr2 = mss;
if (((skb->len + 8) % frame_size) == 0)
tx_hdr2 |= 0x80008000; /* Enable padding */
- headroom = skb_headroom(skb);
- tailroom = skb_tailroom(skb);
+ headroom = skb_headroom(skb) - 8;
- if (!skb_header_cloned(skb) &&
- !skb_cloned(skb) &&
- (headroom + tailroom) >= 8) {
- if (headroom < 8) {
- skb->data = memmove(skb->head + 8, skb->data, skb->len);
- skb_set_tail_pointer(skb, skb->len);
- }
- } else {
- struct sk_buff *skb2;
next prev parent reply other threads:[~2013-08-01 13:49 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-31 10:51 [PATCH 0/4] USB & USBNET: loose DMA SG check and support usbnet DMA SG Ming Lei
2013-07-31 10:51 ` [PATCH 1/4] USB: introduce no_sg_limit field into usb_bus Ming Lei
2013-07-31 10:51 ` [PATCH 3/4] USBNET: support DMA SG Ming Lei
2013-07-31 10:51 ` [PATCH 4/4] USBNET: ax88179_178a: enable tso if host supports sg dma Ming Lei
2013-07-31 12:47 ` Greg Kroah-Hartman
2013-07-31 13:50 ` Ming Lei
2013-07-31 14:02 ` Oliver Neukum
[not found] ` <1375279366.14846.1.camel-B2T3B9s34ElbnMAlSieJcQ@public.gmane.org>
2013-07-31 15:15 ` Eric Dumazet
2013-07-31 15:25 ` Ming Lei
2013-08-01 2:04 ` Ming Lei
[not found] ` <1375267909-30373-5-git-send-email-ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
2013-08-01 3:51 ` Eric Dumazet
2013-08-01 4:41 ` Ming Lei
2013-08-01 5:04 ` Eric Dumazet
2013-08-01 8:10 ` Ming Lei
[not found] ` <CACVXFVMt-TgRVU+iA3NVuUzJSeXUPGvV89OnDdHaLEB1Ua6aAw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-08-01 13:21 ` Eric Dumazet
2013-08-01 13:49 ` Eric Dumazet [this message]
2013-08-01 13:52 ` [PATCH net-next] ax88179_178a: avoid copy of tx tcp packets Eric Dumazet
2013-08-04 4:56 ` David Miller
2013-08-01 15:30 ` [PATCH 4/4] USBNET: ax88179_178a: enable tso if host supports sg dma Grant Grundler
2013-08-01 15:36 ` Eric Dumazet
2013-08-01 16:12 ` Grant Grundler
2013-07-31 11:12 ` [PATCH 0/4] USB & USBNET: loose DMA SG check and support usbnet DMA SG Oliver Neukum
2013-07-31 11:55 ` Ming Lei
[not found] ` <1375267909-30373-1-git-send-email-ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
2013-07-31 10:51 ` [PATCH 2/4] USB: XHCI: mark no_sg_limit Ming Lei
2013-07-31 16:40 ` Sarah Sharp
2013-08-01 7:30 ` Greg Kroah-Hartman
2013-08-01 8:15 ` Oliver Neukum
2013-08-01 20:47 ` Sarah Sharp
2013-07-31 15:25 ` [PATCH 0/4] USB & USBNET: loose DMA SG check and support usbnet DMA SG Eric Dumazet
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=1375364992.10515.141.camel@edumazet-glaptop \
--to=eric.dumazet-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=bhutchings-s/n/eUQHGBpZroRs9YW3xA@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=freddy-knRN6Y/kmf1NUHwG+Fw1Kw@public.gmane.org \
--cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
--cc=grundler-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
--cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=oneukum-l3A5Bk7waGM@public.gmane.org \
/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