From patchwork Fri Aug 26 14:37:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Buckley, Daniel M" X-Patchwork-Id: 115566 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DBB97A0542; Mon, 29 Aug 2022 09:02:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2815E4281B; Mon, 29 Aug 2022 09:02:03 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 27AFC40143 for ; Fri, 26 Aug 2022 16:37:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661524643; x=1693060643; h=from:to:subject:date:message-id:mime-version; bh=8spy95Bklp5JxylX4Gq4UTVkjBsWvfs4dQbHjDA8GWE=; b=ggq0kT/XNH0NOlH4Dia9yWW7/tGuax8VS5UWDd3FQnQwTbXETZ+HCYKU kVNWuvJg5eXAX6OuEJFDYYaIg0dv3Q2wIMJaWoLS49NtM3urP+9ByNf+X /G+xRNTIgxyQ78xCci6fJ1KGAu+h2/s/IthmRQEvMGyhHBbnBjqdsyrKQ zLdJrWfOyLXXkKLyVkuP718yHB9xx5aAbnySdEVj5C8wQDts1tISmTqlS Po8yCFeUlV5xHrIuls0xtaKEkFxoUpvlCtctwWwf6ZwQBSRvRC0WvtZ1V ktb9O2WA+N6JaBUxcVpGck39WZraH/SZVvLkcnbcppQj1jK1f5p4lH7gN A==; X-IronPort-AV: E=McAfee;i="6500,9779,10451"; a="277531315" X-IronPort-AV: E=Sophos;i="5.93,265,1654585200"; d="scan'208,217,223";a="277531315" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Aug 2022 07:37:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,265,1654585200"; d="scan'208,217,223";a="856031480" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga006.fm.intel.com with ESMTP; 26 Aug 2022 07:37:21 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 26 Aug 2022 07:37:21 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 26 Aug 2022 07:37:20 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Fri, 26 Aug 2022 07:37:20 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.106) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Fri, 26 Aug 2022 07:37:19 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l/B8ROgglcC0lg8fRO1og5u0QuUa2yS6eJcFPPqWxTfxgRx8d20Fqw3U/9KxXrgWlQGDi9TYjjsB+O2t3iR3finX+OBKMOj/E1NQimT4dlDzW04reNSCLwNUFjR+VRGipd4+GOCTQqPqdCaChW9EPXFXLoSX1JoaHo793bc/WDVE8LZZyapvCiKD9Dy14w3nTrLFuYCRn57i/HoIDKf8wKSL3AXGcPUZFozhD0YelbqvFuWVz7uqebVkyZAMK8rL/UTIrEDsHF4TN/oNByIMclKUexUFHnov+hhRLHB9JIRY6Jh6sDJaOehNRTDb1aZGq7RkwrnUMsGjZFKBJZnFVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NWeZ+nupSlirDk2I90YYByXiXecku+jO5p7RhHmp4jk=; b=E17ZWQpGg0u/PtUM4GjD0gWGUrMBCUgIdQQy4Xyz1kMBq8MrQ1GiitgTT22lZuLA+XO2ZhVUdwqd0umsbdRPRHn0NQX84USol8SYG7kKK5xTzl9lfnplFEG6M54d0g5G2M4U0CV8XNhFbRXWXDqJGyVXk2IIwLTcVnwTb0QSL6FmU9odYIroJUCGHTlxPYKVD8zjs/5Eq1yRR33H+sBO0ML9WMxkYoxc1NrcKlNCY3vT4/rPLIlO9GlYO5S6YHB3XZcdR/Y0JzolRjnzA6Ql4UslwNavhzCBu6gQZmtO0WX2Ow1eYF5tucs/q3EqtSiY0NnQ65ysU6Nk7yE1zMNPGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BL3PR11MB6435.namprd11.prod.outlook.com (2603:10b6:208:3bb::9) by BN9PR11MB5433.namprd11.prod.outlook.com (2603:10b6:408:11e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Fri, 26 Aug 2022 14:37:16 +0000 Received: from BL3PR11MB6435.namprd11.prod.outlook.com ([fe80::8d62:bf63:e496:8fd0]) by BL3PR11MB6435.namprd11.prod.outlook.com ([fe80::8d62:bf63:e496:8fd0%2]) with mapi id 15.20.5566.015; Fri, 26 Aug 2022 14:37:16 +0000 From: "Buckley, Daniel M" To: "Jiang, YuX" , "dev@dpdk.org" Subject: [PATCH 1/2] net/iavf: enable TSO offloading for tunnel cases Thread-Topic: [PATCH 1/2] net/iavf: enable TSO offloading for tunnel cases Thread-Index: AQHYuViZ4EurakFSWUW1jKeNObjH5Q== Date: Fri, 26 Aug 2022 14:37:16 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5ff34425-7e23-48e3-a8ce-08da8770793c x-ms-traffictypediagnostic: BN9PR11MB5433:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zD6b6wQHIEFQEhcDvbGSewTYMcSv5CVEAurG3JA5EolackNMiiEjE2q7MTMyapU1pEeXczfq4qIZOhe6XOMv4WbXJmYCKnADoPBeeNe/ug6CceZUrKZg8IXsv+7Y9cZ4ycKNQZYMsR8F8rJ4fzAOxd2oBZG33gYlI2rJVnpw1Yt+X5sZ7mETc5jC+lxZ35bdcXAR1bOM/1zrOPLv37YCTpXIg/BCxru76f5l8P9moVAGglueCRCaiy3wjyfKwTMtVr0efsB/n5SUU0+muMJzowudJ6bFYgECgDWBtpyAFTCnnxRCw0ACiNRB/P/4aulrXI8kqKS0jhhEogLJecEesry/BeAldoPW/wJ+mplUIbqq/+1Lv+qS7IF2r5fnLbp/mvODocqWKgbVqn61ceDkddmtWNyjd0Bvnc9Q0yeM3quRv1tbTHPOcve8c5QpeFb05BlaWQ0B+LWwOw1K1mS56R2dESPog8lYzyI68DUILUer+UMJLICEh+moBavp4n7eLxJa4psGDO/Z5C97j2p75GAvJ7EH5TyeGu6fMZrBVAataZ636MIikOsxmd8ysQDDZKyUItNt8UvAcPULo/Gs9wWXNJMJZW/d0VI3zxNvpiXGbFYOCfg9CoUVkg2/0z7AC0JaAPu6Cd56eRpwUtEGSvjU05k9MahYJW7W9MYAhaym45c7s7N7nJYpJIZC1LoXusJNUGA2DWGWYG1rQo0WoJb56qTr0Kap1tz2wE/CUro+HxjtbHvtSlFMnFthq/JrZn1zCScvrGpHV/RT2QAwx6XcRPOGgf7Tupb4zYgbgyWMD6jBr07A+QkRRQKhbRco3C7+XWTPhdVJnCJmyEBRKQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL3PR11MB6435.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(376002)(136003)(346002)(396003)(39860400002)(366004)(7696005)(9686003)(26005)(186003)(52536014)(55016003)(5660300002)(8936002)(86362001)(33656002)(19627405001)(6506007)(71200400001)(478600001)(41300700001)(38070700005)(83380400001)(82960400001)(38100700002)(8676002)(64756008)(66446008)(110136005)(2906002)(66476007)(316002)(66556008)(122000001)(66946007)(76116006)(91956017); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?R048tRuQoyDIEfGpE6IVQvcMxS5k?= =?utf-8?q?sCPWDFsmDDDHmpz97+8HMiIya3w3ppupqBb+lVuzi++o+9c4rjfuwuk1CuCqHZMR6?= =?utf-8?q?4vFvfr78GimVDqavEUi1li9tQGF3kZid7a+DFRzGx0PoqpgwjEWYa5LxNwhAVrXH/?= =?utf-8?q?OD7sfOZGiWDp/DymcsnPFASc3ttN1aTbPy2bJXbp6hzHtdXEN+tR7OEKLS3cw5FRR?= =?utf-8?q?BeACOZ0UY/M6Tpn8o5PF+DWr4VP2801EIGmAMrNeMOf12VPlXIOtI1KkBPrvMX0Gj?= =?utf-8?q?2szt9jzQRyuiV/jyPGfjNa3Zgs98NvJ+Q5Ux5mBoPkqM3qJivc9WfCEy2UoQK1mCI?= =?utf-8?q?QzYecLhF1jwoKqsqyS82pPnTYMFm2eNhC1g7nNZuYreMKn+ChlW444qc91uNP+GtH?= =?utf-8?q?lFVscItsDi03QlRoGebrsbIUEc4WrwVsYFlXdGItqVbyr5ICXRXULwLrer2Yzkj83?= =?utf-8?q?h80xtTxxRBEiitIv+NOHAQ/SGr6AymfXhSZkR390iHfQ/3NQd1jQKXlN2GpVydZML?= =?utf-8?q?BHi9XhvpJLh28m+xfcEecFxSS4VfeCsmJFs0L+TCRofFG5Cg7DFyuvr8KKK8sCMZc?= =?utf-8?q?bN/e+3oo4kO3QXK536imMiIWv3VygVd1zHYBLoFS7vaDLpLAlBNBw/elMPNFUx6ce?= =?utf-8?q?qqeS5UBKToC+ujdJQM+Phpa1qfgBkhLyFpCHu0Tk/G9n4+fp6MeC0Oyk2GuNAtmip?= =?utf-8?q?jeJZSsR4oDM7SwbWVwIgzYeBp3dheGjdv1Q2bW0PmiCTLaGFCfd3k2ev6lsGzaeDa?= =?utf-8?q?ld3hdwiFMUEy7GFYxEW0eltdyPRARrAreEabLCz0uqLDXzz4vuuIthIUFQtBr+Dt7?= =?utf-8?q?5FvEir2oe+qqJ7McB9fvfzH4FdAghw4CIb2L1T//ye3szfh/MAH4XaIfUVHbtnD3C?= =?utf-8?q?xxpA57l+3iITx2TMJzJ3eva9ekEvbVDOKGDmBllvDAf+iVRmjVITrX1oErRbZDR3G?= =?utf-8?q?vKAlNbaX5qPkDoauaZp3seM04AWu54R3aShsH20iqplfG6c+Uwf9/6obbYl1EVM5T?= =?utf-8?q?d7KMGvk7JKGlZ1g8j0ddctJ96Dj2Nhd+dzidGu6JN3obkqcH6rROUNUuU9F7GdmK9?= =?utf-8?q?7qKOQuyNXIqKVM82ZOuy8paR8c0q/p0oWojPN22zO4IPjYJNtMPkHAer+o6ldfp2R?= =?utf-8?q?H398txbsQofuzk33KQ6/Iaxn7p2D+iihCrVXw92lHuPpT0NqgznLADmF60dYMFFkN?= =?utf-8?q?RVilqdFP6hYfcNDHbhc5Vf0Dpk+Umd0V5G1uJopEdR3/LczbXS8IcfAoaQ0OMtUGY?= =?utf-8?q?UlAgXP18gJBDQI241kSEZlimur3JGV8THsx4aVYXmqU5fkxmLrGHtkRz48lkqRSTy?= =?utf-8?q?C73MqX496S84NEyQF18JcXglqLU8ihREN1TZbXeFK88YYCVfA7bPvcIIGdZ7jDDr9?= =?utf-8?q?1Fp4ZoPC5l6+9GOT1eD7YzjDOY+EMUxCsdNsEncEiIYo9oHdsXh7Thgz78Anh60IU?= =?utf-8?q?LTu6FzfRTBjy70tW9nnpcSKyJlFHqIxb8+rsR0BYSDXt1nMDwFKGsOlqgz+JBNaOz?= =?utf-8?q?NWBiYXeDtwWj?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL3PR11MB6435.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ff34425-7e23-48e3-a8ce-08da8770793c X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Aug 2022 14:37:16.5983 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: l71W9Vpcf8bnozqHw9X517dtmhABf3+kRyHY+yXctwfnf9XBu5MCK7umYkMdF4Tusuw7sAGs2zFs34a0NETNj2J3vsRRUbNBn42FsW9x6MQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR11MB5433 X-OriginatorOrg: intel.com X-Mailman-Approved-At: Mon, 29 Aug 2022 09:01:59 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From patchwork Fri Aug 12 16:52:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Peng1X" X-Patchwork-Id: 114858 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])       by inbox.dpdk.org (Postfix) with ESMTP id F30E1A0543;       Fri, 12 Aug 2022 11:02:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1])       by mails.dpdk.org (Postfix) with ESMTP id A76A040A7D;       Fri, 12 Aug 2022 11:02:17 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id AA3CB406A2 for ; Fri, 12 Aug 2022 11:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660294935; x=1691830935; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=QjzGaVZvnEkF2FllVFU+xR8Y5DYCqb7NHx81eAGH2xU=; b=nvX/giSyIEaEGzx/ohuqZY1N0eibgtx/4jxW1rUSWVasoU/e7fGz2iw2 KJwvpm8fGWrGF4p8joSgBP7UM++xo/D/ogAsc9W2HLRYgbFd2ckvvQxsq gnD1LsI3zO5+J5AKJTzu5Kohlcwmkb3kurwZI56MHThZIVnFFYD9RTQ+c mUTgBaiWvKNGAvnM4BEj2OXxHPwgy0TadKLMKX9fssQUQZ/95V1wAXCyS kPwqzX5wNQeb4nEHGrw6H3jc5my/E5bOwga+A3K/cGd1Kv2MvZqL1u2l4 BfrZGZWkbejkuM0i8WfIPiMFXC/7GdTuBwVf/oe7S1hh0qSFarxYo0Ll6 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10436"; a="289127450" X-IronPort-AV: E=Sophos;i="5.93,231,1654585200"; d="scan'208";a="289127450" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2022 02:02:14 -0700 X-IronPort-AV: E=Sophos;i="5.93,231,1654585200"; d="scan'208";a="665750825" Received: from unknown (HELO localhost.localdomain) ([10.239.252.253]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2022 02:02:13 -0700 From: peng1x.zhang@intel.com To: dev@dpdk.org Cc: beilei.xing@intel.com, jingjing.wu@intel.com, Peng Zhang Subject: [PATCH 1/2] net/iavf: enable TSO offloading for tunnel cases Date: Sat, 13 Aug 2022 00:52:22 +0800 Message-Id: <20220812165223.470777-1-peng1x.zhang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Peng Zhang Hardware limits that max buffer size per Tx descriptor should be (16K-1)B. So when TSO enabled under unencrypt scenario, the mbuf data size may exceed the limit and cause malicious behavior to the NIC. This patch supports Tx descriptors for this kind of large buffer. Signed-off-by: Peng Zhang --- Tested-by: Daniel M Buckley drivers/net/iavf/iavf_rxtx.c | 66 ++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 6 deletions(-) -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index dfd021889e..adec58e90a 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2642,6 +2642,47 @@ iavf_ipsec_crypto_get_pkt_metadata(const struct iavf_tx_queue *txq,      return NULL; } +/* HW requires that TX buffer size ranges from 1B up to (16K-1)B. */ +#define IAVF_MAX_DATA_PER_TXD \ +     (IAVF_TXD_QW1_TX_BUF_SZ_MASK >> IAVF_TXD_QW1_TX_BUF_SZ_SHIFT) + +static inline void +iavf_fill_unencrypt_desc(volatile struct iavf_tx_desc *txd, struct rte_mbuf *m, +                  volatile uint64_t desc_template, struct iavf_tx_entry *txe, +                  volatile struct iavf_tx_desc *txr, struct iavf_tx_entry *txe_ring, +                  int desc_idx_last) +{ +           /* Setup TX Descriptor */ +           int desc_idx; +           uint16_t slen = m->data_len; +           uint64_t buf_dma_addr = rte_mbuf_data_iova(m); +           struct iavf_tx_entry *txn = &txe_ring[txe->next_id]; + +           while ((m->ol_flags & RTE_MBUF_F_TX_TCP_SEG) && +                 unlikely(slen > IAVF_MAX_DATA_PER_TXD)) { +                 txd->buffer_addr = rte_cpu_to_le_64(buf_dma_addr); + +                 txd->cmd_type_offset_bsz = +                 rte_cpu_to_le_64(IAVF_TX_DESC_DTYPE_DATA | +                 (uint64_t)IAVF_MAX_DATA_PER_TXD << +                 IAVF_TXD_DATA_QW1_TX_BUF_SZ_SHIFT) | desc_template; + +                 buf_dma_addr += IAVF_MAX_DATA_PER_TXD; +                 slen -= IAVF_MAX_DATA_PER_TXD; + +                 txe->last_id = desc_idx_last; +                 desc_idx = txe->next_id; +                 txe = txn; +                 txd = &txr[desc_idx]; +                 txn = &txe_ring[txe->next_id]; +           } + +           txd->buffer_addr = rte_cpu_to_le_64(buf_dma_addr); +           txd->cmd_type_offset_bsz = +                 rte_cpu_to_le_64((uint64_t)slen << IAVF_TXD_DATA_QW1_TX_BUF_SZ_SHIFT) | +                       desc_template; +} + /* TX function */ uint16_t iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) @@ -2650,6 +2691,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)      volatile struct iavf_tx_desc *txr = txq->tx_ring;      struct iavf_tx_entry *txe_ring = txq->sw_ring;      struct iavf_tx_entry *txe, *txn; +     volatile struct iavf_tx_desc *txd;      struct rte_mbuf *mb, *mb_seg;      uint16_t desc_idx, desc_idx_last;      uint16_t idx; @@ -2781,6 +2823,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)                  ddesc = (volatile struct iavf_tx_desc *)                              &txr[desc_idx]; +                 txd = &txr[desc_idx];                  txn = &txe_ring[txe->next_id];                  RTE_MBUF_PREFETCH_TO_FREE(txn->mbuf); @@ -2788,10 +2831,16 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)                        rte_pktmbuf_free_seg(txe->mbuf);                  txe->mbuf = mb_seg; -                 iavf_fill_data_desc(ddesc, mb_seg, -                             ddesc_template, tlen, ipseclen); -                 IAVF_DUMP_TX_DESC(txq, ddesc, desc_idx); +                 if (nb_desc_ipsec) { +                       iavf_fill_data_desc(ddesc, mb_seg, +                             ddesc_template, tlen, ipseclen); +                       IAVF_DUMP_TX_DESC(txq, ddesc, desc_idx); +                 } else { +                       iavf_fill_unencrypt_desc(txd, mb_seg, +                             ddesc_template, txe, txr, txe_ring, desc_idx_last); +                       IAVF_DUMP_TX_DESC(txq, txd, desc_idx); +                 }                  txe->last_id = desc_idx_last;                  desc_idx = txe->next_id; @@ -2816,10 +2865,15 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)                  txq->nb_used = 0;            } -           ddesc->cmd_type_offset_bsz |= rte_cpu_to_le_64(ddesc_cmd << +           if (nb_desc_ipsec) { +                 ddesc->cmd_type_offset_bsz |= rte_cpu_to_le_64(ddesc_cmd <<                        IAVF_TXD_DATA_QW1_CMD_SHIFT); - -           IAVF_DUMP_TX_DESC(txq, ddesc, desc_idx - 1); +                 IAVF_DUMP_TX_DESC(txq, ddesc, desc_idx - 1); +           } else { +                 txd->cmd_type_offset_bsz |= rte_cpu_to_le_64(ddesc_cmd << +                       IAVF_TXD_DATA_QW1_CMD_SHIFT); +                 IAVF_DUMP_TX_DESC(txq, txd, desc_idx - 1); +           }      } end_of_tx: