From: Florian Fainelli <f.fainelli@gmail.com>
To: Christian Lamparter <chunkeey@gmail.com>, netdev@vger.kernel.org
Cc: "David S . Miller" <davem@davemloft.net>
Subject: Re: [PATCH 2/2] net: emac: implement TCP TSO
Date: Wed, 17 Oct 2018 13:09:44 -0700 [thread overview]
Message-ID: <c8a28bf3-b4a9-c07c-ae8d-aa9d56c443a3@gmail.com> (raw)
In-Reply-To: <222fc61f88a39393b8830d9bfcc7b88d24fb81d6.1539804852.git.chunkeey@gmail.com>
On 10/17/2018 12:53 PM, Christian Lamparter wrote:
> This patch enables TSO(v4) hw feature for emac driver.
> As atleast the APM82181's TCP/IP acceleration hardware
> controller (TAH) provides TCP segmentation support in
> the transmit path.
>
> Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
> ---
> drivers/net/ethernet/ibm/emac/core.c | 101 ++++++++++++++++++++++++++-
> drivers/net/ethernet/ibm/emac/core.h | 4 ++
> drivers/net/ethernet/ibm/emac/emac.h | 7 ++
> drivers/net/ethernet/ibm/emac/tah.c | 20 ++++++
> drivers/net/ethernet/ibm/emac/tah.h | 2 +
> 5 files changed, 133 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
> index be560f9031f4..49ffbd6e1707 100644
> --- a/drivers/net/ethernet/ibm/emac/core.c
> +++ b/drivers/net/ethernet/ibm/emac/core.c
> @@ -38,6 +38,9 @@
> #include <linux/mii.h>
> #include <linux/bitops.h>
> #include <linux/if_vlan.h>
> +#include <linux/ip.h>
> +#include <linux/ipv6.h>
> +#include <linux/tcp.h>
> #include <linux/workqueue.h>
> #include <linux/of.h>
> #include <linux/of_address.h>
> @@ -1410,6 +1413,52 @@ static inline u16 emac_tx_csum(struct emac_instance *dev,
> return 0;
> }
>
> +const u32 tah_ss[TAH_NO_SSR] = { 9000, 4500, 1500, 1300, 576, 176 };
> +
> +static int emac_tx_tso(struct emac_instance *dev, struct sk_buff *skb,
> + u16 *ctrl)
> +{
> + if (emac_has_feature(dev, EMAC_FTR_TAH_HAS_TSO) &&
> + skb_is_gso(skb) && !!(skb_shinfo(skb)->gso_type &
> + (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))) {
> + u32 seg_size = 0, i;
> +
> + /* Get the MTU */
> + seg_size = skb_shinfo(skb)->gso_size + tcp_hdrlen(skb)
> + + skb_network_header_len(skb);
> +
> + /* Restriction applied for the segmentation size
> + * to use HW segmentation offload feature: the size
> + * of the segment must not be less than 168 bytes for
> + * DIX formatted segments, or 176 bytes for
> + * IEEE formatted segments.
> + *
> + * I use value 176 to check for the segment size here
> + * as it can cover both 2 conditions above.
> + */
> + if (seg_size < 176)
> + return -ENODEV;
> +
> + /* Get the best suitable MTU */
> + for (i = 0; i < ARRAY_SIZE(tah_ss); i++) {
> + u32 curr_seg = tah_ss[i];
> +
> + if (curr_seg > dev->ndev->mtu ||
> + curr_seg > seg_size)
> + continue;
> +
> + *ctrl &= ~EMAC_TX_CTRL_TAH_CSUM;
> + *ctrl |= EMAC_TX_CTRL_TAH_SSR(i);
> + return 0;
This is something that you can possibly take out of your hot path and
recalculate when the MTU actually changes?
[snip]
> +static netdev_tx_t emac_sw_tso(struct sk_buff *skb, struct net_device *ndev)
> +{
> + struct emac_instance *dev = netdev_priv(ndev);
> + struct sk_buff *segs, *curr;
> +
> + segs = skb_gso_segment(skb, ndev->features &
> + ~(NETIF_F_TSO | NETIF_F_TSO6));
> + if (IS_ERR_OR_NULL(segs)) {
> + goto drop;
> + } else {
> + while (segs) {
> + /* check for overflow */
> + if (dev->tx_cnt >= NUM_TX_BUFF) {
> + dev_kfree_skb_any(segs);
> + goto drop;
> + }
Would setting dev->max_gso_segs somehow help make sure the stack does
not feed you oversized GSO'd skbs?
--
Florian
next prev parent reply other threads:[~2018-10-18 4:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-17 19:53 [PATCH 1/2] net: emac: implement 802.1Q VLAN TX tagging support Christian Lamparter
2018-10-17 19:53 ` [PATCH 2/2] net: emac: implement TCP TSO Christian Lamparter
2018-10-17 20:09 ` Florian Fainelli [this message]
2018-10-19 15:39 ` Christian Lamparter
2018-10-17 20:08 ` [PATCH 1/2] net: emac: implement 802.1Q VLAN TX tagging support Florian Fainelli
2018-10-17 20:09 ` Florian Fainelli
2018-10-19 15:56 ` Christian Lamparter
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=c8a28bf3-b4a9-c07c-ae8d-aa9d56c443a3@gmail.com \
--to=f.fainelli@gmail.com \
--cc=chunkeey@gmail.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).