From patchwork Mon Sep 5 10:20:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 115886 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 18DD8A0553; Mon, 5 Sep 2022 12:20:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC366400D6; Mon, 5 Sep 2022 12:20:55 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2043.outbound.protection.outlook.com [40.107.92.43]) by mails.dpdk.org (Postfix) with ESMTP id 373A6400D4; Mon, 5 Sep 2022 12:20:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mjhyFWF1kVP8A6FW8AWw7qjhx8xkn0c4I574G0UXrlGKzUbmzSVG3R+M9kb2tfdGYzwm+5IvsnEa1k3Y1A5IY3uAFScXNzuz0bjCY/Ja8tUzLQ0vTcg9ieZWTfkYFte/IjUpHWwn0q3M0UMJXCtnIF1TBrceTE9JUYqYCpruIXOrKwIhaj4L58cWipmer/aaO5QBEWDgYYfvQzsp1agGuMnG+MmMXKxEV0CkILOgvzmhhfCMAaemygCVbTfWFqx+AXrotqIlHlD+Zj0glHBVlvHRHZAHnAcXndz3Dj4TDCkJ9AOzGOpu0ULghH+rEP4m8ijWtcBayZyIJZKBN/qKXA== 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=PaYpVzBf177QmtSs06XeXdobkikpegPfhS8qcXvCMTQ=; b=Azjw0KhypI5YbfLRtuWcniUzFBxW/YlGcR/0OTpoYrNLBCuhF8S/vDT7PDwZPSM3y4xbf6WL0p2Ee9MI17EFwZtTSRznkYkI5ZuxSLR9wzuAW+WqHOINPe0G/SE0CJ5IQIkHG/5IS1qzWy6eT0jFW3+o9qh6/FXzz6gMhN0PYTtKFdt9uPTsK9wvnXqyyQgk9T8B+Pkktdyc5JD/yZRuxlFPd0JdqUrkcWlnII4WRJNU0yg3zSN2bjzuf62uS7LYGvn06M9fCCv/XKBMPnlLxiGNQITUnKWWASeze/Yce9kaVDf/d2jm+RAeaG4nQNPflmj1+5efw/5nklgcp6fhqA== 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=PaYpVzBf177QmtSs06XeXdobkikpegPfhS8qcXvCMTQ=; b=bZ0OxAG2BDZFLyIVPYtzm4ofBoCYRPSE5DnMKjQKX5BQ/k/8KyH1zY9Xj32w4xD73lEt9YLMM46FQ3vk1CGTLdxC9bwJrI0eFPcQN36NImgoSTjXETtiBUL+E0MHoajObjsC5j36T2xeRiFZZRE5dDCibTV8MVfhxdzuo9OusaE= Received: from MW2PR16CA0002.namprd16.prod.outlook.com (2603:10b6:907::15) by DM6PR12MB4545.namprd12.prod.outlook.com (2603:10b6:5:2a3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Mon, 5 Sep 2022 10:20:53 +0000 Received: from CO1PEPF00001A5F.namprd05.prod.outlook.com (2603:10b6:907:0:cafe::16) by MW2PR16CA0002.outlook.office365.com (2603:10b6:907::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.17 via Frontend Transport; Mon, 5 Sep 2022 10:20:53 +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 CO1PEPF00001A5F.mail.protection.outlook.com (10.167.241.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.11 via Frontend Transport; Mon, 5 Sep 2022 10:20:51 +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; Mon, 5 Sep 2022 05:20:48 -0500 From: Bhagyada Modali To: , CC: , , Bhagyada Modali Subject: [PATCH] net/axgbe: optimise scattered rx Date: Mon, 5 Sep 2022 06:20:31 -0400 Message-ID: <20220905102031.110601-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-TrafficTypeDiagnostic: CO1PEPF00001A5F:EE_|DM6PR12MB4545:EE_ X-MS-Office365-Filtering-Correlation-Id: 5af96325-dad7-49f9-004b-08da8f284f65 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PQGwXZtCktsPoJZl7AjEk6WVerlPvAgdgynBYZoj1D9/DKBOLPtojGMiwP88u0/W3C41B4sTQFkFNCxIeaYrh42MDA5d6d18PRSrKzzEnspBPE3Yzir9SDzAivwqv9QLGiJNqFOQtw3YkFeWE0FwfC/dGUb+11rYrDTYrd9p7q8wQyLSVyqYvjWproDbIDCslcap7kpw3CxLNXDPFfYlgDN4h0NN4vvzgCXReoZxr/wqoRu8oFaU6AOdR1J8nYqWuQtn4RRy/MOPBFn9PlaOmWVC3TyuibNMToulXIch6PJqiaDEUh94kliqg0L72mfqL/pZU3dXhjl1x/BwsfSCuuwYMC9zzV76+eQmHaCoLS49MBZHD1GQq93DTfCea6imKzaXX37wYGdfJEZQ5nLrn5Q3WFSzryzLxSda57jcCuzhi9JHcxRU0LJlSywNy9lzDFiBBnlgKX/ObYfqO/hiz8VbSXKWaS+r8o8QyCvX2eO11UwQMD6RBZg/1rOVCMNGW30ok1+0xJo1TEm0pnClGR0EUOKfLiY3F8GdaehhDL97d0XBW5Cup8oIrLUmBHg3MIf/iTY6kPoW3GrUrZDZqfvne1GAcbQch6w/0iLD9iJvBh/KDV9H1fxT/pXzxv22IkPzXwmW1tmASFBobyTtvODTAfmNaQ4zKOzXkgrM69gx7q1lsj9WCoLNshZY0DFwS8Eq29zZQE6/n8MQwbY8Rg+ZmMIv9TXP8fF5Hcf7MeW1X+/tE+UyfyZVyCCtdaRDP0CcP0R8KNnooO3qhLABI/zXviuuu1SfCVP491qksKxo0CEmZfPRsV77zIM5nJiwGB4Io1I0RbcYrz7N/mbjVg== 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)(396003)(376002)(346002)(136003)(40470700004)(36840700001)(46966006)(450100002)(4326008)(47076005)(8676002)(70586007)(5660300002)(478600001)(81166007)(36860700001)(8936002)(7696005)(70206006)(426003)(83380400001)(44832011)(41300700001)(26005)(6666004)(2906002)(40460700003)(356005)(86362001)(16526019)(82310400005)(82740400003)(1076003)(40480700001)(316002)(36756003)(336012)(54906003)(110136005)(2616005)(6636002)(186003)(83323001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2022 10:20:51.7954 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5af96325-dad7-49f9-004b-08da8f284f65 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: CO1PEPF00001A5F.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4545 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 --- 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; }