From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id CF9ABA2F67
for <public@inbox.dpdk.org>; Fri, 4 Oct 2019 10:32:29 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id E231B1C1D4;
Fri, 4 Oct 2019 10:32:28 +0200 (CEST)
Received: from mail-io1-f67.google.com (mail-io1-f67.google.com
[209.85.166.67]) by dpdk.org (Postfix) with ESMTP id 551681C1D0
for <dev@dpdk.org>; Fri, 4 Oct 2019 10:32:27 +0200 (CEST)
Received: by mail-io1-f67.google.com with SMTP id n26so11719093ioj.8
for <dev@dpdk.org>; Fri, 04 Oct 2019 01:32:27 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=mime-version:references:in-reply-to:from:date:message-id:subject:to
:cc; bh=bYPMrYkmIEv1NUykJqE3lwb1sQt/CA2bxgYGRJpvvE4=;
b=TGiq03VQ9rM0bz7TC7iZzb6ugxMg59Bg9wSvG4WwBiySCQoXZBORULzOD2UwfopYw2
Q7e4HzjLTlCSHlqyTx+l6siW6m4oB2VblawpgG+KlvALUwhw5x0EqrBXVdA1arXfe9JD
xrwnI8TOBAW2PDHULKwfrdeKT0ZYSDNasktZe4gBGxOmqoLfzbnZZsKwx3clklR9Rx0T
VVqA5ND0HpibNxzg6LFpJV8rcgMuujrijrWSoKQFNPb5E6A+BjUUU82/0Plvd7c8qAea
g4idbYG5BUxd94A9dzjKsPIykfnZqJXovGQI8NqItHdYTcytK8hA+REqiH0IOetMefCN
ACDA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:references:in-reply-to:from:date
:message-id:subject:to:cc;
bh=bYPMrYkmIEv1NUykJqE3lwb1sQt/CA2bxgYGRJpvvE4=;
b=BvJ3WmBdjXV8OdOxdpvE7DUswfD2su0/bsqKT/VttXWY+A08zh0oPnaBOvtPUNvPyy
jMMc7HbX/ldSWsM7J9ioIfCp8OqRWitDwZ6N7EYKRGFLzzwOeuVUI+w7pQQMSbj2HXZv
OPJ0YnL/dcgnbFWOUciwRkbOmvFVvjLHY1XABIyyXe+RLRA5Jl10CfNoIsoPRZPaOt5e
fcdxBQrTYZJohWdkaluiTVkD1Ij0RNdkU2Ddm+ygGHP0sOq01Zr0RSzbku7iPOnurc35
4pFFatbTIqDtgGTNey6CVtt9+0xr4FTctyxvqJxfxYk4oDw9miYlLHSHIxHWyBgP7KF3
Dsew==
X-Gm-Message-State: APjAAAVlyt97BpqFK9KJEbslOa1HWFm6zue/XUGbvb3dDTHySb06+aIP
8q35vV6u3NDjxLxelpsoeuSm4yverrfzk575pdw=
X-Google-Smtp-Source: APXvYqz8+eQtG3cIiYtOECR9BDbpiuTBt7mqfYEdvuvvX8tpMCkovfBVNPBvUdIV1Q/xoiq7zlO4pWeikQhKkDiLf1A=
X-Received: by 2002:a92:8702:: with SMTP id m2mr15071518ild.294.1570177946354;
Fri, 04 Oct 2019 01:32:26 -0700 (PDT)
MIME-Version: 1.0
References: <20190925045408.131578-1-ndabilpuram@marvell.com>
In-Reply-To: <20190925045408.131578-1-ndabilpuram@marvell.com>
From: Jerin Jacob <jerinjacobk@gmail.com>
Date: Fri, 4 Oct 2019 14:02:15 +0530
Message-ID: <CALBAE1NQ90VrXpg8B2wpUG_Q3tNpYTcBdw11Gf4=cRVjEcpYSg@mail.gmail.com>
To: Nithin Dabilpuram <ndabilpuram@marvell.com>,
Ferruh Yigit <ferruh.yigit@intel.com>
Cc: Jerin Jacob <jerinj@marvell.com>, Kiran Kumar K <kirankumark@marvell.com>,
dpdk-dev <dev@dpdk.org>
Content-Type: text/plain; charset="UTF-8"
Subject: Re: [dpdk-dev] [PATCH] net/octeontx2: add GRE TSO offload support
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
On Wed, Sep 25, 2019 at 10:26 AM Nithin Dabilpuram
<ndabilpuram@marvell.com> wrote:
>
> Extends existing TSO support to GRE tunnel on the
> same SoC revisions.
>
> Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
Applied to dpdk-next-net-mrvl/master. Thanks
> ---
> Note: This patchset depends on "net/octeontx2: add TSO offload support"
> i.e "http://patches.dpdk.org/patch/59691/"
>
> drivers/net/octeontx2/otx2_ethdev.c | 111 +++++++++++++++++++++++++++++++++++-
> drivers/net/octeontx2/otx2_ethdev.h | 1 +
> drivers/net/octeontx2/otx2_tx.h | 2 +-
> 3 files changed, 111 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c
> index c447f83..428351d 100644
> --- a/drivers/net/octeontx2/otx2_ethdev.c
> +++ b/drivers/net/octeontx2/otx2_ethdev.c
> @@ -33,7 +33,8 @@ nix_get_tx_offload_capa(struct otx2_eth_dev *dev)
> if (otx2_dev_is_96xx_A0(dev) || otx2_dev_is_95xx_Ax(dev))
> capa &= ~(DEV_TX_OFFLOAD_TCP_TSO |
> DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
> - DEV_TX_OFFLOAD_GENEVE_TNL_TSO);
> + DEV_TX_OFFLOAD_GENEVE_TNL_TSO |
> + DEV_TX_OFFLOAD_GRE_TNL_TSO);
> return capa;
> }
>
> @@ -655,7 +656,8 @@ nix_tx_offload_flags(struct rte_eth_dev *eth_dev)
>
> /* Enable Inner and Outer checksum for Tunnel TSO */
> if (conf & (DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
> - DEV_TX_OFFLOAD_GENEVE_TNL_TSO))
> + DEV_TX_OFFLOAD_GENEVE_TNL_TSO |
> + DEV_TX_OFFLOAD_GRE_TNL_TSO))
> flags |= (NIX_TX_OFFLOAD_TSO_F |
> NIX_TX_OFFLOAD_OL3_OL4_CSUM_F |
> NIX_TX_OFFLOAD_L3_L4_CSUM_F);
> @@ -1322,6 +1324,61 @@ nix_lso_udp_tun_tcp(struct nix_lso_format_cfg *req,
> field++;
> }
>
> +static void
> +nix_lso_tun_tcp(struct nix_lso_format_cfg *req,
> + bool outer_v4, bool inner_v4)
> +{
> + volatile struct nix_lso_format *field;
> +
> + field = (volatile struct nix_lso_format *)&req->fields[0];
> + req->field_mask = NIX_LSO_FIELD_MASK;
> + /* Outer IPv4/IPv6 len */
> + field->layer = NIX_TXLAYER_OL3;
> + field->offset = outer_v4 ? 2 : 4;
> + field->sizem1 = 1; /* 2B */
> + field->alg = NIX_LSOALG_ADD_PAYLEN;
> + field++;
> + if (outer_v4) {
> + /* IPID */
> + field->layer = NIX_TXLAYER_OL3;
> + field->offset = 4;
> + field->sizem1 = 1;
> + /* Incremented linearly per segment */
> + field->alg = NIX_LSOALG_ADD_SEGNUM;
> + field++;
> + }
> +
> + /* Inner IPv4/IPv6 */
> + field->layer = NIX_TXLAYER_IL3;
> + field->offset = inner_v4 ? 2 : 4;
> + field->sizem1 = 1; /* 2B */
> + field->alg = NIX_LSOALG_ADD_PAYLEN;
> + field++;
> + if (inner_v4) {
> + /* IPID field */
> + field->layer = NIX_TXLAYER_IL3;
> + field->offset = 4;
> + field->sizem1 = 1;
> + /* Incremented linearly per segment */
> + field->alg = NIX_LSOALG_ADD_SEGNUM;
> + field++;
> + }
> +
> + /* TCP sequence number update */
> + field->layer = NIX_TXLAYER_IL4;
> + field->offset = 4;
> + field->sizem1 = 3; /* 4 bytes */
> + field->alg = NIX_LSOALG_ADD_OFFSET;
> + field++;
> +
> + /* TCP flags field */
> + field->layer = NIX_TXLAYER_IL4;
> + field->offset = 12;
> + field->sizem1 = 1;
> + field->alg = NIX_LSOALG_TCP_FLAGS;
> + field++;
> +}
> +
> static int
> nix_setup_lso_formats(struct otx2_eth_dev *dev)
> {
> @@ -1414,6 +1471,56 @@ nix_setup_lso_formats(struct otx2_eth_dev *dev)
> return -EFAULT;
> otx2_nix_dbg("udp tun v6v6 fmt=%u\n", base + 5);
>
> + /*
> + * IPv4/TUN HDR/IPv4/TCP LSO
> + */
> + req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
> + nix_lso_tun_tcp(req, true, true);
> + rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
> + if (rc)
> + return rc;
> +
> + if (rsp->lso_format_idx != base + 6)
> + return -EFAULT;
> + otx2_nix_dbg("tun v4v4 fmt=%u\n", base + 6);
> +
> + /*
> + * IPv4/TUN HDR/IPv6/TCP LSO
> + */
> + req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
> + nix_lso_tun_tcp(req, true, false);
> + rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
> + if (rc)
> + return rc;
> +
> + if (rsp->lso_format_idx != base + 7)
> + return -EFAULT;
> + otx2_nix_dbg("tun v4v6 fmt=%u\n", base + 7);
> +
> + /*
> + * IPv6/TUN HDR/IPv4/TCP LSO
> + */
> + req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
> + nix_lso_tun_tcp(req, false, true);
> + rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
> + if (rc)
> + return rc;
> +
> + if (rsp->lso_format_idx != base + 8)
> + return -EFAULT;
> + otx2_nix_dbg("tun v6v4 fmt=%u\n", base + 8);
> +
> + /*
> + * IPv6/TUN HDR/IPv6/TCP LSO
> + */
> + req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
> + nix_lso_tun_tcp(req, false, false);
> + rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
> + if (rc)
> + return rc;
> + if (rsp->lso_format_idx != base + 9)
> + return -EFAULT;
> + otx2_nix_dbg("tun v6v6 fmt=%u\n", base + 9);
> return 0;
> }
>
> diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h
> index 38f341e..0150baa 100644
> --- a/drivers/net/octeontx2/otx2_ethdev.h
> +++ b/drivers/net/octeontx2/otx2_ethdev.h
> @@ -130,6 +130,7 @@
> DEV_TX_OFFLOAD_TCP_TSO | \
> DEV_TX_OFFLOAD_VXLAN_TNL_TSO | \
> DEV_TX_OFFLOAD_GENEVE_TNL_TSO | \
> + DEV_TX_OFFLOAD_GRE_TNL_TSO | \
> DEV_TX_OFFLOAD_MULTI_SEGS | \
> DEV_TX_OFFLOAD_IPV4_CKSUM)
>
> diff --git a/drivers/net/octeontx2/otx2_tx.h b/drivers/net/octeontx2/otx2_tx.h
> index e919198..04e859b 100644
> --- a/drivers/net/octeontx2/otx2_tx.h
> +++ b/drivers/net/octeontx2/otx2_tx.h
> @@ -342,7 +342,7 @@ otx2_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags)
> w1.il4type = NIX_SENDL4TYPE_TCP_CKSUM;
> w1.ol4type = is_udp_tun ? NIX_SENDL4TYPE_UDP_CKSUM : 0;
> /* Update format for UDP tunneled packet */
> - send_hdr_ext->w0.lso_format += (is_udp_tun << 1);
> + send_hdr_ext->w0.lso_format += is_udp_tun ? 2 : 6;
>
> send_hdr_ext->w0.lso_format +=
> !!(ol_flags & PKT_TX_OUTER_IPV6) << 1;
> --
> 2.8.4
>