From patchwork Tue Sep 6 11:59:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 115980 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 72D7CA054A; Tue, 6 Sep 2022 13:59:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5AD4940143; Tue, 6 Sep 2022 13:59:39 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2053.outbound.protection.outlook.com [40.107.244.53]) by mails.dpdk.org (Postfix) with ESMTP id 56325400D6; Tue, 6 Sep 2022 13:59:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MYiz+Mv6eV63KKmF000Hfo75oXnc0UIRZeJRWaJRN417YiavlmHv1hVLPKBTDI/+FN8jsvx1WSxj6K42IEPDWDWzxdm54RXTv7nPg6qu1gk09/28RTE6yscpYEF69gLrJjrBE77t0vX5kgSy3eA4oDkO4IVBVFsT5XTqvynkbBpPywPBJPj7rPQjDk6jjT/8OH088rD01G8CYSQ72Wykpy0AlVeZor8KnvI/IPLsKgXeKsq/SgLi+pSPvXk4B8Gp61g35jM+YtCqiDcMXx5A6t3c7MGnSpiuprpL/gc7D3cKXYCUA0ps0EKOG8IrrVSCjcqrMMGX8RpJ2kPfbs0T3w== 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=THmTNszSZgGumenml8nKdjUIdz5+HnfSWEDqZa9W3UQ=; b=GOdjE9prPETPJZw+oaF3qWOf8B5teap+mbJGP1LflNFxHSfB64r6vHJNTQ//8n/aZEGojTmn35W4xdS8f3e8fKXo8FBWEPeYrUXbYxaPfNbSg1pZ0lp/ENYkE1dYCfU/1xlBVRyYDy1iKpXADddJ0R02N3ifhK5sTSAYHuymQx1lYJEFN1UIogliySh5CZ0R68ZIsULURTuY9FYEFwKGGehrToidcsyZhINz1Sn8JxHRX9HQyDZhvkJvLTF/OnhcBqWiPvOe0GAPKsAFxtA3YBBMVu7vPHLt/YNiOn0rQdEGnF7r8/Ivfo0Ul+zWxbDvA7dSG+WYnQF1HTSYDWiBKQ== 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=THmTNszSZgGumenml8nKdjUIdz5+HnfSWEDqZa9W3UQ=; b=Q/mw43ObrBcBNO8hRKjzhwsTYcRF6tAal4tSUENpsctQxG2hySSjnK13KN10AxiK7hMYkPHM+tZs5ONeHHd2s0EVEAfOYH/X2N/A5cpXwrTcGk0fhcVVNH492JG8WFI+eIc6OlndpG1wfny0wFm0KiG+PD2rEoGqw7Ne+751920= Received: from DS7P222CA0010.NAMP222.PROD.OUTLOOK.COM (2603:10b6:8:2e::6) by MN0PR12MB6002.namprd12.prod.outlook.com (2603:10b6:208:37e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.18; Tue, 6 Sep 2022 11:59:34 +0000 Received: from DM6NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2e:cafe::da) by DS7P222CA0010.outlook.office365.com (2603:10b6:8:2e::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12 via Frontend Transport; Tue, 6 Sep 2022 11:59:34 +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 DM6NAM11FT014.mail.protection.outlook.com (10.13.173.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5588.10 via Frontend Transport; Tue, 6 Sep 2022 11:59:34 +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; Tue, 6 Sep 2022 06:59:32 -0500 From: Bhagyada Modali To: , CC: , , Bhagyada Modali Subject: [PATCH v2] net/axgbe: optimise scattered rx Date: Tue, 6 Sep 2022 07:59:15 -0400 Message-ID: <20220906115915.115598-1-bhagyada.modali@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220905102031.110601-1-bhagyada.modali@amd.com> References: <20220905102031.110601-1-bhagyada.modali@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 999dcb07-cd5c-41f6-ce99-08da8fff4416 X-MS-TrafficTypeDiagnostic: MN0PR12MB6002:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SHMQxEgG5XpY/25OVLBzmC90nURCPizx/di/+2+Sv3KhV1eJKufYcvVkM6JUPgUuoxK93xSdVW48dljwGFYEYyTx/pWTXq0Y2T/LqENsbxbxlsMVbie/LVIrOyIgq/SEY0k7zMDbStibUC8oxzC1/DP0aQc6amIQcx57cz853d1ugNYFOTa5S2fOT0rOuJ8P4c2lOdNV36pc2nEtNZFShUaXRuMWqIpCk0t6V93vYQivE+zx27DLfWZFKJ6POwAYVZLNQm1Ays2oSX9xIg6bkobcSmvW6xW9i9RRwS08/cayQE4LsriKWO4bAzsOUfneQdpwmwIVHYIVMtIlTS4sVNLgeJHKLqbmhW4dGWDDayk4pIFmml+3lOD3OehaB2ezBLMViywsgsezk7zdDd1xIYOqAvA41eNPhzKxem1/o/Pmj4xZEEBU0u7w4kt0Inc+wsJ5TgDus0GCR3OpZJanYFirrlHyIuO9OOPo+ttQao7HALFnvMt5IQZwZmYDCUkbgi4CP7AzArGGTfXsLiALJUZ0eNgKJTkjUNdej7l3Wwh6WMqmvQBAESAQaIBQ1PWbhMhKFxZVSEYllRpOg2RmiqG0PgPL/7TDbJh6HN4vLqSS1AUQqXk4QENQK6uNO5Oy+a/AJSK8lpQQDAkHp1yCGlOKyAznQHVfJZHFSgzO1W7n1zOX9akZi4RR+iLKTr+Aac/LxEeuSEuwEE4cTvX0EwtSuD4lR0QjW+Kus1No0IX61jd13NyXbTsep9hfnQWH+EkACVsZ3i2lLEwO/E6l8ODGwSExyupV5hnu+vxvhRYQh3o1+dInZV/9Tnx8L2JQiOerL/jEiOAEpB4aYuNVWg== 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)(39860400002)(346002)(376002)(396003)(40470700004)(36840700001)(46966006)(478600001)(26005)(6666004)(41300700001)(7696005)(110136005)(316002)(6636002)(54906003)(82310400005)(86362001)(82740400003)(36860700001)(40460700003)(2616005)(356005)(1076003)(186003)(336012)(16526019)(83380400001)(2906002)(47076005)(81166007)(36756003)(426003)(8936002)(5660300002)(40480700001)(44832011)(4326008)(450100002)(70206006)(8676002)(70586007)(83323001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 11:59:34.7186 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 999dcb07-cd5c-41f6-ce99-08da8fff4416 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: DM6NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6002 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 logic to remove the extra increments of the variables. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Cc: stable@dpdk.org Signed-off-by: Bhagyada Modali Acked-by: Chandubabu Namburu Signed-off-by: Bhagyada Modali --- v2: * rebased to the latest changes and submitting the patch again --- --- drivers/net/axgbe/axgbe_rxtx.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 2bad638f79..8b43e8160b 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -340,7 +340,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, struct axgbe_rx_queue *rxq = rx_queue; volatile union axgbe_rx_desc *desc; - uint64_t old_dirty = rxq->dirty; struct rte_mbuf *first_seg = NULL; struct rte_mbuf *mbuf, *tmbuf; unsigned int err = 0, etlt; @@ -352,8 +351,7 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, while (nb_rx < nb_pkts) { bool eop = 0; next_desc: - if (unlikely(idx == rxq->nb_desc)) - idx = 0; + idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur); desc = &rxq->desc[idx]; @@ -446,19 +444,19 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, ~RTE_MBUF_F_RX_VLAN_STRIPPED; } else { first_seg->ol_flags &= - ~(RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED); + ~(RTE_MBUF_F_RX_VLAN | + RTE_MBUF_F_RX_VLAN_STRIPPED); first_seg->vlan_tci = 0; } } err_set: rxq->cur++; - rxq->sw_ring[idx++] = tmbuf; + rxq->sw_ring[idx] = tmbuf; desc->read.baddr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(tmbuf)); memset((void *)(&desc->read.desc2), 0, 8); AXGMAC_SET_BITS_LE(desc->read.desc3, RX_NORMAL_DESC3, OWN, 1); - rxq->dirty++; if (!eop) { rte_pktmbuf_free(mbuf); @@ -501,12 +499,13 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, /* Save receive context.*/ rxq->pkts += nb_rx; - if (rxq->dirty != old_dirty) { + if (rxq->dirty != rxq->cur) { rte_wmb(); - idx = AXGBE_GET_DESC_IDX(rxq, rxq->dirty - 1); + idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur - 1); AXGMAC_DMA_IOWRITE(rxq, DMA_CH_RDTR_LO, low32_value(rxq->ring_phys_addr + (idx * sizeof(union axgbe_rx_desc)))); + rxq->dirty = rxq->cur; } return nb_rx; }