[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <565F1A6E.5010305@gmail.com>
Date: Wed, 2 Dec 2015 08:21:02 -0800
From: Alexander Duyck <alexander.duyck@...il.com>
To: Jeff Kirsher <jeffrey.t.kirsher@...el.com>, davem@...emloft.net
Cc: Mark Rustad <mark.d.rustad@...el.com>, netdev@...r.kernel.org,
nhorman@...hat.com, sassmann@...hat.com, jogreene@...hat.com
Subject: Re: [net-next 13/15] ixgbe: Handle extended IPv6 headers in tx path
On 12/02/2015 04:31 AM, Jeff Kirsher wrote:
> From: Mark Rustad <mark.d.rustad@...el.com>
>
> Check for and handle IPv6 extended headers so that Tx checksum
> offload can be done. Thanks to Tom Herbert for noticing this
> problem. Note that the goto back to process the final protocol
> value can never result in a loop, because it cannot be yet
> another extended header. Handling them in this manner avoids
> adding further checks to the non-extended header hot path.
>
> Reported-by: Tom Herbert <tom@...bertland.com>
> Signed-off-by: Mark Rustad <mark.d.rustad@...el.com>
> Tested-by: Phil Schmitt <phillip.j.schmitt@...el.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
> ---
> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 19 ++++++++++++++++++-
> 1 file changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> index a10a0fa..b7f1133 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> @@ -7095,6 +7095,7 @@ static void ixgbe_tx_csum(struct ixgbe_ring *tx_ring,
> }
> }
>
> +again:
> switch (l4_hdr) {
> case IPPROTO_TCP:
> type_tucmd |= IXGBE_ADVTXD_TUCMD_L4T_TCP;
> @@ -7111,7 +7112,23 @@ static void ixgbe_tx_csum(struct ixgbe_ring *tx_ring,
> IXGBE_ADVTXD_L4LEN_SHIFT;
> break;
> default:
> - if (unlikely(net_ratelimit())) {
> + if (network_hdr.ipv4->version == 6 &&
> + ipv6_ext_hdr(l4_hdr)) {
> + unsigned int offset = 0;
> + int ret;
> +
> + ret = ipv6_find_hdr(skb, &offset, -1, NULL,
> + NULL);
> + if (ret > 0) {
> + l4_hdr = ret;
> + goto again;
> + }
> + if (unlikely(net_ratelimit())) {
> + dev_warn(tx_ring->dev,
> + "ipv6_find_hdr returned %d\n",
> + ret);
> + }
> + } else if (unlikely(net_ratelimit())) {
> dev_warn(tx_ring->dev,
> "partial checksum but l4 proto=%x!\n",
> l4_hdr);
>
This doesn't look right. How come this doesn't match the implementation
you did for the ixgbevf driver? If I am not mistaken this approach had
issues where it could spin forever didn't it?
- Alex
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists