From patchwork Thu Sep 1 05:33:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 115702 X-Patchwork-Delegate: ferruh.yigit@amd.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 01E25A0032; Thu, 1 Sep 2022 10:08:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1F18F427F9; Thu, 1 Sep 2022 10:08:43 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2082.outbound.protection.outlook.com [40.107.220.82]) by mails.dpdk.org (Postfix) with ESMTP id B152140395 for ; Thu, 1 Sep 2022 07:34:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W6d/TU1qMKCA0Rn31pUmeX5Tcu1+8HIwxPxQwOyV42yy9Ar6zXeczstLBtrrMVYdVjz00NXHA1K53/eJ+PbmrYOWqSrnEOzXcRgDbrTX2kSrD/qlPq6mur9rGS8SuQU+ndDt0I7oyttGuwWGt3w1OI13sDXKarPT4LHZuFvxbKNo72LkY++WoeFO+EvUHTHmfhCru8F6Zxm8UpiZjkF1IRkxvWWaE+zCrKpScVkNkNk/nplBnQYml+zrcDW8coV8wI3FOcBtjn56xfB/djcO6MmbfG0Hi1pkzELxWc/a8MfEWPHF7AGyXbTJMQSDWGYAH+Q5fJEkGpAkm1SlRkwSiA== 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=1aSeAtxM5qq6Rcw7eiMooF/7yLFWHv0u1ZbU6TLH+A0=; b=iRxENrB9gU+byJFCmfFJ2i6V3O9U/NdmCXB7/OGJgsXcLgCOWG4DcLy6RcQDvTzf4yIOpu1c32TRaTfZ54Z7JRvSDDw4fu7TFb1xJ0gsbWp4dswR8Siaqpu3hN5YDpAJyr9YD/IvBongt+DbbU9uUAYCjOlmM0e0aW0E5vWRHEvz34fhX5fJIMh3ESRh9gHZHxihQ7IcKPkiTH7jL7fPzwRLOFpXBVXR1OvW0qQ/H32t5B+IgoF0oAv8wkkKodP/llePDOij7eqbNKXGqg/JYGKco1UMe2NDuObg2g3PzwqaUTR6xMAcYFddAZnjxn2UbXq/mIvVDX3w3sYG64slFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1aSeAtxM5qq6Rcw7eiMooF/7yLFWHv0u1ZbU6TLH+A0=; b=2kniTUJS/ynHLM1gVKmh2ei0sZUKdnDggh/8hyc06/ejDwlS/JxbCDmnNalSxnJGZY/isZZz2xaKEJx3CFUhJfm2g/zvvAtw3gRAVO0cSqYJ4KF4t91ofzI8qIg1GrDutLQY+R8rN8uuYWBk7qA7V1Kvbdog2bMBYty5lwSUnmI= Received: from DM5PR07CA0099.namprd07.prod.outlook.com (2603:10b6:4:ae::28) by BN9PR12MB5116.namprd12.prod.outlook.com (2603:10b6:408:119::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.11; Thu, 1 Sep 2022 05:34:14 +0000 Received: from DM6NAM11FT030.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ae:cafe::bd) by DM5PR07CA0099.outlook.office365.com (2603:10b6:4:ae::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.13 via Frontend Transport; Thu, 1 Sep 2022 05:34:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT030.mail.protection.outlook.com (10.13.172.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5588.10 via Frontend Transport; Thu, 1 Sep 2022 05:34:13 +0000 Received: from cae-Selwin.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Thu, 1 Sep 2022 00:34:08 -0500 From: Bhagyada Modali To: , CC: , Bhagyada Modali Subject: [PATCH 1/4] net/axgbe: fix scattered Rx function Date: Thu, 1 Sep 2022 01:33:08 -0400 Message-ID: <20220901053311.92964-1-bhagyada.modali@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e4eaaeed-c7fa-44d4-50e2-08da8bdb9aad X-MS-TrafficTypeDiagnostic: BN9PR12MB5116:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n1ZVSZOEtUZPZ6ga9xwGaY/Gh8sLgRXsjbX6rAGxbiOjTUXsPi+pWNo8W1oAzVLc/ayuUtpy07zh4LfwwJNlSR2kZKH/IUJ7nLumqvusegNG1JcJPhp4WoQ+wnlUgQTJ+2BTyo2kqlF0QBXcHG2ZNX0BigsWwRNQvoz9b8nhT5csx4XS8DxFpj4k83/vWCa3Uk4bGshgKEnms/q+D/gMBWMZF+K379Exm0A+x+0cJOizcrZnJ1hP/2p0q344qEXgkPHaXaYmE7lK2jN7A7wRsY0/vqQOrB1YaRZL1amCTFinVF6JyVRaMQ36p2YV82VJA9t2Vh/or6e0nK90RBVmAXc5AbcGhnMbx6v7/HACP5d9fV/uzdRmpfdl8xlVwg8nbcSbMN2g2nfSfYH0jKYQcPx3/AcDFKrlE5ROYIrJLDF4L75BI8snph3nXB5dtjmEoucd8EWcu8VLV1Tyh1xx06DqDQJBs6Qsiyp0iBhzyiogjtoXLgfK3hRQjVpgeNASYhoYXWr7D9y5kDDCt2nXZsQ/5pvxrrdwa9EOy9v3jWEKgF5k/oKEINLPcAdaPKh9s2LdzjuMFsHwQNI2xTy553vD2bjAeRv95QLYyPFb4jrwL1W2tzLacoT0CYfVTkWY5rdgRyHenOZez7Qs9MiPJ3YoYtsqzpWRR5kcLW0dQuJ4XdKg2ARLmy8u3AHRlwhiWm5btMSRR0lHQ/OatNOYvG0bIzTeW8DUyDIdHAQ7SvHcRDfmf1qES/nyy/gQ4QwQrFC/QfZg6gHyC5QdHhOMd7UUm6qphA1n5A3fcr4ofQIiCVkYDuDS7GlWkEWpNMHR X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(136003)(376002)(346002)(396003)(40470700004)(46966006)(36840700001)(2616005)(86362001)(186003)(40460700003)(426003)(47076005)(81166007)(336012)(1076003)(44832011)(41300700001)(5660300002)(8936002)(16526019)(7696005)(356005)(2906002)(26005)(36860700001)(40480700001)(82740400003)(83380400001)(82310400005)(54906003)(36756003)(70206006)(478600001)(70586007)(6636002)(8676002)(4326008)(110136005)(316002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2022 05:34:13.4401 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e4eaaeed-c7fa-44d4-50e2-08da8bdb9aad X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT030.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5116 X-Mailman-Approved-At: Thu, 01 Sep 2022 10:08:40 +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 Error check needs to be done only for last segment of Jumbo packet. Freed first_seg and reset eop to 0 in error case Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali --- drivers/net/axgbe/axgbe_rxtx.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index f38bb64fab..6909d3a852 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -381,19 +381,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, } mbuf = rxq->sw_ring[idx]; - /* Check for any errors and free mbuf*/ - err = AXGMAC_GET_BITS_LE(desc->write.desc3, - RX_NORMAL_DESC3, ES); - error_status = 0; - if (unlikely(err)) { - error_status = desc->write.desc3 & AXGBE_ERR_STATUS; - if ((error_status != AXGBE_L3_CSUM_ERR) - && (error_status != AXGBE_L4_CSUM_ERR)) { - rxq->errors++; - rte_pktmbuf_free(mbuf); - goto err_set; - } - } rte_prefetch1(rte_pktmbuf_mtod(mbuf, void *)); if (!AXGMAC_GET_BITS_LE(desc->write.desc3, @@ -406,6 +393,25 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, PL); data_len = pkt_len - rxq->crc_len; + /* Check for any errors and free mbuf*/ + err = AXGMAC_GET_BITS_LE(desc->write.desc3, + RX_NORMAL_DESC3, ES); + error_status = 0; + if (unlikely(err)) { + error_status = desc->write.desc3 & + AXGBE_ERR_STATUS; + if ((error_status != AXGBE_L3_CSUM_ERR) && + (error_status != + AXGBE_L4_CSUM_ERR)) { + rxq->errors++; + rte_pktmbuf_free(mbuf); + rte_pktmbuf_free(first_seg); + first_seg = NULL; + eop = 0; + goto err_set; + } + } + } if (first_seg != NULL) { From patchwork Thu Sep 1 05:33:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 115703 X-Patchwork-Delegate: ferruh.yigit@amd.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 A8A0EA0032; Thu, 1 Sep 2022 10:08:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0463D4281B; Thu, 1 Sep 2022 10:08:44 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2078.outbound.protection.outlook.com [40.107.96.78]) by mails.dpdk.org (Postfix) with ESMTP id 5F6EB40684 for ; Thu, 1 Sep 2022 07:34:19 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vg3kNfNTl646sWDOYZREWyNgTWnW6Jike3v9tH18xteDxztUawgjPosVqTTd1bkBTXdJ2tPCNhCUO1Ncinos5omK8IgOZloALIwQAd8QCWVGjtv5jLwRLGAxtfbQ/G7m/CIhhQgXKCnmEwhD//icK+iLoOwZ2l7cD2Kt4u3uy6FoUTt46KrKT+aLPm9nS0oguI3BsZ4ueR5qF1bbNdn/dVdrB9BlfHJ0QjQ0k403y2+NU+nwFHFpXWZnkDXx6y5IHVAqG708AKxNj39nRZSxOUo+m+sX9NcWqTLXjn/mnSUQbYbPil+kRMfuYW05Lvj1c0+Gfk5C9mdIaeHPGLm5Jg== 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=KU8mm3bXKRhaHzXbE+1SYby1T7VY9ZcqRgyfu/LVjpQ=; b=XtBGLkDRr76hyw1M9zysfeXbB2iXHTsGu7TJQdQqU5lVDTfqNgbp5GBev30M8jCP/9GpxjSa+n9hUpyxX/9OhrVYxG1RW5Cth0G0YwDxRupk5AjBdpGnF0GU/GyizEpPHeJD7fYxKua5CS1TX6qWS2UCDD89Mwu7RuV5CfMoQqGLlzSFp/ZjVajP6rf5EjHkbfat1juBw5Pv7FCbeR0/mE/qBaUUCowMgaQ+5HApfI+t3XeLEMrq9rdc4SSnklPXwPPCG/gx1enEZ/KvioKJxUFBp8iSiutn/J9Kt7FhbmAuAtlZf0/BfMrmQLfP277QV/hg0vAFAq89PPpJ/RuFIA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KU8mm3bXKRhaHzXbE+1SYby1T7VY9ZcqRgyfu/LVjpQ=; b=4l6/uthK8jJcXWBwdM1HjTElb1TO7/VrrMDWzHr5wSEgEKCs+aiw1Ubv66ba6o8c2Et3XkBfg5kCZwXy824mCLddy7XzQ8EpxRz2vMvKBLZQRqyuQYDZN4wJC1ZP2xErCVuGu7KHjIi0k8z68Nl4XbrW7Ai9FSjoZhjfM4a4+Cw= Received: from DM6PR08CA0003.namprd08.prod.outlook.com (2603:10b6:5:80::16) by SA1PR12MB5658.namprd12.prod.outlook.com (2603:10b6:806:235::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.21; Thu, 1 Sep 2022 05:34:17 +0000 Received: from DM6NAM11FT069.eop-nam11.prod.protection.outlook.com (2603:10b6:5:80:cafe::3) by DM6PR08CA0003.outlook.office365.com (2603:10b6:5:80::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10 via Frontend Transport; Thu, 1 Sep 2022 05:34:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT069.mail.protection.outlook.com (10.13.173.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5588.10 via Frontend Transport; Thu, 1 Sep 2022 05:34:16 +0000 Received: from cae-Selwin.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Thu, 1 Sep 2022 00:34:14 -0500 From: Bhagyada Modali To: , CC: , Bhagyada Modali Subject: [PATCH 2/4] net/axgbe: fix scattered Rx function Date: Thu, 1 Sep 2022 01:33:09 -0400 Message-ID: <20220901053311.92964-2-bhagyada.modali@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220901053311.92964-1-bhagyada.modali@amd.com> References: <20220901053311.92964-1-bhagyada.modali@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3f43e45d-7303-4636-69e9-08da8bdb9cba X-MS-TrafficTypeDiagnostic: SA1PR12MB5658:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +EvBBWMcfKBT13bFOLbm7je815fTmYOGrlhQciwNZ28K3Tu/1rmqes6njMWlXAOOmQsLnxdsNNPv5mGFFR60yMvofXixOifuT8ZJsZgeObn8VqDgT2rhd2IvSJDbGcsNk90nle/IXWsrsK5LaJ24KJvczkCgaKFrWoO6RjZelTvmaV8dsTX9+czOjTsY9byoMxBDJZb/IsLXxSZ2BIZB1CqMLqtLYoVnjNvuL38xpKUUdPpcVIdNc9Vu2d46hCBSY4/fnNsUTlkW3mV0Nxm5D0VkoS61Wur+zJqyvd9rtuTZX7Q11u5cq/C4FiQyqjSWgDgQ+CepqOJ9QrSHWBmxMTXm7y2wU/tpKFVz+9Okg5FeNCGH3MOkb+TlYpWr8g8MFXcncTnrrcN1XT5Gqn9kqplDJy2dVx0LkoGZRhGvrSrQnx9brHhjjrtX5L6tLuMaxNIxklyLbfJAocv0/9tlEJtxFfrOSm45CNbmLnGzCVEUm+ypzQNSsGGHElMBvaSB2QyiFNC2WnSiuuetDd4VXfeieuEAAfWyQukbVtTnm37J1co601gWN3zGggk5AwErcueuqtN4NCiAb4GYMvPDEMNQAJhv2gteOC+lNvg7xs/X+XW7lTT9HxuIgHEkbAPxn2chDM7qRuoFJ1ywpVs/l8iGDWtLDgHLknMSsdkCFIYB1TgI//7U9oLtrz0akJ4CsIUbXWxrXW9iiBjvwalkPdXl0mZ8sGGARicu0ffBc5HoMJ6bfk3G4fplpYi2PPnzMIX2kYZFve5YEBt9JnsekhjRWRoMZu1Qsp+KpT+63u+YSqZoTPNBxsvrdGLxUe7i X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(136003)(346002)(376002)(396003)(39860400002)(46966006)(36840700001)(40470700004)(8676002)(54906003)(5660300002)(4326008)(8936002)(2616005)(426003)(36860700001)(6636002)(47076005)(2906002)(70586007)(110136005)(4744005)(44832011)(36756003)(316002)(1076003)(7696005)(41300700001)(6666004)(70206006)(478600001)(86362001)(26005)(82310400005)(16526019)(40480700001)(356005)(336012)(186003)(83380400001)(81166007)(40460700003)(82740400003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2022 05:34:16.8970 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3f43e45d-7303-4636-69e9-08da8bdb9cba X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT069.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB5658 X-Mailman-Approved-At: Thu, 01 Sep 2022 10:08:40 +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 Updated pkt_len and data_len in the last segment of the packet. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali --- drivers/net/axgbe/axgbe_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 6909d3a852..3594421e08 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -391,8 +391,8 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, } else { eop = 1; pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3, - RX_NORMAL_DESC3, PL); - data_len = pkt_len - rxq->crc_len; + RX_NORMAL_DESC3, PL) - rxq->crc_len; + data_len = pkt_len % rxq->buf_size; /* Check for any errors and free mbuf*/ err = AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, ES); From patchwork Thu Sep 1 05:33:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 115704 X-Patchwork-Delegate: ferruh.yigit@amd.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 56339A0032; Thu, 1 Sep 2022 10:09:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1ADC242829; Thu, 1 Sep 2022 10:08:45 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2063.outbound.protection.outlook.com [40.107.93.63]) by mails.dpdk.org (Postfix) with ESMTP id 7CA9940395 for ; Thu, 1 Sep 2022 07:34:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BCFS7YFF3Cfzk78nPZO2/ucx0sELLxVHDY99ljdti4GiHBwaioptm5URmsz5A5UWhT03Mtexu+GScfkCVJGJYiB2UzXwg/2DzVVMV2jNnuWl5d2escdPOkYcW/HLon6p7IQNKDbqBPjESn+1wVARMDfQQ/WOTGgF8wUxozz/KPciH3f0VrMPl5fZGzj6y1dq49L6XWxAeDSM21wDvwudG4+paym44ML09NGOGTO5MnxMEKOkLxR5SBhDL6wQLl2AWP87ndiHzR/mlZEjZ+yB0nHNQfagnuXT87ukwRSIITFDGeKiYxtTBeWknVntAktXVr/FEGuc06YUwQj2GzZopA== 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=Tqx1XZcfGvjFk9jM0m69waUqzRLWQTfZ2Y4Wur+9NKU=; b=Z1OQOF8AMXUO9M8CFRZhJX9A1oLFa4ajc6BkzViqjePMpvmd6iJisOlB8CVWvPpAT7fsRXMz1NytLS5Rn3+0znLTYGhxeBS4Ig88HiKOnvGAoOLWyrbSyfYy6xUsKo943hlbo2ZqoUIbgq9L3vCS/lZRR4xr0NQ7rKl1BkOnRYB5ox2JglPlK4RuKfTqgAJBhS5qtJnRI4uVkWvSx4LZKlE/VUTKHOv4Y9J0eb8MN/Ght1/5JXYt1fHaHxlrYc/zHitE45DgnT8ZtyDo+c7C64VNcricfWxuKRWX5XZNTr8JpZ2UudngRQPgn7394f/jd5vvESf6wlcF8lJ8AWPvHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tqx1XZcfGvjFk9jM0m69waUqzRLWQTfZ2Y4Wur+9NKU=; b=2DkjFGH1uxKNzwLDZtNiK+0xl4L6dCsMuHThcRYS8OXooYc2fD/fcoeY5tT0RDrMPlIvQ/1eluOExKxMvEJKiHhq1eZrDezn6Tx/cCLBgwI36vKVNdQL7PCr0ej/Gej+OPahaIeUzf0jUXvJSD/AqFlZw7Yd42X9yeJwqleL0UU= Received: from DS7PR07CA0010.namprd07.prod.outlook.com (2603:10b6:5:3af::29) by SA1PR12MB7101.namprd12.prod.outlook.com (2603:10b6:806:29d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Thu, 1 Sep 2022 05:34:21 +0000 Received: from DM6NAM11FT111.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3af:cafe::ea) by DS7PR07CA0010.outlook.office365.com (2603:10b6:5:3af::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10 via Frontend Transport; Thu, 1 Sep 2022 05:34:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT111.mail.protection.outlook.com (10.13.173.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5588.10 via Frontend Transport; Thu, 1 Sep 2022 05:34:21 +0000 Received: from cae-Selwin.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Thu, 1 Sep 2022 00:34:18 -0500 From: Bhagyada Modali To: , CC: , Bhagyada Modali Subject: [PATCH 3/4] net/axgbe: fix scattered Rx function Date: Thu, 1 Sep 2022 01:33:10 -0400 Message-ID: <20220901053311.92964-3-bhagyada.modali@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220901053311.92964-1-bhagyada.modali@amd.com> References: <20220901053311.92964-1-bhagyada.modali@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 801c10cc-ccd1-40bb-9646-08da8bdb9f48 X-MS-TrafficTypeDiagnostic: SA1PR12MB7101:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7e2NyqvbLtLCj4ZDkoP/+ekFhgtzSfLcdFJUMa6BjXEfFPMR/NlA7RbQTL1S2s7IZGlkeyaE/3WZZgAZIyjM8nPdt/gOhl6CS7wD/62wlRPfFZW3M0njN4zgOTHB26FNi///Oye6tPz1oZrp2IiT++WPrChYbNRWak5ngq3y85y/kMJBiY9dMWev2WLbTR+rHRcC4ScMlzBTUgtz5LvKJpto3FwX1SR2p25Q+/N56JJ8PCXHRlCEszhANZWxweJvVdviJBH/hA/DMIblr4z6hBlhze6hi0G8MLEHSLLBAkXEizQTRzryzxibGsLMgJJq0IiItGDq8JLUinXh0MfV3cQdP8GvvhyBsggixYcKhSjzMJn9gQQf7mYrbJWN0mTnaIrit0gIQplEE2L3yibCKM6VsK1dpZzRheaVrFSLreyQfoMvFkkU6MV0T+rG+5ghdc0y82BEZsXplSkt74ogrSZBq207q8zfNSNQ7cXHd/GYJUFnv6HXncVr7gNwq8IKZVXrLw3gRq0hj0udWSbzA8G4iNj4zSGh1rAOl4yBL8eCD8FehWqfogkkocGg7F871zMewsOvxOmzoHwvSE4fgEd0QbDaRUPuodtpg89yUvQ0fP3sOc5MUHp8iey7h99Pn6JSX8SRIAVz81oRD7FlLSdhoiHgFEml0Nuc7LXDfwkcG3xzfZPWYQ7s3TSjCBEY3vqsfdQd6ecCxZwxFNo+n6bGQfce8poXYH5WnWq7KZzBXwNUiFtVVRezeCOwNlKVK5RXvofC/jEwkV203CTqx2y3ExxM9krSnovOjEFG4Is8sq61CdZfnXAQUWUa4qhj X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(396003)(39860400002)(376002)(346002)(136003)(36840700001)(40470700004)(46966006)(36860700001)(356005)(86362001)(82740400003)(81166007)(6636002)(40460700003)(54906003)(316002)(110136005)(7696005)(2906002)(44832011)(70586007)(8676002)(5660300002)(8936002)(70206006)(336012)(16526019)(1076003)(4326008)(2616005)(186003)(41300700001)(83380400001)(47076005)(82310400005)(40480700001)(426003)(26005)(4744005)(6666004)(36756003)(478600001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2022 05:34:21.1842 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 801c10cc-ccd1-40bb-9646-08da8bdb9f48 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT111.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7101 X-Mailman-Approved-At: Thu, 01 Sep 2022 10:08:40 +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 Updating mbuf data_len, Pkt_len for each segment before chaining them Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali --- drivers/net/axgbe/axgbe_rxtx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 3594421e08..d3e9368b44 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -413,6 +413,10 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, } } + /* Mbuf populate */ + mbuf->data_off = RTE_PKTMBUF_HEADROOM; + mbuf->data_len = data_len; + mbuf->pkt_len = data_len; if (first_seg != NULL) { if (rte_pktmbuf_chain(first_seg, mbuf) != 0) @@ -444,9 +448,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, mbuf->vlan_tci = 0; } } - /* Mbuf populate */ - mbuf->data_off = RTE_PKTMBUF_HEADROOM; - mbuf->data_len = data_len; err_set: rxq->cur++; From patchwork Thu Sep 1 05:33:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 115705 X-Patchwork-Delegate: ferruh.yigit@amd.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 D8D09A0032; Thu, 1 Sep 2022 10:09:11 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0572242836; Thu, 1 Sep 2022 10:08:46 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2068.outbound.protection.outlook.com [40.107.95.68]) by mails.dpdk.org (Postfix) with ESMTP id 8268640395 for ; Thu, 1 Sep 2022 07:34:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WofZB6y1rHGIJEaLK6KQA53LUH4xTzpSKTnacjvfaIZ8hH1Fq+9b1dcJu6XV/JXezUn3lEm08TzkN1ZyRpO8uoLO73Uu4zzTIUDHMV7HBOr9Wo1UGqVeYnYAc6FGsW3GF9GXfSCgee/bcgVLj8ei9BimNcnMngGoU0udUk1PxPTCqpLskdJT36TlijtsKAtLPxpiPxQlwKWjPGM5FYKO0SZWBJBRvEKbEeF21GqW9zlhv8hEnkNqm0N8mA8OVk6z+DRBe0XD3FRQMGz7sLO32xvwAbh1dc2ZEP6PxUfFll8SkkZrmyci/6P+xpMRo5fb5VzbRzMdAT6CmiHQaOzg2A== 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=URApiAKSYDnSiZzykkM5HVYLmrYwfbhOs4Q62Cn+Exc=; b=ZNHezWt+u7C/Bwe/3pEl+HybcVkD0vOwB2iMTFmzn9J/pZR0fheMwN480wu4rC9F1Ey2iL/CsC3ynCgxqqV50IE1yzmT045YYCljpAp+8wn3+rDVQ8VXzSsowrhfXcC9D6n48zkWLO7SkEap+FSXbTOCTKQ64GWjpgwd8ZrEba8eq+j6gVNmCiXZawRtWChcs7U8STH9j3OG30Qvr8ZXNECZltV4qdzuU8z7Ym8ACt1P9eZnongn6/WZ5wPmOcOFjGD8+4XjUtpq2SkBik9mEkGTMBe2sn+rRY7lXYHSEJnRErDGiw3lZbUBB8Lns9VbdlWJe3UTiOg0VyKwo/VtZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=URApiAKSYDnSiZzykkM5HVYLmrYwfbhOs4Q62Cn+Exc=; b=0xhihQghaiIbmE14qHxlPlPPr8C9IwSv3coS33qazJW4loOdKfQ/DeXQsNPVfsdcL63/Y2ygvSWrbEziHgRYuqFLSFYPVEs+cHr1EjnMI+RChRmGL76OrnZCFo+U5xW+ijSHqXcJydcRaCEWO1LGo80zO2GRtsZ82uLXd49ectY= Received: from DM6PR10CA0012.namprd10.prod.outlook.com (2603:10b6:5:60::25) by IA1PR12MB6164.namprd12.prod.outlook.com (2603:10b6:208:3e8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.21; Thu, 1 Sep 2022 05:34:30 +0000 Received: from DM6NAM11FT033.eop-nam11.prod.protection.outlook.com (2603:10b6:5:60:cafe::ef) by DM6PR10CA0012.outlook.office365.com (2603:10b6:5:60::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.11 via Frontend Transport; Thu, 1 Sep 2022 05:34:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT033.mail.protection.outlook.com (10.13.172.221) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5588.10 via Frontend Transport; Thu, 1 Sep 2022 05:34:29 +0000 Received: from cae-Selwin.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Thu, 1 Sep 2022 00:34:27 -0500 From: Bhagyada Modali To: , CC: , Bhagyada Modali Subject: [PATCH 4/4] net/axgbe: fix scattered Rx function Date: Thu, 1 Sep 2022 01:33:11 -0400 Message-ID: <20220901053311.92964-4-bhagyada.modali@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220901053311.92964-1-bhagyada.modali@amd.com> References: <20220901053311.92964-1-bhagyada.modali@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2dfe4522-5a73-4bec-a6d5-08da8bdba497 X-MS-TrafficTypeDiagnostic: IA1PR12MB6164:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E7i4OoRQJ+ofa1jXqw7BsyC6rwQJX5ditxZxU0jbbD/qV6vlpsEpO46CbvS06cjHByO4yFONDDVZNPyKm4hPorpJTH3opscsmowTk4+eLgMitpi+UTrqa5pv6clu/rlGuHh6JJ8trLj8eeFQ/E5/U0EtrIYo8a8Sl84xsDicnp8qbZHJfAbglLfjimwwVFdv2aOKlDCx2tEReXvONu5J/n08cRUCVmF+7akK3EcllLBxr+XkyEB9WjltWs+4uRuPHOlrGbPzSYAMvEtit150jvXpX4AnbBBuA6Zu0ae5m5NvZ0ymDPg6UUmPRhoLOpi9jER1o3x4RKu4PnlII2VTAUREM6t4cRLj6OBfsQ/zGOfqqORLlf3eLMPs0E089aHZ5u3o2cHlRUsoK8MkhU84Se9J2Npg/XgPNJ+MNAXjbQv9N2rNiiz+GnN4zhno2bYoDpYjhTIIBzaG9XlSJ3223j7JVtA4Rk2FzR3lnBr4V2nL3U9h5SItkX9mtbXK78wbKmwuXvZenUkR6en7tJqIWAZHer17I0fLXx+NXnwejRBIGsjqn2oNv4T3Eyi2n4Q+7EEYbG1ZIYjznQJsOp6huBJ+pQTzz2Fz+i3s6TMQbmtkKg8sRMbeRtYIbc6Ye39admKOi4WPgqUc9vslaiQiBcxpDLN6P64cx5XsnETQU4dR7hucLZtTTUzA800CLkcFb0313/DwVDr+zdEITmYWncgqUwe7p4lTyb4RTsxsxGf5fEPxfgWpXJnaLGDFfym9/YjvwioQdJaW4oHn+hGHK9VwUmOhdRg/NsSOb53f1aPCO0E4mEIxLD7cU3rrzE/2 X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(396003)(376002)(136003)(39860400002)(346002)(36840700001)(40470700004)(46966006)(82310400005)(26005)(44832011)(7696005)(6666004)(82740400003)(2616005)(1076003)(2906002)(16526019)(40480700001)(186003)(47076005)(336012)(36860700001)(426003)(83380400001)(40460700003)(4326008)(54906003)(6636002)(316002)(8676002)(70206006)(70586007)(110136005)(81166007)(36756003)(8936002)(356005)(5660300002)(86362001)(41300700001)(478600001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2022 05:34:29.9972 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2dfe4522-5a73-4bec-a6d5-08da8bdba497 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT033.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6164 X-Mailman-Approved-At: Thu, 01 Sep 2022 10:08:40 +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 Updated the RSS hash and CSUM checks with first_seg instead of mbufs. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali --- drivers/net/axgbe/axgbe_rxtx.c | 41 +++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index d3e9368b44..78a32db973 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -428,24 +428,27 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, /* Get the RSS hash */ if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV)) - mbuf->hash.rss = rte_le_to_cpu_32(desc->write.desc1); + first_seg->hash.rss = + rte_le_to_cpu_32(desc->write.desc1); etlt = AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, ETLT); offloads = rxq->pdata->eth_dev->data->dev_conf.rxmode.offloads; if (!err || !etlt) { if (etlt == RX_CVLAN_TAG_PRESENT) { - mbuf->ol_flags |= RTE_MBUF_F_RX_VLAN; - mbuf->vlan_tci = + first_seg->ol_flags |= RTE_MBUF_F_RX_VLAN; + first_seg->vlan_tci = AXGMAC_GET_BITS_LE(desc->write.desc0, RX_NORMAL_DESC0, OVT); if (offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) - mbuf->ol_flags |= RTE_MBUF_F_RX_VLAN_STRIPPED; + first_seg->ol_flags |= + RTE_MBUF_F_RX_VLAN_STRIPPED; else - mbuf->ol_flags &= ~RTE_MBUF_F_RX_VLAN_STRIPPED; + first_seg->ol_flags &= + ~RTE_MBUF_F_RX_VLAN_STRIPPED; } else { - mbuf->ol_flags &= + first_seg->ol_flags &= ~(RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED); - mbuf->vlan_tci = 0; + first_seg->vlan_tci = 0; } } @@ -469,18 +472,24 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, first_seg->port = rxq->port_id; if (rxq->pdata->rx_csum_enable) { - mbuf->ol_flags = 0; - mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD; - mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD; + first_seg->ol_flags = 0; + first_seg->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD; + first_seg->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD; if (unlikely(error_status == AXGBE_L3_CSUM_ERR)) { - mbuf->ol_flags &= ~RTE_MBUF_F_RX_IP_CKSUM_GOOD; - mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD; - mbuf->ol_flags &= ~RTE_MBUF_F_RX_L4_CKSUM_GOOD; - mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN; + first_seg->ol_flags &= + ~RTE_MBUF_F_RX_IP_CKSUM_GOOD; + first_seg->ol_flags |= + RTE_MBUF_F_RX_IP_CKSUM_BAD; + first_seg->ol_flags &= + ~RTE_MBUF_F_RX_L4_CKSUM_GOOD; + first_seg->ol_flags |= + RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN; } else if (unlikely(error_status == AXGBE_L4_CSUM_ERR)) { - mbuf->ol_flags &= ~RTE_MBUF_F_RX_L4_CKSUM_GOOD; - mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD; + first_seg->ol_flags &= + ~RTE_MBUF_F_RX_L4_CKSUM_GOOD; + first_seg->ol_flags |= + RTE_MBUF_F_RX_L4_CKSUM_BAD; } }