From patchwork Fri Feb 2 19:32:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136340 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 5645543A53; Fri, 2 Feb 2024 20:33:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A626140A7A; Fri, 2 Feb 2024 20:33:15 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2078.outbound.protection.outlook.com [40.107.244.78]) by mails.dpdk.org (Postfix) with ESMTP id B34CC40268 for ; Fri, 2 Feb 2024 20:33:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WfFAnIdykCjN7gpc9OavAXFkk7b8BWlAzR4O1JnX3qIi2R8JYUAGXDClMGha0TYxaaqwQPmltsOlxhdlMiDgBy9Ot38EBNger+lVyjz55HssQ+U6sBkor+0irKinfganzOvGmUM7D8kYfm0Xv4sE5QhiRDF6eT2qKjMki0NBsaQNVyE/tY+Qs8nDVshrsj2ZjXGSLAwd3UVTxJjQYdYog/hjWbTBBi7ywnlLoJuiIYVBEj2YQ1HOOu4s/VYl2K+hUlRqkdiZFM4pYKlLiuP19gLBYy8W8YOcWBQVu9VLAt7IxoU6wquNEmR0ICNT428InSODJ+v0RWhwHtvKDuBehg== 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=VnjUuTNvh3P1kmLlB8IDpihoHlmAO5FwR2yDIWgbrWY=; b=hmAg1iVUUeRoimtpiaoE8L8GuFQ+Rd3pDEaBZdQWOlI/9BBcBIDk6trU42kYGeprwEFOgqkx3e4ANznTdmRSw60b5jhFw1D9bV0VkLjLxSABAoFWU++gnEmdQZ/4LS6/jonMDZ9N4SX+n4Z2eDDjS+pG/IOowi6AqpoqEzUV5SyR26LHcs8LPqydumFiTCJSOEoNVSOABRDmp/ne5fIkd7neCPDuV/FjCCD/bT399YuQRkuYQQOQiGM/OE0zBDKdLGO5ZUD9HU5Fdj/Oqjyg8qNMmA5XQMd2dTLvKVSijzAsBI6SE/Xn2l3IuxITfmYo7X2l9QY6Yv5yqUNLM1IZKg== 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 (0) 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=VnjUuTNvh3P1kmLlB8IDpihoHlmAO5FwR2yDIWgbrWY=; b=L+NeP8giMyZmGonS1FokdFV2avIADFMI4eR4nSak6AfBk/7x/a7yP3I8KLQGblLbYV6tG4U2Dwik5hlJQqMOllLx6Yc/k//pTO7u84duxGOlBmxIVOtfAmwyKvybpNqNqpZ93DrxrghE1zinHzXmYq76MSVQtITIa+j25UT9AKM= Received: from DM6PR03CA0059.namprd03.prod.outlook.com (2603:10b6:5:100::36) by SJ0PR12MB5423.namprd12.prod.outlook.com (2603:10b6:a03:301::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.12; Fri, 2 Feb 2024 19:33:07 +0000 Received: from DS1PEPF00017092.namprd03.prod.outlook.com (2603:10b6:5:100:cafe::ff) by DM6PR03CA0059.outlook.office365.com (2603:10b6:5:100::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.24 via Frontend Transport; Fri, 2 Feb 2024 19:33:07 +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 DS1PEPF00017092.mail.protection.outlook.com (10.167.17.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Fri, 2 Feb 2024 19:33:07 +0000 Received: from driver-dev1.pensando.io (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.2507.34; Fri, 2 Feb 2024 13:33:04 -0600 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH 01/13] net/ionic: add stat for completion queue entries processed Date: Fri, 2 Feb 2024 11:32:26 -0800 Message-ID: <20240202193238.62669-2-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240202193238.62669-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@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-TrafficTypeDiagnostic: DS1PEPF00017092:EE_|SJ0PR12MB5423:EE_ X-MS-Office365-Filtering-Correlation-Id: dc297743-a0f5-4d9c-9eb4-08dc2425c852 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ND8JMWENcPq2UgXm5UXUhfs0YsnxGRkMNfrNhraDl1ShIIQFsA5SKPGltYmnZYisDkTwtNtTQafFRyBM3BUsPQT62l9CVNDolVraYKjqV5yOb+R3ERj3e04/LejtHStzon9Pzqtm5x42hjXHjRH2miuCZjxRpl+CkZ1aSiKDMFTiuSCl2F6lIAbRcpnfKCTMoqfzovfcs3ILF/dbPOx5Ku4dECYoBt8a0YUCZLtMtEXx2vlAaq47INFuyDvvJq+wKOnIkcE1SnK2/o97GPkM59EKw52FU+WGjJFoWy20kM8ZzWNZezqGfM8LZ8w401Bec99KJ+yHGI/XteNHvHo9YBA8sbq2NIBdztC9fzBtIhtJwsJdhLqXpMVnid3BPeH19uBgSKq3Z6WUB2t9jgzHbNJCrTjXzSIvswNy8n8mA61sZqesQ2pf2pbiakzKPsCmZc9xeF5Tbs4DCcZvBHAqT5u1gAzk2Lp8Y6N1aEqV+MLqCWSvB6jVKp+/571igc3KQOLWOiLHquFbHc1ybgsrOdy+NYMrx7pDfPvJZjaeAp62TMfrpWs4QXaGHRBw4lNMMIbDIgkhlL6by35qp1gfE3A07hryqNoq5wbB2bzh7OI65O/ySsldRhBxJfKPC5u/qtUTnX8JWky1WiirjT3uq+6wecoqFbou5vTvt6oqGDgmiRX96w+ujYRbCaly5ugCsa0nPfq2r++ALK4hldBTjypq1fZ5A/aKHTxi2qMXITVQwor0vrmr+f2nAIMyH8+nPgzuTG47OnrNbVYAHJXxog== 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:(13230031)(4636009)(346002)(39860400002)(396003)(136003)(376002)(230922051799003)(186009)(64100799003)(82310400011)(451199024)(1800799012)(40470700004)(36840700001)(46966006)(40480700001)(40460700003)(41300700001)(86362001)(36756003)(478600001)(356005)(2616005)(81166007)(1076003)(16526019)(47076005)(26005)(2906002)(4326008)(36860700001)(5660300002)(82740400003)(6666004)(316002)(426003)(336012)(44832011)(6916009)(8936002)(70586007)(70206006)(8676002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 19:33:07.2234 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc297743-a0f5-4d9c-9eb4-08dc2425c852 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: DS1PEPF00017092.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5423 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 When completion coalescing is turned on in the FW, there will be fewer CQE than Tx packets. Expose the stat through debug logging. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_lif.h | 1 + drivers/net/ionic/ionic_rxtx.c | 3 +++ drivers/net/ionic/ionic_rxtx_sg.c | 2 ++ drivers/net/ionic/ionic_rxtx_simple.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/drivers/net/ionic/ionic_lif.h b/drivers/net/ionic/ionic_lif.h index 36b3bcc5a9..cac7a4583b 100644 --- a/drivers/net/ionic/ionic_lif.h +++ b/drivers/net/ionic/ionic_lif.h @@ -32,6 +32,7 @@ struct ionic_tx_stats { uint64_t packets; uint64_t bytes; + uint64_t comps; uint64_t drop; uint64_t stop; uint64_t no_csum; diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c index b9e73b4871..d92b231f8f 100644 --- a/drivers/net/ionic/ionic_rxtx.c +++ b/drivers/net/ionic/ionic_rxtx.c @@ -117,6 +117,9 @@ ionic_dev_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id) stats = &txq->stats; IONIC_PRINT(DEBUG, "TX queue %u pkts %ju tso %ju", txq->qcq.q.index, stats->packets, stats->tso); + IONIC_PRINT(DEBUG, "TX queue %u comps %ju (%ju per)", + txq->qcq.q.index, stats->comps, + stats->comps ? stats->packets / stats->comps : 0); return 0; } diff --git a/drivers/net/ionic/ionic_rxtx_sg.c b/drivers/net/ionic/ionic_rxtx_sg.c index ab8e56e91c..6c028a698c 100644 --- a/drivers/net/ionic/ionic_rxtx_sg.c +++ b/drivers/net/ionic/ionic_rxtx_sg.c @@ -26,6 +26,7 @@ ionic_tx_flush_sg(struct ionic_tx_qcq *txq) { struct ionic_cq *cq = &txq->qcq.cq; struct ionic_queue *q = &txq->qcq.q; + struct ionic_tx_stats *stats = &txq->stats; struct rte_mbuf *txm; struct ionic_txq_comp *cq_desc, *cq_desc_base = cq->base; void **info; @@ -72,6 +73,7 @@ ionic_tx_flush_sg(struct ionic_tx_qcq *txq) } cq_desc = &cq_desc_base[cq->tail_idx]; + stats->comps++; } } diff --git a/drivers/net/ionic/ionic_rxtx_simple.c b/drivers/net/ionic/ionic_rxtx_simple.c index 5f81856256..5969287b66 100644 --- a/drivers/net/ionic/ionic_rxtx_simple.c +++ b/drivers/net/ionic/ionic_rxtx_simple.c @@ -26,6 +26,7 @@ ionic_tx_flush(struct ionic_tx_qcq *txq) { struct ionic_cq *cq = &txq->qcq.cq; struct ionic_queue *q = &txq->qcq.q; + struct ionic_tx_stats *stats = &txq->stats; struct rte_mbuf *txm; struct ionic_txq_comp *cq_desc, *cq_desc_base = cq->base; void **info; @@ -67,6 +68,7 @@ ionic_tx_flush(struct ionic_tx_qcq *txq) } cq_desc = &cq_desc_base[cq->tail_idx]; + stats->comps++; } } From patchwork Fri Feb 2 19:32:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136341 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 259EF43A53; Fri, 2 Feb 2024 20:33:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE63042E13; Fri, 2 Feb 2024 20:33:16 +0100 (CET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2046.outbound.protection.outlook.com [40.107.101.46]) by mails.dpdk.org (Postfix) with ESMTP id 4B5894064C for ; Fri, 2 Feb 2024 20:33:14 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i9I1JGCR43muyl5I5h7YL9tKoIVXN+HBWGWu96e46zaaOiOTQ8i+YJyfAu04Uql30nXqtbidagkQWXnX/zmgCUKM1XYniVe/m7lqtCLQhxWV8eyAKlYGfShA1Jr9Wa/wGOrjVHWV/p89h/6l4/v+dAtFD9hpiF3DZdX01GFcUlrCvi3szyMjaVMVqsxGtiRVpWFC4FkDFkCzV/U57iumrbywLQpC6Esja6y43e7SNf0IZdQT6ANR80SpmbJQFZAWhNlgoc+yu9OgdPmLsUwgSt7mnwivf4gyv0O/f1Ebdzg1vvAgANHlNePRIwHilhJhOVWDBrizbRNuCnofDQ6Ncw== 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=/5MMSsL6BuyljqQdgX/pB3XE6mqWekFwV3tBbyA9kNk=; b=drM2EJ2nf/s00Uo8Kpw/0TdWFw6VVX2gJ0rSAqyM5Hgx3KD3Lg+orZZah1nt5mWazpQmsjXOoSccY70pqoFoHrrGgxY8h39higIYSgBPauRn2QpHyewUXJmk0ImDRUO0PR9vyfRYARoO2geWlDdrXGo3je0JUCNSN9TH93savVlyeMh1EVs+7913OYVFBaCUXkuPuCSVdcuVTi1peGH94pLGIatf60eo13a8NVd/MEnFZ8/jFPafcCVh8vJdrNdFEVcfT3gWnjIHEbsi9DQl04q6J+ombjIvj64gIJUK/Nh0P2vwL9ZR44fAlhLzKNQ9YqMErBO6gBjEos6Ky5s9PQ== 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 (0) 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=/5MMSsL6BuyljqQdgX/pB3XE6mqWekFwV3tBbyA9kNk=; b=IA9Ah+sO0wcSoKvoRO6UklvFU0AAFxkoPC5DfCVtV83Sqdz8hbdK4ZxruMJmkxvNrYeUpftVJqMWO220/zfuXEroxK+Yl65siHqnaxOMy1O0bPMVMqz0cEpkzen0uwhw61T5Si14NaukbsUo1OfxBkaMssfgygspJVQJPbbWFAI= Received: from DM6PR03CA0054.namprd03.prod.outlook.com (2603:10b6:5:100::31) by DM8PR12MB5495.namprd12.prod.outlook.com (2603:10b6:8:33::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.14; Fri, 2 Feb 2024 19:33:10 +0000 Received: from DS1PEPF00017092.namprd03.prod.outlook.com (2603:10b6:5:100:cafe::2e) by DM6PR03CA0054.outlook.office365.com (2603:10b6:5:100::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.24 via Frontend Transport; Fri, 2 Feb 2024 19:33:10 +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 DS1PEPF00017092.mail.protection.outlook.com (10.167.17.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Fri, 2 Feb 2024 19:33:10 +0000 Received: from driver-dev1.pensando.io (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.2507.34; Fri, 2 Feb 2024 13:33:08 -0600 From: Andrew Boyer To: CC: Andrew Boyer , Bhuvan Mital Subject: [PATCH 02/13] net/ionic: increase max supported MTU to 9750 bytes Date: Fri, 2 Feb 2024 11:32:27 -0800 Message-ID: <20240202193238.62669-3-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240202193238.62669-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@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-TrafficTypeDiagnostic: DS1PEPF00017092:EE_|DM8PR12MB5495:EE_ X-MS-Office365-Filtering-Correlation-Id: 496be7d2-78ab-448b-fc73-08dc2425ca57 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jjWBEk0AS8V1Zup7Ym7LRQWkSfc6FhmuC7tJuFfjB/9LS4Ahug7caj9fumfBA0t3jqEUIgtxHGfm8h3cGJdVQt7SU6BchFcdXGQbPpGNUSCSR+DP4JgPCGQfLtpf7ZkDKN9cPttwHtDsn2ikz1t03lBUQKIyKkK0MA6PBcQw9s3yTrwIWy6EM03Oq860Y7UIqLncUp+L0EJvCgsUmkkSzPjzkF9w/yWofq8fpmWftcFTOd+ZU9DwUZa5oOo9OPIK5sJwR034qGG3E6ZD9wYaO/0jwIfr0bIvneboBjClAYNX6rtwIAHoaemgILqOGYDBAZfLsha9RwbAG+5wZzd7aHPOu0Disby7lDM85lD3QNZUT8KJ/mYvxxIPlAhl+wfwnFSjExlqIjY/tXBYDiUTQWmvzaDWtsRlxhQ3o8voXZDJAAtObojnep7EkizoxZdlpCUQnA9CGiG7C3AxklQrG7W9/NtBMDxXT2JsCLY15/eBJrYnaRGbqGdZOSCnvKgrTwUVerfa8Kxam31rpEvMhVCM8Y1dXtXRx4XonToo26sFNtvoE/jlA1gcEhVniFvMVigSjYYGUAkZ2dTIgNelm5KCClSLYus5JlMiMF2O3YfOQpfGjGSNfg/cSUCfl8ADydbhUwh9ggfXQR7QY31Xvrxh5sHRkgx5Py2YxG6idgAH6oh4bxbkirLyoUMToPzPql9c+l+1+zZMLUvse0ScGk1si1GZEfhTsvKFzxJ6MXsbYz2dWimUdhM1M8eA1H6PIAVjaGYWmWT7rceBjFZCEw== 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:(13230031)(4636009)(376002)(396003)(346002)(136003)(39860400002)(230922051799003)(1800799012)(186009)(451199024)(82310400011)(64100799003)(40470700004)(36840700001)(46966006)(4744005)(40460700003)(40480700001)(2906002)(478600001)(5660300002)(83380400001)(356005)(44832011)(8936002)(8676002)(54906003)(316002)(47076005)(70206006)(36756003)(6916009)(6666004)(86362001)(70586007)(4326008)(1076003)(2616005)(426003)(336012)(41300700001)(26005)(81166007)(16526019)(82740400003)(36860700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 19:33:10.6140 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 496be7d2-78ab-448b-fc73-08dc2425ca57 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: DS1PEPF00017092.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR12MB5495 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 Some configurations want to use values this high internally. Allow them to do so without modifying the code. Signed-off-by: Andrew Boyer Signed-off-by: Bhuvan Mital --- drivers/net/ionic/ionic_dev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ionic/ionic_dev.h b/drivers/net/ionic/ionic_dev.h index b1e74fbd89..971c261b27 100644 --- a/drivers/net/ionic/ionic_dev.h +++ b/drivers/net/ionic/ionic_dev.h @@ -14,7 +14,7 @@ #define VLAN_TAG_SIZE 4 #define IONIC_MIN_MTU RTE_ETHER_MIN_MTU -#define IONIC_MAX_MTU 9378 +#define IONIC_MAX_MTU 9750 #define IONIC_ETH_OVERHEAD (RTE_ETHER_HDR_LEN + VLAN_TAG_SIZE) #define IONIC_MAX_RING_DESC 32768 From patchwork Fri Feb 2 19:32:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136342 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 08EF343A53; Fri, 2 Feb 2024 20:33:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3190542E50; Fri, 2 Feb 2024 20:33:18 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2041.outbound.protection.outlook.com [40.107.223.41]) by mails.dpdk.org (Postfix) with ESMTP id 5261042DC5 for ; Fri, 2 Feb 2024 20:33:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=irQx2oDbFmM1q1zkJ4JrGXdBefHlS9UJgJOOurTQ/ibtDq2HOhUgNnSy7HA3DyNaayIzliotSdKLlCqUD7dQ9wEFwFN1Ka+OEpTQCU+mFrq8l5md7Kx19K0zdJ2Y927hTUtWIE5nLkojzll+zZrFr8CXlRGhH8EB3Q4MNBnFsP2vnmyWDl9GIE4Rdzpvu0nyAdSE/lSOaJvxKRIlDUi7D5wnC3uI4etg1PEZ1GrmyxyBGVUMJBE8dHQEt5xjXEUuL1ddmOdjcZkeQTf1/N2W8SfObLvk2Y0vcFLTNZx8US/XXNILDe17EdLS8321t9SkkTG8ecvyuJFdJgekRIZ9AQ== 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=KZ6oICy5KqkhfY18QjOol/NtvCNsb3uhrZVW/XHP7vw=; b=gbsmC7MP05yXnE/c0dN6bXVO6d4BjznFX+gCoAH6tNs5XIsn4We5H0xO9HY2Zq2SC6klKQ7fFTeZ/q2g+omEupLrh+QryjNk61iwOP/ocRAx1QWb8XnXoCYRr3roCNB40qqe2iC606TMmMwnM/7sLbSbG/+cSYaDMPThv6uHx3WBuaC9RlzRXVAaY3+DAvp4z+CHKKvfcilL8AwieXgXo5tai3UjNYdpaGQXkgxcVIW21s1Voaoxd8HW6WBpzkUJiMTVkr4Q4YyvtpFWG8IshCUUeadUZALEemwFtkip/a/wtAJ9rZgJpSTDqvjPhIy392sPF1R/pIHKKxjKFnGPiw== 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 (0) 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=KZ6oICy5KqkhfY18QjOol/NtvCNsb3uhrZVW/XHP7vw=; b=BURQ0QG1RCykA0IMTXdGY79MBp9PJVlDPVh6a1Lcr9OgEnMdJbWl39x0vxuARF+rgwGz6QuaUNYz1YdqL80zuvExZVWIoAX6rs90eqyIeJ417binMZTUZht8jPtwVtFKuAyp0ll4TA85xsv9sBZoFbOrJceSvcVF+4ZbG+z3G/E= Received: from DS7PR03CA0266.namprd03.prod.outlook.com (2603:10b6:5:3b3::31) by IA0PR12MB8374.namprd12.prod.outlook.com (2603:10b6:208:40e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.14; Fri, 2 Feb 2024 19:33:12 +0000 Received: from DS1PEPF00017090.namprd03.prod.outlook.com (2603:10b6:5:3b3:cafe::5a) by DS7PR03CA0266.outlook.office365.com (2603:10b6:5:3b3::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.35 via Frontend Transport; Fri, 2 Feb 2024 19:33:12 +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 DS1PEPF00017090.mail.protection.outlook.com (10.167.17.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Fri, 2 Feb 2024 19:33:11 +0000 Received: from driver-dev1.pensando.io (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.2507.34; Fri, 2 Feb 2024 13:33:10 -0600 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH 03/13] net/ionic: don't auto-enable Rx scatter-gather a second time Date: Fri, 2 Feb 2024 11:32:28 -0800 Message-ID: <20240202193238.62669-4-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240202193238.62669-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@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-TrafficTypeDiagnostic: DS1PEPF00017090:EE_|IA0PR12MB8374:EE_ X-MS-Office365-Filtering-Correlation-Id: b803c0f5-1b2a-4ddb-c0dd-08dc2425cb1b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: msgyGq+B/x7IhagZyYU8W2MS/GDoXS3f5AnjRX7zvjg4EaYM3hcTptTxaYLdjgdIzKRGVU+mzejww9yPK7ZaZAYMuC8weiiLJNherAggiqhxIM2OwAVBo7QMOt7hTbpsSzQ6zg52LFmgUDXeesCqcisc8sdEk/BFWjnF79gYiSz/N8sNRUuGZRlntdC9KFbFkU/6m8iKYLjCpPVgl0WNoS72JP721hxchJDTk2Ch6dmQlxn7OkYpto5o7WtoRwlVRj91lsnxlX7tHvMV7OVfXtdRhOI0fpI7TcA0BWucqjtza9KxYY8g5APusZI+yp4ViopLbL1yQngNUbW8YRseQgvb2MR9cj2vW2U279yL4YSMWbRC8UQ+Vbeg1LKhWHiovq9qd6G7h3//+5lVLdFY1nZOh4U711P4MpB62mfx43Lx6J8SzYpbaubU0D9Tpr8/uwXoWZ6ZHy3p0hCCaNf9eH5YFFCTdLrzJlq7/RZE1dy+Gzu6qhkT9ZIA36AmnYOx42cYvgEVT7KF/LQBDOYdlm/gQ1IZ8eCMV4CRjl60BZyp3L8WH85XElcxJ0dDV2SqyXBlpwzLVw4DlzZwY3FEkfQzhutJ0d5rG6w7qWFt5RTRwYfakamwC1BNbCAmDG6Cmf1TKL9CrlUNnxJGtWMWWdmeeVBRCEdMZeQQ+BXDBvdlxkpmpyCBY7PcbkVLqCBi9QIbF6ofGvKZ0a3pYNBNEQrY2FLr5wU0j4qBpYTbyKoOLwm9eSh2MnxMJTeCLglXpjWW+oywIaxD6MfBcufAFA== 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:(13230031)(4636009)(39860400002)(346002)(136003)(396003)(376002)(230922051799003)(82310400011)(186009)(64100799003)(451199024)(1800799012)(36840700001)(40470700004)(46966006)(82740400003)(47076005)(81166007)(36756003)(356005)(8936002)(6666004)(8676002)(6916009)(316002)(83380400001)(36860700001)(40460700003)(40480700001)(2906002)(4744005)(336012)(426003)(86362001)(44832011)(4326008)(478600001)(5660300002)(26005)(16526019)(70586007)(2616005)(70206006)(41300700001)(1076003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 19:33:11.8970 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b803c0f5-1b2a-4ddb-c0dd-08dc2425cb1b 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: DS1PEPF00017090.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8374 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 The receive side will enable scatter-gather if required based on the mbuf size. If the client already enabled it in the config, it does not need to be enabled again. This reduces log output. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_lif.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 25b490deb6..fe2112c057 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -768,7 +768,8 @@ ionic_rx_qcq_alloc(struct ionic_lif *lif, uint32_t socket_id, uint32_t index, max_mtu = rte_le_to_cpu_32(lif->adapter->ident.lif.eth.max_mtu); /* If mbufs are too small to hold received packets, enable SG */ - if (max_mtu > hdr_seg_size) { + if (max_mtu > hdr_seg_size && + !(lif->features & IONIC_ETH_HW_RX_SG)) { IONIC_PRINT(NOTICE, "Enabling RX_OFFLOAD_SCATTER"); lif->eth_dev->data->dev_conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_SCATTER; From patchwork Fri Feb 2 19:32:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136344 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 6C89243A53; Fri, 2 Feb 2024 20:33:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CED3A42E8B; Fri, 2 Feb 2024 20:33:21 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2042.outbound.protection.outlook.com [40.107.244.42]) by mails.dpdk.org (Postfix) with ESMTP id AFF9542E75; Fri, 2 Feb 2024 20:33:19 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gyZoB/5sr1N4IAtfooxMgeLcv2H3nP2yZc1SGepXRH92v1BP8xhwCpZrry8QA0DSuSicXyS7Vk3rzLGQ+Vwvek38iQcXJ2XsXV7bJdSg/wsczHhL3pS9x+jPrLBEXlNFm2JzaI+tMRbT/6jIrk6nIfUID60z5UlibWQX6Xz0qlnwfNe3lftv51IJTTM1t6JOdKa0871r/iCnh0fCbigcSXsNVgmjj2/6sMbroITm4CaM95Igwy2dax0wb42rXe0GZwjhjFWQkFdpRMXXxb1mMR0CMRXuV/pRHGasR8idJaL71wbxPyOQyjjI++Su5nL4TtsirP46Qck4JbV7shcWWw== 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=hdbNK4cDDyjob2hzNPI5WkWb16qJXwQWFqAbjSI/Qtw=; b=bbY+DqH2oqCO0ARRz8WXwTbKzi0RLHx4imZGC3vQJHZZnsM++qR2n03MxM/mI7VOnEWjJoveA9bgYqVKP4Z7HnLGQYGJvREjFZt0WSqViyB5jV5GtF0WhEHvxzur0UvuWwZBKWfyl91q0vnmYjeDCC1AlxgjmUgfM4SqpHra6RHpTY33kMbjMm9klTb1paJfNKiOyB2lBALNyOtyuOIL7aNA2BSg68/3kR7KhrVUL7E7gyqdpCl39klaL8BHPbjRqgCucQaQje473I1imIxux4GGznYK70AcwEehrXLLbO9hBSwJ01gv5ZHs1Ykj80cWTNHmhsT2Ty8ypSuBSzliRQ== 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 (0) 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=hdbNK4cDDyjob2hzNPI5WkWb16qJXwQWFqAbjSI/Qtw=; b=BZWQwDSeS/Yv0b4r1biE5YqXSTBxKeN+JTBN+lBExsCsj4JuWbyAVFBmc23dyDhZaxaBMahL2WhWBjcwBRFjELeuW9RXCv5LK1L4kQUY28+hWgGpuHVh/EDZaLXsOKjUYfKJ7BFajsCai7ay16rLXBuSInMeWDVhFgr0B886//g= Received: from DM6PR10CA0020.namprd10.prod.outlook.com (2603:10b6:5:60::33) by CH2PR12MB4327.namprd12.prod.outlook.com (2603:10b6:610:7d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.14; Fri, 2 Feb 2024 19:33:15 +0000 Received: from DS1PEPF0001708F.namprd03.prod.outlook.com (2603:10b6:5:60:cafe::73) by DM6PR10CA0020.outlook.office365.com (2603:10b6:5:60::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.24 via Frontend Transport; Fri, 2 Feb 2024 19:33:15 +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 DS1PEPF0001708F.mail.protection.outlook.com (10.167.17.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Fri, 2 Feb 2024 19:33:14 +0000 Received: from driver-dev1.pensando.io (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.2507.34; Fri, 2 Feb 2024 13:33:13 -0600 From: Andrew Boyer To: CC: Neel Patel , , Andrew Boyer Subject: [PATCH 04/13] net/ionic: fix missing volatile type for cqe pointers Date: Fri, 2 Feb 2024 11:32:29 -0800 Message-ID: <20240202193238.62669-5-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240202193238.62669-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@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-TrafficTypeDiagnostic: DS1PEPF0001708F:EE_|CH2PR12MB4327:EE_ X-MS-Office365-Filtering-Correlation-Id: 583fec33-9826-432e-81f5-08dc2425ccf9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: izNc0T7+YcrkD0wUivBXf8l4HPD0hIK//zDpVNIEUIpuslWrbHfJ1IZFu3wz+IfqWWf0UC8kd65TJPbAehECx85cRz+T9A77cgUwC5xF/Mt9gLMkptWa3LBMQDYmyVfIOyBpzJxXTErsu4jiz6/0AOmaCXszspHedFnmKfiBUAiBZz4EOb4NYjvacdVHjqsAYG6/qQihJ3dm2NtkhRAfYwGYGNUE1ceBAR+7ww1DsyUm9yPgPFy5DF6Tt5N8nHK0XKpCvcL0ITCO2Xvpz5D5TygjHoVsC20IOM+l0shbT04wqZASOu7bE0GZMQy74TFBI8iMyvAxXKSeEVQH0JlU2arBCtqTPPAdfF08nvRMAn0SUHGnqZywlO8OBcoPyRABIBbaH58xsYVTzOTkDdoXfTQJop/p06wf2XZG5tNEdwbE7xQuFh98JrHQYOlQ51vazP+/NcBHn3mlFvj1DIdBGHD/YvUHPcctZgdZq9dTiAcKx9Y1IzDoDgkgR/BMGk7V+UjgKB0D3oyEFmkuB3nMAojCM03JXDZkaEaU3e0eSV6cgCe6O3/axhGSWPJt+2mbx/p9hxdGv9jlBZGcPdaWXWA7TNlsn6aufZLxlSiGuw9IlCZLRreqgWmjWL9XJa8azk79qf4cOREvzbKC+8qkUX2PTo6HwWInO3HVNkX5zO+De/0RGPDzg/55Bj1UA+8+RKunZ7Hd7z4v8LgDZHUbeLhTGNlHdYGsIg32PO7KVolf4uJOX6TWleC0j68cb1nWG+hpajsB/wlpjB1vTr7dZw== 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:(13230031)(4636009)(39860400002)(346002)(396003)(136003)(376002)(230922051799003)(64100799003)(186009)(82310400011)(1800799012)(451199024)(36840700001)(46966006)(40470700004)(83380400001)(82740400003)(1076003)(41300700001)(44832011)(26005)(5660300002)(356005)(36860700001)(47076005)(81166007)(2616005)(16526019)(6666004)(426003)(336012)(40480700001)(40460700003)(8676002)(8936002)(4326008)(70586007)(70206006)(36756003)(478600001)(450100002)(316002)(86362001)(54906003)(6916009)(2906002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 19:33:14.9655 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 583fec33-9826-432e-81f5-08dc2425ccf9 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: DS1PEPF0001708F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4327 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: Neel Patel This memory may be changed by the hardware, so the volatile keyword is required for correctness. Fixes: e86a6fcc7cf3 ("net/ionic: add optimized non-scattered Rx/Tx") cc: stable@dpdk.org Signed-off-by: Andrew Boyer Signed-off-by: Neel Patel --- drivers/net/ionic/ionic_rxtx.c | 4 ++-- drivers/net/ionic/ionic_rxtx_sg.c | 8 +++++--- drivers/net/ionic/ionic_rxtx_simple.c | 8 +++++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c index d92b231f8f..d92fa1cca7 100644 --- a/drivers/net/ionic/ionic_rxtx.c +++ b/drivers/net/ionic/ionic_rxtx.c @@ -755,7 +755,7 @@ ionic_dev_rx_descriptor_status(void *rx_queue, uint16_t offset) { struct ionic_rx_qcq *rxq = rx_queue; struct ionic_qcq *qcq = &rxq->qcq; - struct ionic_rxq_comp *cq_desc; + volatile struct ionic_rxq_comp *cq_desc; uint16_t mask, head, tail, pos; bool done_color; @@ -794,7 +794,7 @@ ionic_dev_tx_descriptor_status(void *tx_queue, uint16_t offset) { struct ionic_tx_qcq *txq = tx_queue; struct ionic_qcq *qcq = &txq->qcq; - struct ionic_txq_comp *cq_desc; + volatile struct ionic_txq_comp *cq_desc; uint16_t mask, head, tail, pos, cq_pos; bool done_color; diff --git a/drivers/net/ionic/ionic_rxtx_sg.c b/drivers/net/ionic/ionic_rxtx_sg.c index 6c028a698c..1392342463 100644 --- a/drivers/net/ionic/ionic_rxtx_sg.c +++ b/drivers/net/ionic/ionic_rxtx_sg.c @@ -28,7 +28,8 @@ ionic_tx_flush_sg(struct ionic_tx_qcq *txq) struct ionic_queue *q = &txq->qcq.q; struct ionic_tx_stats *stats = &txq->stats; struct rte_mbuf *txm; - struct ionic_txq_comp *cq_desc, *cq_desc_base = cq->base; + struct ionic_txq_comp *cq_desc_base = cq->base; + volatile struct ionic_txq_comp *cq_desc; void **info; uint32_t i; @@ -254,7 +255,7 @@ ionic_xmit_pkts_sg(void *tx_queue, struct rte_mbuf **tx_pkts, */ static __rte_always_inline void ionic_rx_clean_one_sg(struct ionic_rx_qcq *rxq, - struct ionic_rxq_comp *cq_desc, + volatile struct ionic_rxq_comp *cq_desc, struct ionic_rx_service *rx_svc) { struct ionic_queue *q = &rxq->qcq.q; @@ -440,7 +441,8 @@ ionic_rxq_service_sg(struct ionic_rx_qcq *rxq, uint32_t work_to_do, struct ionic_cq *cq = &rxq->qcq.cq; struct ionic_queue *q = &rxq->qcq.q; struct ionic_rxq_desc *q_desc_base = q->base; - struct ionic_rxq_comp *cq_desc, *cq_desc_base = cq->base; + struct ionic_rxq_comp *cq_desc_base = cq->base; + volatile struct ionic_rxq_comp *cq_desc; uint32_t work_done = 0; uint64_t then, now, hz, delta; diff --git a/drivers/net/ionic/ionic_rxtx_simple.c b/drivers/net/ionic/ionic_rxtx_simple.c index 5969287b66..00152c885a 100644 --- a/drivers/net/ionic/ionic_rxtx_simple.c +++ b/drivers/net/ionic/ionic_rxtx_simple.c @@ -28,7 +28,8 @@ ionic_tx_flush(struct ionic_tx_qcq *txq) struct ionic_queue *q = &txq->qcq.q; struct ionic_tx_stats *stats = &txq->stats; struct rte_mbuf *txm; - struct ionic_txq_comp *cq_desc, *cq_desc_base = cq->base; + struct ionic_txq_comp *cq_desc_base = cq->base; + volatile struct ionic_txq_comp *cq_desc; void **info; cq_desc = &cq_desc_base[cq->tail_idx]; @@ -227,7 +228,7 @@ ionic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, */ static __rte_always_inline void ionic_rx_clean_one(struct ionic_rx_qcq *rxq, - struct ionic_rxq_comp *cq_desc, + volatile struct ionic_rxq_comp *cq_desc, struct ionic_rx_service *rx_svc) { struct ionic_queue *q = &rxq->qcq.q; @@ -361,7 +362,8 @@ ionic_rxq_service(struct ionic_rx_qcq *rxq, uint32_t work_to_do, struct ionic_cq *cq = &rxq->qcq.cq; struct ionic_queue *q = &rxq->qcq.q; struct ionic_rxq_desc *q_desc_base = q->base; - struct ionic_rxq_comp *cq_desc, *cq_desc_base = cq->base; + struct ionic_rxq_comp *cq_desc_base = cq->base; + volatile struct ionic_rxq_comp *cq_desc; uint32_t work_done = 0; uint64_t then, now, hz, delta; From patchwork Fri Feb 2 19:32:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136343 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 BA26443A53; Fri, 2 Feb 2024 20:33:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B002A42E7C; Fri, 2 Feb 2024 20:33:20 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2072.outbound.protection.outlook.com [40.107.94.72]) by mails.dpdk.org (Postfix) with ESMTP id 16AF342E59 for ; Fri, 2 Feb 2024 20:33:19 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PvxEs8SQQuxCopXVjofSnMP3J9OnNEpogejGOpfPrtKVZeb05Z3VF4aHbjIZ/K230fhy0XV0wxpUgmX0CokVkeV2dakI7ky6cuSpn4Ywli8y+v4y/MIqsrSMXtDIhpdzuznFWVoYjByY8/mvaRDp3wZFbg68QqwGdjY2SKL6ClWZLLWTrLFrTqcKjhpCNKzrHb4r92JiT54xWeYuyX5Z4DXepsQeR/XVcG147bjByXoLypINn4L1dzBqHhx7kZfq2r40U+L1hYNLW9pS2EExKQ6JNmIFssl8ZvUg9J429BNdSdVhpJScLGSeIZJk68HcMFZhia7IrZmPcoFGhFkuiw== 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=8RupnZ6K7Mo4qbzkB1Rcgrksg0HfqoRh3Hny9QpcZjE=; b=cjpP4d00aDA17lXs3RuKLi7j4z5jupnAgzBtnWN1Z+LUDtj5AdAefyulvWq8L9lln4KQgABAhCI1HoG10Sqn1quNxD8JzbbnY285AqvLtjEOlqlm2gxg1wyM4OFUA81MEnkDXCPUD+HgZaagHdBHst+p4Fws+KAGKNudxRzeWKsbyUrv3rcpWxErq1GXLiaw0e0lGj4mJFQu+hlbbEYsh06J9vEctI0uuEf/+QRs+4GHzX5xeQNo7o1TG4B0oOjdgZwwPBnERJAHnj3A4icKkFgDvbXVbmZZ4plXDaOusME8AoTopxuzkCKxzcDR3/7PP2BAc5FzLYd91k+WI7V1mg== 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 (0) 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=8RupnZ6K7Mo4qbzkB1Rcgrksg0HfqoRh3Hny9QpcZjE=; b=BeObUH5GTBRuozLOdF4ZulzLAvndqzFgdsulzjdtqYkQPHkvGPtVlyZOYqw8u2IbHKCvZ4xiwk9ReWIKNVyFbdeY7X5x0MRw7e4JdoX1RBQOcX9xYmmhrdWoWj5LW5YvMH91bp3akhbOOou0u8QPjlKfaxz+En4Ci5LtaFTv1DM= Received: from DM6PR10CA0032.namprd10.prod.outlook.com (2603:10b6:5:60::45) by DS0PR12MB7533.namprd12.prod.outlook.com (2603:10b6:8:132::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.9; Fri, 2 Feb 2024 19:33:16 +0000 Received: from DS1PEPF0001708F.namprd03.prod.outlook.com (2603:10b6:5:60:cafe::a) by DM6PR10CA0032.outlook.office365.com (2603:10b6:5:60::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.24 via Frontend Transport; Fri, 2 Feb 2024 19:33:16 +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 DS1PEPF0001708F.mail.protection.outlook.com (10.167.17.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Fri, 2 Feb 2024 19:33:16 +0000 Received: from driver-dev1.pensando.io (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.2507.34; Fri, 2 Feb 2024 13:33:15 -0600 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH 05/13] net/ionic: replace non-standard type in structure definition Date: Fri, 2 Feb 2024 11:32:30 -0800 Message-ID: <20240202193238.62669-6-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240202193238.62669-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@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-TrafficTypeDiagnostic: DS1PEPF0001708F:EE_|DS0PR12MB7533:EE_ X-MS-Office365-Filtering-Correlation-Id: 59b40cce-5616-42da-63a3-08dc2425cdde X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pleuhlLfsX8gr0p0Hn1h2VLDb2fA1pvuAnLATS8ANqr9/EKH82VO9wE8XtoYjv+BNcJIRWOnjAPtbXdh5K07Xk5n4N5Agp4GRjqvV+IqAJPXpVxQgl6eBdtwRumtaj23hzfzy0AF2G1ANVxLfuiZdacNXIf8+nhzJcQ2wF2bZN5nFVr3MFj85AGg+LPke5bOcCWI+I9tpwoqPWWLG9eH2CxaeAI8LrdQ6UKsbmjPS8PQPNETy1+DFiNslLLDYITzGvBxSwCanlCswZ5HBQuUuono9OfgnGBCUHnb4SidH8dVuP/e9gKw/PYKyPKeU9qXrS7mJlW7/3JI0DS83qzNAswc/NL+DHA6iRsp5T/Xen1r6gV4sIhMBaQPgil5O/DnxTr94Z1nsvBgqjkWipS3ylFzdnfC3hdBqgkLGtzffSLaxNSz1Flz2XfBh02ZdFY584JFBQwZYxv8O9wNBZUufl7V8evN8ak91dP+pjRRXF9xOx6QFTdp3leR6UTgREf7NFHyPyvfbw0Qg6XOT9o2BQ2uldwP2U/Q6XXVZ0w8VMy9a3AZ6n2K1GPQd58XwpwhGjQnj4P5AH0k9k4QpNswlw5l7ne0OUf/Seud0afqyWpp58rjKdiPDreipdPyXA51tuCFbGhIMw9NvgZ2f1ssOLKOJfQvdC3shhCGytiwJMU2C5uhfk3KCSpro82e2JgUlTJqPPKtmS0vaoF9JwnmVoeAA91rOn78nYWllFqwlbSELX0zCoXIU41moevTUYTvOGO2TYbm3GbJlhif9RlRoQ== 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:(13230031)(4636009)(136003)(39860400002)(396003)(346002)(376002)(230922051799003)(1800799012)(64100799003)(451199024)(186009)(82310400011)(46966006)(40470700004)(36840700001)(41300700001)(336012)(83380400001)(2616005)(26005)(36860700001)(6666004)(8936002)(4744005)(426003)(16526019)(356005)(2906002)(6916009)(81166007)(1076003)(82740400003)(316002)(44832011)(5660300002)(8676002)(70206006)(478600001)(4326008)(70586007)(36756003)(47076005)(86362001)(40460700003)(40480700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 19:33:16.4655 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 59b40cce-5616-42da-63a3-08dc2425cdde 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: DS1PEPF0001708F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7533 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 Use uint8_t instead of u_char. This simplifies the code. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_dev_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ionic/ionic_dev_pci.c b/drivers/net/ionic/ionic_dev_pci.c index 5e74a6da71..cbaac2c5bc 100644 --- a/drivers/net/ionic/ionic_dev_pci.c +++ b/drivers/net/ionic/ionic_dev_pci.c @@ -38,7 +38,7 @@ ionic_pci_setup(struct ionic_adapter *adapter) struct ionic_dev *idev = &adapter->idev; struct rte_pci_device *bus_dev = adapter->bus_dev; uint32_t sig; - u_char *bar0_base; + uint8_t *bar0_base; unsigned int i; /* BAR0: dev_cmd and interrupts */ From patchwork Fri Feb 2 19:32:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136348 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 7524B43A53; Fri, 2 Feb 2024 20:34:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CE00742EAE; Fri, 2 Feb 2024 20:33:29 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2069.outbound.protection.outlook.com [40.107.244.69]) by mails.dpdk.org (Postfix) with ESMTP id 6D94942E98 for ; Fri, 2 Feb 2024 20:33:26 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VNVySuKwZpxeo8fkm98j1Y3caCyvaSEHuFBrU5Pmes8Wa4G2UWtYlU03FDTPi1qHDAqe/tYi+l+oARfQpdIIuhkqIf+HT99Y3fIgwyFldfSvom5t/Vp/DWtFpOtgGg7yywNPKF7z+1bwzzNbwWkgl8jlDDdWcRybr6QbTFcJcvl2M9pS8o6/y0kmYzV7AaF3TOHnmPxrd+LXFmpykE/lEyKGjDiGNHS+U7xwPb0WmNItMtgbvOWL6Lnbx6FGkaTS6DF0YhKyLUNmGjqmQrKxEiy1TV2hoeNrIFGhzjygRy6KE47O6Qd38tZLrxFBb8pu20bsTVKE84W5ZtTGkZyuAw== 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=Piv+91DX9Ew8AtbrutD+yjnuUa3Llhmpuv88ba/t/Rs=; b=Ssa0Ehr2I8OdZwV4cZvPInyVhhojztPfVLlfsF6XLS4o04xA1pEH033u/cj8lp16un+p/2Nm1OTVUd1pZL5p0jzcveqJGdxff8FtxTiaLcJyWe9UQeXnxWV2cF84VzWHlBdLNJ19P0AcP67VKRWJrKFbiBslQ403hrNAaqi1qGsZnh4s0GjdOw0obOu2JSdP113ozHPfy/sZsBzhogKmp2J+rqzhdYtiRx6jeg6lYnHfJAuCF5Ud1iM+AQzQ3I06csGnOCpwBYuG0+b84FlgvM9obGJGGOM2eZGsCmRhjO9WtqfrwZi9AF7Rxtj+h/7+UIRZZRGUPIt4CU9J4zV7rQ== 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 (0) 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=Piv+91DX9Ew8AtbrutD+yjnuUa3Llhmpuv88ba/t/Rs=; b=ashO9GbynUYNWlgRWKirMYV/dQgWL4fVnOTPl26T2lRfUssp5eGmikok15TpMeUoHju4e+gG0AO+W3DSLzaHTd3kcyu/QPupUTyu9AdUj8viVwH/J2FOrFfDZTNRIiEti3jT7uwSpQcSH0RVnSWx9FQ4hEuYX0A9RqS8AuPrb4A= Received: from DM6PR10CA0033.namprd10.prod.outlook.com (2603:10b6:5:60::46) by PH7PR12MB8038.namprd12.prod.outlook.com (2603:10b6:510:27c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.27; Fri, 2 Feb 2024 19:33:19 +0000 Received: from DS1PEPF0001708F.namprd03.prod.outlook.com (2603:10b6:5:60:cafe::27) by DM6PR10CA0033.outlook.office365.com (2603:10b6:5:60::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.22 via Frontend Transport; Fri, 2 Feb 2024 19:33:18 +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 DS1PEPF0001708F.mail.protection.outlook.com (10.167.17.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Fri, 2 Feb 2024 19:33:18 +0000 Received: from driver-dev1.pensando.io (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.2507.34; Fri, 2 Feb 2024 13:33:17 -0600 From: Andrew Boyer To: CC: Neel Patel , Andrew Boyer Subject: [PATCH 06/13] net/ionic: memcpy descriptors when using Q-in-CMB Date: Fri, 2 Feb 2024 11:32:31 -0800 Message-ID: <20240202193238.62669-7-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240202193238.62669-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@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-TrafficTypeDiagnostic: DS1PEPF0001708F:EE_|PH7PR12MB8038:EE_ X-MS-Office365-Filtering-Correlation-Id: 282d84a0-36c1-4e9b-0744-08dc2425cf06 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +Svv/WrGXz6mJ3rxVTg41AhMEAF/XY/fz4sMrnm3vCITdp3aDqjs0hSKfAfFw1PW2c4xWu1SL2OVKL+/rP7Q7WSEEQSd8cCL+tGwGUs9ObC8zN2+ERgkBuUotx/A0oQ+QhBha1hA2OQZJ6C/oIb8SOKiF4DdQ98TdNNT7tGI4JDzO9DtvgaOp0TmKrZ997W/uhs7ZwHW8Tqy6GNzZ1WF/DgtIKV1DQuD5uI1X7kf4wOPBMXNyDsn3R1NiQjLCNbZQFzweppUUYJwI6WlcMRQbWhKeFxGfNtGM8HeNIoNTOBwA1jpD2NapDwF/Wvs+iTv9SFvjx6dwl2GR1AUTYxU1rBM3GIiaMaatZp7hfLObKsR36GWapl8XrNmc/MBV7TR0c7bLX0vJjmA4yAgLxpS3PGElIeE6N1ropyV49B5AMPArvKQKF/IS3KanlXEVHdUMZappLICB3EMrGMYnMYyuXSLwY8gLCnjhP5qm5xASFXb0ZFO8SAEH42ml3MOd13TXN289eNyujp2s+iqvn25mS9TCCpsIaEPu//vyxAiy5BjB/UqbUWD10vfMEEB65qIfDKGrX1OoeklOlNtYO1xaMzgU9vUur5Ya2Nn7HaGwWJ2XJzfzDpJj5+Qp4Il3Zru5XZ5L0T6aYgw8d0/K4sNgzSDczjn6KLgcOISqFmKnYoqiZlgPmeJnnRM+HVUpBxJW8VEREjKeM7L6pfOznBEOLLlknXLYT+mAGMZkU2Z7Rej7f7iNVMe/ZlVjxbvwpSS9Hz59ue0K/bi6pSqbWzmUg== 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:(13230031)(4636009)(39860400002)(346002)(136003)(376002)(396003)(230922051799003)(186009)(1800799012)(64100799003)(451199024)(82310400011)(46966006)(36840700001)(40470700004)(83380400001)(40460700003)(40480700001)(356005)(86362001)(36756003)(36860700001)(82740400003)(426003)(1076003)(41300700001)(26005)(81166007)(2616005)(47076005)(5660300002)(16526019)(336012)(6666004)(8676002)(316002)(70206006)(6916009)(478600001)(54906003)(8936002)(4326008)(2906002)(70586007)(30864003)(44832011)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 19:33:18.4655 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 282d84a0-36c1-4e9b-0744-08dc2425cf06 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: DS1PEPF0001708F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8038 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: Neel Patel They can be batched together this way, reducing the number of PCIe transactions. This improves transmit PPS by up to 50% in some configurations. Signed-off-by: Andrew Boyer Signed-off-by: Neel Patel --- drivers/net/ionic/ionic_dev.c | 9 +++-- drivers/net/ionic/ionic_dev.h | 6 ++- drivers/net/ionic/ionic_lif.c | 26 +++++++++---- drivers/net/ionic/ionic_rxtx.h | 56 +++++++++++++++++++++++++++ drivers/net/ionic/ionic_rxtx_sg.c | 18 ++++----- drivers/net/ionic/ionic_rxtx_simple.c | 18 ++++----- 6 files changed, 101 insertions(+), 32 deletions(-) diff --git a/drivers/net/ionic/ionic_dev.c b/drivers/net/ionic/ionic_dev.c index 70c14882ed..7f15914f74 100644 --- a/drivers/net/ionic/ionic_dev.c +++ b/drivers/net/ionic/ionic_dev.c @@ -369,17 +369,19 @@ ionic_q_init(struct ionic_queue *q, uint32_t index, uint16_t num_descs) q->index = index; q->num_descs = num_descs; q->size_mask = num_descs - 1; - q->head_idx = 0; - q->tail_idx = 0; + ionic_q_reset(q); return 0; } void -ionic_q_map(struct ionic_queue *q, void *base, rte_iova_t base_pa) +ionic_q_map(struct ionic_queue *q, void *base, rte_iova_t base_pa, + void *cmb_base, rte_iova_t cmb_base_pa) { q->base = base; q->base_pa = base_pa; + q->cmb_base = cmb_base; + q->cmb_base_pa = cmb_base_pa; } void @@ -393,5 +395,6 @@ void ionic_q_reset(struct ionic_queue *q) { q->head_idx = 0; + q->cmb_head_idx = 0; q->tail_idx = 0; } diff --git a/drivers/net/ionic/ionic_dev.h b/drivers/net/ionic/ionic_dev.h index 971c261b27..3a366247f1 100644 --- a/drivers/net/ionic/ionic_dev.h +++ b/drivers/net/ionic/ionic_dev.h @@ -145,11 +145,13 @@ struct ionic_queue { uint16_t num_descs; uint16_t num_segs; uint16_t head_idx; + uint16_t cmb_head_idx; uint16_t tail_idx; uint16_t size_mask; uint8_t type; uint8_t hw_type; void *base; + void *cmb_base; void *sg_base; struct ionic_doorbell __iomem *db; void **info; @@ -158,6 +160,7 @@ struct ionic_queue { uint32_t hw_index; rte_iova_t base_pa; rte_iova_t sg_base_pa; + rte_iova_t cmb_base_pa; }; #define IONIC_INTR_NONE (-1) @@ -244,7 +247,8 @@ uint32_t ionic_cq_service(struct ionic_cq *cq, uint32_t work_to_do, int ionic_q_init(struct ionic_queue *q, uint32_t index, uint16_t num_descs); void ionic_q_reset(struct ionic_queue *q); -void ionic_q_map(struct ionic_queue *q, void *base, rte_iova_t base_pa); +void ionic_q_map(struct ionic_queue *q, void *base, rte_iova_t base_pa, + void *cmb_base, rte_iova_t cmb_base_pa); void ionic_q_sg_map(struct ionic_queue *q, void *base, rte_iova_t base_pa); static inline uint16_t diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index fe2112c057..2713f8aa24 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -572,10 +572,11 @@ ionic_qcq_alloc(struct ionic_lif *lif, { struct ionic_qcq *new; uint32_t q_size, cq_size, sg_size, total_size; - void *q_base, *cq_base, *sg_base; + void *q_base, *cmb_q_base, *cq_base, *sg_base; rte_iova_t q_base_pa = 0; rte_iova_t cq_base_pa = 0; rte_iova_t sg_base_pa = 0; + rte_iova_t cmb_q_base_pa = 0; size_t page_size = rte_mem_page_size(); int err; @@ -666,19 +667,22 @@ ionic_qcq_alloc(struct ionic_lif *lif, IONIC_PRINT(ERR, "Cannot reserve queue from NIC mem"); return -ENOMEM; } - q_base = (void *) + cmb_q_base = (void *) ((uintptr_t)lif->adapter->bars.bar[2].vaddr + (uintptr_t)lif->adapter->cmb_offset); /* CMB PA is a relative address */ - q_base_pa = lif->adapter->cmb_offset; + cmb_q_base_pa = lif->adapter->cmb_offset; lif->adapter->cmb_offset += q_size; + } else { + cmb_q_base = NULL; + cmb_q_base_pa = 0; } IONIC_PRINT(DEBUG, "Q-Base-PA = %#jx CQ-Base-PA = %#jx " "SG-base-PA = %#jx", q_base_pa, cq_base_pa, sg_base_pa); - ionic_q_map(&new->q, q_base, q_base_pa); + ionic_q_map(&new->q, q_base, q_base_pa, cmb_q_base, cmb_q_base_pa); ionic_cq_map(&new->cq, cq_base, cq_base_pa); *qcq = new; @@ -1583,7 +1587,6 @@ ionic_lif_txq_init(struct ionic_tx_qcq *txq) .flags = rte_cpu_to_le_16(IONIC_QINIT_F_ENA), .intr_index = rte_cpu_to_le_16(IONIC_INTR_NONE), .ring_size = rte_log2_u32(q->num_descs), - .ring_base = rte_cpu_to_le_64(q->base_pa), .cq_ring_base = rte_cpu_to_le_64(cq->base_pa), .sg_ring_base = rte_cpu_to_le_64(q->sg_base_pa), }, @@ -1592,8 +1595,12 @@ ionic_lif_txq_init(struct ionic_tx_qcq *txq) if (txq->flags & IONIC_QCQ_F_SG) ctx.cmd.q_init.flags |= rte_cpu_to_le_16(IONIC_QINIT_F_SG); - if (txq->flags & IONIC_QCQ_F_CMB) + if (txq->flags & IONIC_QCQ_F_CMB) { ctx.cmd.q_init.flags |= rte_cpu_to_le_16(IONIC_QINIT_F_CMB); + ctx.cmd.q_init.ring_base = rte_cpu_to_le_64(q->cmb_base_pa); + } else { + ctx.cmd.q_init.ring_base = rte_cpu_to_le_64(q->base_pa); + } IONIC_PRINT(DEBUG, "txq_init.index %d", q->index); IONIC_PRINT(DEBUG, "txq_init.ring_base 0x%" PRIx64 "", q->base_pa); @@ -1638,7 +1645,6 @@ ionic_lif_rxq_init(struct ionic_rx_qcq *rxq) .flags = rte_cpu_to_le_16(IONIC_QINIT_F_ENA), .intr_index = rte_cpu_to_le_16(IONIC_INTR_NONE), .ring_size = rte_log2_u32(q->num_descs), - .ring_base = rte_cpu_to_le_64(q->base_pa), .cq_ring_base = rte_cpu_to_le_64(cq->base_pa), .sg_ring_base = rte_cpu_to_le_64(q->sg_base_pa), }, @@ -1647,8 +1653,12 @@ ionic_lif_rxq_init(struct ionic_rx_qcq *rxq) if (rxq->flags & IONIC_QCQ_F_SG) ctx.cmd.q_init.flags |= rte_cpu_to_le_16(IONIC_QINIT_F_SG); - if (rxq->flags & IONIC_QCQ_F_CMB) + if (rxq->flags & IONIC_QCQ_F_CMB) { ctx.cmd.q_init.flags |= rte_cpu_to_le_16(IONIC_QINIT_F_CMB); + ctx.cmd.q_init.ring_base = rte_cpu_to_le_64(q->cmb_base_pa); + } else { + ctx.cmd.q_init.ring_base = rte_cpu_to_le_64(q->base_pa); + } IONIC_PRINT(DEBUG, "rxq_init.index %d", q->index); IONIC_PRINT(DEBUG, "rxq_init.ring_base 0x%" PRIx64 "", q->base_pa); diff --git a/drivers/net/ionic/ionic_rxtx.h b/drivers/net/ionic/ionic_rxtx.h index 8537141597..5348395956 100644 --- a/drivers/net/ionic/ionic_rxtx.h +++ b/drivers/net/ionic/ionic_rxtx.h @@ -77,4 +77,60 @@ uint16_t ionic_xmit_pkts_sg(void *tx_queue, struct rte_mbuf **tx_pkts, int ionic_rx_fill_sg(struct ionic_rx_qcq *rxq); +static inline void +ionic_rxq_flush(struct ionic_queue *q) +{ + struct ionic_rxq_desc *desc_base = q->base; + struct ionic_rxq_desc *cmb_desc_base = q->cmb_base; + + if (q->cmb_base) { + if (q->head_idx < q->cmb_head_idx) { + /* copy [cmb_head, num_descs) */ + rte_memcpy((void *)&cmb_desc_base[q->cmb_head_idx], + (void *)&desc_base[q->cmb_head_idx], + (q->num_descs - q->cmb_head_idx) * sizeof(*desc_base)); + /* copy [0, head) */ + rte_memcpy((void *)&cmb_desc_base[0], + (void *)&desc_base[0], + q->head_idx * sizeof(*desc_base)); + } else { + /* copy [cmb_head, head) */ + rte_memcpy((void *)&cmb_desc_base[q->cmb_head_idx], + (void *)&desc_base[q->cmb_head_idx], + (q->head_idx - q->cmb_head_idx) * sizeof(*desc_base)); + } + q->cmb_head_idx = q->head_idx; + } + + ionic_q_flush(q); +} + +static inline void +ionic_txq_flush(struct ionic_queue *q) +{ + struct ionic_txq_desc *desc_base = q->base; + struct ionic_txq_desc *cmb_desc_base = q->cmb_base; + + if (q->cmb_base) { + if (q->head_idx < q->cmb_head_idx) { + /* copy [cmb_head, num_descs) */ + rte_memcpy((void *)&cmb_desc_base[q->cmb_head_idx], + (void *)&desc_base[q->cmb_head_idx], + (q->num_descs - q->cmb_head_idx) * sizeof(*desc_base)); + /* copy [0, head) */ + rte_memcpy((void *)&cmb_desc_base[0], + (void *)&desc_base[0], + q->head_idx * sizeof(*desc_base)); + } else { + /* copy [cmb_head, head) */ + rte_memcpy((void *)&cmb_desc_base[q->cmb_head_idx], + (void *)&desc_base[q->cmb_head_idx], + (q->head_idx - q->cmb_head_idx) * sizeof(*desc_base)); + } + q->cmb_head_idx = q->head_idx; + } + + ionic_q_flush(q); +} + #endif /* _IONIC_RXTX_H_ */ diff --git a/drivers/net/ionic/ionic_rxtx_sg.c b/drivers/net/ionic/ionic_rxtx_sg.c index 1392342463..92e1d6e259 100644 --- a/drivers/net/ionic/ionic_rxtx_sg.c +++ b/drivers/net/ionic/ionic_rxtx_sg.c @@ -166,6 +166,7 @@ ionic_xmit_pkts_sg(void *tx_queue, struct rte_mbuf **tx_pkts, { struct ionic_tx_qcq *txq = tx_queue; struct ionic_queue *q = &txq->qcq.q; + struct ionic_txq_desc *desc_base = q->base; struct ionic_tx_stats *stats = &txq->stats; struct rte_mbuf *mbuf; uint32_t bytes_tx = 0; @@ -173,9 +174,7 @@ ionic_xmit_pkts_sg(void *tx_queue, struct rte_mbuf **tx_pkts, uint64_t then, now, hz, delta; int err; - struct ionic_txq_desc *desc_base = q->base; - if (!(txq->flags & IONIC_QCQ_F_CMB)) - rte_prefetch0(&desc_base[q->head_idx]); + rte_prefetch0(&desc_base[q->head_idx]); rte_prefetch0(IONIC_INFO_PTR(q, q->head_idx)); if (nb_pkts) { @@ -196,8 +195,7 @@ ionic_xmit_pkts_sg(void *tx_queue, struct rte_mbuf **tx_pkts, while (nb_tx < nb_pkts) { uint16_t next_idx = Q_NEXT_TO_POST(q, 1); - if (!(txq->flags & IONIC_QCQ_F_CMB)) - rte_prefetch0(&desc_base[next_idx]); + rte_prefetch0(&desc_base[next_idx]); rte_prefetch0(IONIC_INFO_PTR(q, next_idx)); if (nb_tx + 1 < nb_pkts) { @@ -222,7 +220,7 @@ ionic_xmit_pkts_sg(void *tx_queue, struct rte_mbuf **tx_pkts, if (nb_tx > 0) { rte_wmb(); - ionic_q_flush(q); + ionic_txq_flush(q); txq->last_wdog_cycles = rte_get_timer_cycles(); @@ -458,8 +456,7 @@ ionic_rxq_service_sg(struct ionic_rx_qcq *rxq, uint32_t work_to_do, /* Prefetch 4 x 16B comp */ rte_prefetch0(&cq_desc_base[Q_NEXT_TO_SRVC(cq, 4)]); /* Prefetch 4 x 16B descriptors */ - if (!(rxq->flags & IONIC_QCQ_F_CMB)) - rte_prefetch0(&q_desc_base[Q_NEXT_TO_POST(q, 4)]); + rte_prefetch0(&q_desc_base[Q_NEXT_TO_POST(q, 4)]); /* Clean one descriptor */ ionic_rx_clean_one_sg(rxq, cq_desc, rx_svc); @@ -478,7 +475,8 @@ ionic_rxq_service_sg(struct ionic_rx_qcq *rxq, uint32_t work_to_do, /* Update the queue indices and ring the doorbell */ if (work_done) { - ionic_q_flush(q); + ionic_rxq_flush(q); + rxq->last_wdog_cycles = rte_get_timer_cycles(); rxq->wdog_ms = IONIC_Q_WDOG_MS; } else { @@ -542,7 +540,7 @@ ionic_rx_fill_sg(struct ionic_rx_qcq *rxq) q->head_idx = Q_NEXT_TO_POST(q, 1); } - ionic_q_flush(q); + ionic_rxq_flush(q); return err; } diff --git a/drivers/net/ionic/ionic_rxtx_simple.c b/drivers/net/ionic/ionic_rxtx_simple.c index 00152c885a..f12f66f40c 100644 --- a/drivers/net/ionic/ionic_rxtx_simple.c +++ b/drivers/net/ionic/ionic_rxtx_simple.c @@ -139,6 +139,7 @@ ionic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, { struct ionic_tx_qcq *txq = tx_queue; struct ionic_queue *q = &txq->qcq.q; + struct ionic_txq_desc *desc_base = q->base; struct ionic_tx_stats *stats = &txq->stats; struct rte_mbuf *mbuf; uint32_t bytes_tx = 0; @@ -146,9 +147,7 @@ ionic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint64_t then, now, hz, delta; int err; - struct ionic_txq_desc *desc_base = q->base; - if (!(txq->flags & IONIC_QCQ_F_CMB)) - rte_prefetch0(&desc_base[q->head_idx]); + rte_prefetch0(&desc_base[q->head_idx]); rte_prefetch0(&q->info[q->head_idx]); if (nb_pkts) { @@ -169,8 +168,7 @@ ionic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, while (nb_tx < nb_pkts) { uint16_t next_idx = Q_NEXT_TO_POST(q, 1); - if (!(txq->flags & IONIC_QCQ_F_CMB)) - rte_prefetch0(&desc_base[next_idx]); + rte_prefetch0(&desc_base[next_idx]); rte_prefetch0(&q->info[next_idx]); if (nb_tx + 1 < nb_pkts) { @@ -195,7 +193,7 @@ ionic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, if (nb_tx > 0) { rte_wmb(); - ionic_q_flush(q); + ionic_txq_flush(q); txq->last_wdog_cycles = rte_get_timer_cycles(); @@ -379,8 +377,7 @@ ionic_rxq_service(struct ionic_rx_qcq *rxq, uint32_t work_to_do, /* Prefetch 4 x 16B comp */ rte_prefetch0(&cq_desc_base[Q_NEXT_TO_SRVC(cq, 4)]); /* Prefetch 4 x 16B descriptors */ - if (!(rxq->flags & IONIC_QCQ_F_CMB)) - rte_prefetch0(&q_desc_base[Q_NEXT_TO_POST(q, 4)]); + rte_prefetch0(&q_desc_base[Q_NEXT_TO_POST(q, 4)]); /* Clean one descriptor */ ionic_rx_clean_one(rxq, cq_desc, rx_svc); @@ -399,7 +396,8 @@ ionic_rxq_service(struct ionic_rx_qcq *rxq, uint32_t work_to_do, /* Update the queue indices and ring the doorbell */ if (work_done) { - ionic_q_flush(q); + ionic_rxq_flush(q); + rxq->last_wdog_cycles = rte_get_timer_cycles(); rxq->wdog_ms = IONIC_Q_WDOG_MS; } else { @@ -463,7 +461,7 @@ ionic_rx_fill(struct ionic_rx_qcq *rxq) q->head_idx = Q_NEXT_TO_POST(q, 1); } - ionic_q_flush(q); + ionic_rxq_flush(q); return err; } From patchwork Fri Feb 2 19:32:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136346 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 A6CF943A53; Fri, 2 Feb 2024 20:34:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3CFDC42EA0; Fri, 2 Feb 2024 20:33:27 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2085.outbound.protection.outlook.com [40.107.243.85]) by mails.dpdk.org (Postfix) with ESMTP id D21E442E90; Fri, 2 Feb 2024 20:33:24 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fF5m1F+VAeC9dakdf3jt7Ioz31bt8VgHOLk9EwVeufw5DDSsYmYZURmmqZ60wIGMsX2UrUl8PbOeNYv5nVptm92r+Sig0JmecKVnvjS6KJCdAMvoL5deUEiq5FdOlUb8qWOvINHSSNjoaMEkpU8voZh8o2cIzyuo5y0saAkjCYAAgVMIJR/hJUNUGiB/Jy8S9P0Ir1mCw//8RzSMrGcTknZsfptd8GbX1S0CQLYqpxA4exl9K/ugv4j44VIKB3A7G/ZJpTiKEGKhdOETkqUEKbarHvlYvwLbHNYIE4dNOiXwKiK+JU/++if6bHFdNOCgWcwcKI/0j1c5IizdriGrYQ== 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=t3QTwfu8q8DL9MTAxqoYJSmiMIxX6+5NKuzhjf4i3as=; b=eIkavk5bDONW9EhMVVJJGKMaDf8QeTZfsMfOa+jHHn5TT5w+9ucuCUU0KYRLlbnUyWNkPgQ9101DljWQHWqm83hIDTO/m5Ez5zEBrhNSSpqX15eF67dbEArtnwwtfYzrNF7BQb3JiZsOrxxcsT94SQxIDhNtSQemQN/30vRTvty29Xqkn7QHVh7gYAEjUT8Ni5y5Pd54NmqObp7haPBuDoqr8NZYfkFG2L4jn3NKeZ5czgYgangkwO50Xvu8+6/BhnjBVdhIB1yZgLexi3tveH4QVPFE3u1A4D959NLxHQJrOx4g6+t9SAlQDnx8CoOv0eYBtqo8RpnPZyHo+Uk/Qg== 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 (0) 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=t3QTwfu8q8DL9MTAxqoYJSmiMIxX6+5NKuzhjf4i3as=; b=49MzBGMMKgpe+rSYDh0t3oOu3NrDLCiPALJ74DOgTnPSoZhL6wrDjNVm4nn5DhTUTECQRKHhaqQqvFwo8H+VZH5WrfQ8Bcs/d2FxLYQCfsyr13sZJ+HxCviCy6PR9Qoth/WgUPaB3ftHXeHI+KJb+ILfT1F47t3BsaT8LgJ5LSE= Received: from DM6PR10CA0032.namprd10.prod.outlook.com (2603:10b6:5:60::45) by PH7PR12MB8828.namprd12.prod.outlook.com (2603:10b6:510:26b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.12; Fri, 2 Feb 2024 19:33:20 +0000 Received: from DS1PEPF0001708F.namprd03.prod.outlook.com (2603:10b6:5:60:cafe::70) by DM6PR10CA0032.outlook.office365.com (2603:10b6:5:60::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.24 via Frontend Transport; Fri, 2 Feb 2024 19:33:20 +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 DS1PEPF0001708F.mail.protection.outlook.com (10.167.17.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Fri, 2 Feb 2024 19:33:20 +0000 Received: from driver-dev1.pensando.io (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.2507.34; Fri, 2 Feb 2024 13:33:18 -0600 From: Andrew Boyer To: CC: Akshay Dorwat , , , Andrew Boyer Subject: [PATCH 07/13] net/ionic: fix RSS query routine Date: Fri, 2 Feb 2024 11:32:32 -0800 Message-ID: <20240202193238.62669-8-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240202193238.62669-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@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-TrafficTypeDiagnostic: DS1PEPF0001708F:EE_|PH7PR12MB8828:EE_ X-MS-Office365-Filtering-Correlation-Id: 49a83a3b-f540-4ab6-982e-08dc2425d01a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cdAevZxtszCcLvH2GQxdYpzNIVMMAdU8P5BMOezfKSW1MhLhTytRUTwfNm/bIkBh80Ok+wIuovIEVSbHdbbyX0Tn2mrgR+fANPw5somHOM5JgJajvCiDtAL5GwzYmdckoJPjfRIIDl6BQurIrQrmZ9qN0mK6FInjAEpVVgxfo6DXQ2/wc+dkfDgimGaOS1Z1QMFFnWv+FMg6TwBNhk3IgHt7czq2hlj0EKynFlzY3EI/nMajSF31YlLZhhyVjG37O2rC0kih1zAGvWOC2TKJn0W7lLggvs+S2HuPd7PHEITeVL5PxViH6H7XtQZHgSny8c0eaQXne9uuD6uTiqorrTuKdDxVrorO5Jq9IlD15ydAbW4vjpzE6F4pJXvXXOexXRnKKP9nIL5Zqr+5HDTqKZVWfeCQFFS9NxLy6mF1ydj5Za98JfYuzK5GDCitqlPe4BVD5pYdFLoVVGvupyJza7aHHFkqRHpgIXw9RqN0uV+tN5nKPT1dXv0K/tnmN+47gmfMLUZHytTFC+ucppx4gePSS6mhjnua0KnXU6NHaI+Rj6HmPeNb/u4UTNDMdr0Sg375tqeRW7p6+3+0Gux8mB0FYgqae8XAp0i18uzqzPH96Gg3jtoeQ3jgAvZldEgbOkC4AdNUvCYIgcA7+ybcfv8vxZpiROGkDfOkab8NXFbdFIloRfQwxQP4YDxqHN+wY38uQxXUpK+CmyoI/tZf3hrbiqlVKkGKWQctiuKFMBxlMDUh+PEBNl2GbqagzbfPz+f821gAPT9fCfmtreNSqg== 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:(13230031)(4636009)(376002)(136003)(39860400002)(396003)(346002)(230922051799003)(64100799003)(186009)(82310400011)(1800799012)(451199024)(36840700001)(46966006)(40470700004)(478600001)(41300700001)(83380400001)(82740400003)(36860700001)(40480700001)(40460700003)(81166007)(47076005)(356005)(26005)(16526019)(426003)(336012)(36756003)(6666004)(316002)(6916009)(70586007)(5660300002)(54906003)(2906002)(8936002)(4326008)(70206006)(44832011)(86362001)(2616005)(1076003)(8676002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 19:33:20.2623 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 49a83a3b-f540-4ab6-982e-08dc2425d01a 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: DS1PEPF0001708F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8828 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: Akshay Dorwat The routine that copies out the RSS config can't use memcpy() because 'reta_conf->reta' is an array of uint16_t while 'lif->rss_ind_tbl' is an array of uint8_t. Instead, copy the values individually. Fixes: 22e7171bc63b ("net/ionic: support RSS") Cc: cardigliano@ntop.org Cc: stable@dpdk.org Signed-off-by: Akshay Dorwat Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_ethdev.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index 340fd0cd59..008e50e0b9 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -561,7 +561,7 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev, struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev); struct ionic_adapter *adapter = lif->adapter; struct ionic_identity *ident = &adapter->ident; - int i, num; + int i, j, num; uint16_t tbl_sz = rte_le_to_cpu_16(ident->lif.eth.rss_ind_tbl_sz); IONIC_PRINT_CALL(); @@ -582,9 +582,10 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev, num = reta_size / RTE_ETH_RETA_GROUP_SIZE; for (i = 0; i < num; i++) { - memcpy(reta_conf->reta, - &lif->rss_ind_tbl[i * RTE_ETH_RETA_GROUP_SIZE], - RTE_ETH_RETA_GROUP_SIZE); + for (j = 0; j < RTE_ETH_RETA_GROUP_SIZE; j++) { + reta_conf->reta[j] = + lif->rss_ind_tbl[(i * RTE_ETH_RETA_GROUP_SIZE) + j]; + } reta_conf++; } From patchwork Fri Feb 2 19:32:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136345 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 17A3543A53; Fri, 2 Feb 2024 20:33:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1322F42E90; Fri, 2 Feb 2024 20:33:26 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2073.outbound.protection.outlook.com [40.107.244.73]) by mails.dpdk.org (Postfix) with ESMTP id 4C61342E90 for ; Fri, 2 Feb 2024 20:33:24 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UZ2wMz5LEdB4fwEnCN8dPePYzwwh94H/JXx62+ORIO70Jc9Uu5e33goAEB6EKVgt9y2qNl1PfdiFENrJjsLD58UPu82qDtBCdeg4BvqA4gPaK8SGdWP7O/JREJgS+2HXflRYa0u5uptqgkjlpLNTWhf6Zptc0Nl52mBN/+vJpethtYsHvXvA4corFINmoGwIdUQEauvjqrxT3a5epKtzb0t5OZCrgNx1lFlfv8aZ04OvoFzG5dr3tJ1di7udgk8Di8ay4hExVRRsmmpRIGUcQUgqYU2p4o28zuEWv9iqXOUtNmu08GJCU7rJFkgRZG0p1k/0ZA492TWXKb0I2SD+JQ== 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=oq/PBA1725fYtbNBGr/0+JkF07kPxpo3P8UUd4XkQd0=; b=P3Fgm+Ett7TBbUBkQkjD2BsJCbYrgN1bzpciStndcC7Q82f7IVg34oMAz3a/faecXGSfrMX+2AZkBtkVCSPSOIFPpsEwxl/s1pRE1mLl+dlcWebQX3BJEjMYJ6tY1zG0G66ffYm0OLTMl9t3AMy+gg32Otm5LyZMtpR39lST05YV7hWeLrQDpX9XJmYMDA2QQTy8lcPwlt6IwuvKv3zQtU4Ycx8wXZjGYZhzG1LnV/B/2/eLPn1sOt0zg+b2kp3+Cc2mYVmOvD+LKJbyxDGeokRTfVDUh3x5pxaGXTLRB0EVRj4Tsuw0m+WkxajA9R/nyV2cUtD1zqC7E4wQIMaNWg== 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 (0) 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=oq/PBA1725fYtbNBGr/0+JkF07kPxpo3P8UUd4XkQd0=; b=vvVb4QF5Qc17d2nIJBePuuvrT3qs6T4gSIxlwFCKg4fEJzSZbGVrDShk+OGqIda4glGtCizlLGAFNjkSNqz9Fr6cpEg16Y78BC0iBwtbHvUAjndzTosnckay7FbJpntteE2L+OtU7LT+xF1Z8hoMTkuhM/XjtqFSbKd0n6DzVao= Received: from DS7PR06CA0008.namprd06.prod.outlook.com (2603:10b6:8:2a::15) by LV8PR12MB9230.namprd12.prod.outlook.com (2603:10b6:408:186::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.22; Fri, 2 Feb 2024 19:33:22 +0000 Received: from DS1PEPF00017093.namprd03.prod.outlook.com (2603:10b6:8:2a:cafe::b0) by DS7PR06CA0008.outlook.office365.com (2603:10b6:8:2a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.29 via Frontend Transport; Fri, 2 Feb 2024 19:33:22 +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 DS1PEPF00017093.mail.protection.outlook.com (10.167.17.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Fri, 2 Feb 2024 19:33:21 +0000 Received: from driver-dev1.pensando.io (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.2507.34; Fri, 2 Feb 2024 13:33:20 -0600 From: Andrew Boyer To: CC: Vamsi Krishna Atluri , Andrew Boyer Subject: [PATCH 08/13] net/ionic: report 1G and 200G link speeds when applicable Date: Fri, 2 Feb 2024 11:32:33 -0800 Message-ID: <20240202193238.62669-9-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240202193238.62669-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@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-TrafficTypeDiagnostic: DS1PEPF00017093:EE_|LV8PR12MB9230:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a0d7fe2-2e24-4b92-929c-08dc2425d114 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VItxIGGND95PP0L87RxOExpkjWErF0GMfdBkhR653deZ9uEHPqLqxHY5Uk7owEGpwvohLesRnFXFa78/v0QWjymPOR6DE4jgJw9d9UB8zgPSFesRvs6rSrMwGgYnRG0VYkOzUp+WR6q6eDtrvmgmob4SL+ym7lCtksBe6/9erzvAWmWp9rPILH/9fLfPHkwPd1IkNXJ3GXkBbQZWG8SCCfpnSLtRXUhA3ov0aKrAjdTOow4PvofKpaJ34pQ9AAMmyIl5yrMoydXKvaNZ0LniRKrGT9up2UenTFagJsfuDWWH51YDOEyjnzvDYtgNhYKkeMNlKQc67LDmIJ4o9AE7ecEvEIENxcsuRVbF0wci7h+GcufT1PCjQDxtkRN1OSJefoz9LyqBNx7wumf3qcs/eKgvpV8yc22zYSiJ8h8OItKSzBWxwB3n/6hknhmLDfVyhVhwNQoYNhgqQSTwkGBp7Za1hGDJzyaiakwAl4Ej95sNLEJvQtZHCcMSrvkU5uuQEEWm+ibKp4l8jMenEGsKFskrSdQxfbnGrYOysOUH0ImucxZa+PBDx43oul4cfi5N2WnHDKOBAGI28u4+V2LA4MNB5JaFMt3FcRj7Plo2ghR1kTi4FCV7eRjiBumIciQFG8nfTDDLed2iRK1+2cReN9SOyA88xNcOntcQebQn/6hNjWrl9SiMluOu/TwjPNiKRDDadilLL9mMioTeJmUN7HcRGpyOYx5u04T3izKpBNrzasHk9lkGODXx4bkiEB6wDSsR7gRH6NUypmoyQwNX+A== 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:(13230031)(4636009)(39860400002)(346002)(136003)(376002)(396003)(230922051799003)(186009)(1800799012)(82310400011)(64100799003)(451199024)(36840700001)(40470700004)(46966006)(41300700001)(16526019)(336012)(1076003)(26005)(40480700001)(2616005)(426003)(40460700003)(36860700001)(47076005)(356005)(36756003)(82740400003)(83380400001)(478600001)(6666004)(81166007)(86362001)(316002)(6916009)(2906002)(8936002)(70586007)(54906003)(5660300002)(8676002)(44832011)(4326008)(70206006)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 19:33:21.9162 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7a0d7fe2-2e24-4b92-929c-08dc2425d114 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: DS1PEPF00017093.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9230 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: Vamsi Krishna Atluri The hardware supports these speeds, so we should report them correctly. Signed-off-by: Andrew Boyer Signed-off-by: Vamsi Krishna Atluri --- drivers/net/ionic/ionic_ethdev.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index 008e50e0b9..327f6b9de5 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -285,6 +285,9 @@ ionic_dev_link_update(struct rte_eth_dev *eth_dev, link.link_status = RTE_ETH_LINK_UP; link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX; switch (adapter->link_speed) { + case 1000: + link.link_speed = RTE_ETH_SPEED_NUM_1G; + break; case 10000: link.link_speed = RTE_ETH_SPEED_NUM_10G; break; @@ -300,6 +303,9 @@ ionic_dev_link_update(struct rte_eth_dev *eth_dev, case 100000: link.link_speed = RTE_ETH_SPEED_NUM_100G; break; + case 200000: + link.link_speed = RTE_ETH_SPEED_NUM_200G; + break; default: link.link_speed = RTE_ETH_SPEED_NUM_NONE; break; From patchwork Fri Feb 2 19:32:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136347 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 21FA943A53; Fri, 2 Feb 2024 20:34:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8C3742EB6; Fri, 2 Feb 2024 20:33:28 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2053.outbound.protection.outlook.com [40.107.237.53]) by mails.dpdk.org (Postfix) with ESMTP id 8848F42E90 for ; Fri, 2 Feb 2024 20:33:25 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DTMH/47d/LatlFrom3nk4otu7xsH0sdlN13O+Vdgr+SGirKem+BxTIQ8sRBnjlE0awo0FNMod8jNZw/r7xT72NrQx2YGLgHwG72jyR3Az1WcYQum7Oxfg3lx2AEnoSoNCEWBOL+ij5vYkMertWQkSBvn+tZr9O9l7fGKwSN1kcWk4LX059diY8Csb/K608IN2FSGCcLiHbZRiG4P0CVQuZqTlmk8gXkCaFUOC1Dh0BYYTQSgDa3L6KvRthYbzC/nBA0XzAC4Eg9iqGInLW7gUEV9BuPD07xOlplgL3LOcqGEV+0h5/gVuk2LEX0Xau+c84dOvAxDIw4jfAat/dBKWQ== 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=wg6GarQmVRHe0vG9yPeKZpU6Tcj+zI7KHAQofbhW6rE=; b=kxRExsoutF51vu1m3WARDeCD8+UT5iRcqvPo8/KcJJM3AGSr7IQW9y8JqWeu5BunsMbJnb8UMcRAfu+/DMSHtVqmhfw17FkWaYHYcU9dm3qJl9L1A82eODAwBuCT5qHTfxioRXzNFdeivQD/bkEQZVu/QHvMK3wzVl+pEzEU3jYghHbUCGaEcS0Sxw9fLQlqB9U+fwfHsrh3FFA8DP4/QTnpK4yaj6A3ni0b0TIGhhcYp9seWx/nrkY+vNfGJm3zkKlQC8AMxWpckP91WMnQvbObPA9YHjWacDIUdzewjZ+Q6XzrXRPSEwx0X/ClcKJp+QivWdr8DrtDqB6nfCa6uA== 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 (0) 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=wg6GarQmVRHe0vG9yPeKZpU6Tcj+zI7KHAQofbhW6rE=; b=laRSZdIb6rG8cP0eaRnjYupLwtRgAelDPdLjSpduVm8kjY1kCQ/rkc9fZHzyQjza6Tao03RHEm6SU8oto47TacoQg24kiCbefn4LP9WS2QBH0tsMVLWEOW1xVhwYHQ2Sq6kcfoAmHBY7qtVJilGxu34eq+YQFq6bEXmaaukc3xg= Received: from DS7PR03CA0244.namprd03.prod.outlook.com (2603:10b6:5:3b3::9) by SJ0PR12MB7458.namprd12.prod.outlook.com (2603:10b6:a03:48d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.24; Fri, 2 Feb 2024 19:33:23 +0000 Received: from DS1PEPF00017090.namprd03.prod.outlook.com (2603:10b6:5:3b3:cafe::6c) by DS7PR03CA0244.outlook.office365.com (2603:10b6:5:3b3::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34 via Frontend Transport; Fri, 2 Feb 2024 19:33:23 +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 DS1PEPF00017090.mail.protection.outlook.com (10.167.17.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Fri, 2 Feb 2024 19:33:23 +0000 Received: from driver-dev1.pensando.io (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.2507.34; Fri, 2 Feb 2024 13:33:22 -0600 From: Andrew Boyer To: CC: Brad Larson , Andrew Boyer Subject: [PATCH 09/13] net/ionic: add flexible firmware xstat counters Date: Fri, 2 Feb 2024 11:32:34 -0800 Message-ID: <20240202193238.62669-10-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240202193238.62669-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@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-TrafficTypeDiagnostic: DS1PEPF00017090:EE_|SJ0PR12MB7458:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a484235-5127-4661-e0a0-08dc2425d217 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rRiEUfCP+I/5WYc9pbc2w9GJavbuyFPr+d8/Z83NnGRuWeLCbAlHuhpg6QcDtGRkZiDyKGUcJOOZpAY6VSqpqSMfFpBPFj41V4g11Lo0QmTObBUE9rC+m45xClpdxRf76CFn+SL4eEnH5ocV3nrk9pMLLgV9TBJDLIvoYX/LiWXHJmERMnLhGTX22IJXluSgH0K2xSqOddxWBftlyRdwx3FEvMmhHRAO5ApIM6hQaRarUZ+i8gkFLC4z7XPgesfjFtBghhblw9kyKIUAcqF3zOAJ9I5l5b1G4DbfwGnLoiGoO3BGTONw90lAeoRWXShVtO6B+bnvjoQEs/rcP2Nyba3NAmwqfbJpQGmi5/gcZOGBPKc2RbRGK+LWzrydMNYwcDRb+WLRxcNOfJV3GaLYrul2nLQksDRVTIKQ3IQPxziHKNS/FBCi7OtkFQm/q+swNGxFWNK3E2VwPRbOD6CcsOdCfJQreS8eRhe7liC0T7S3asO5oeSCSmVzW+d12XBU0X9aBy8bwo4+HvGSs20jrlCapQKp+q1RqDC08886jbA7mOpZglKlDigprVPfFUVe/mWf4O87pfZbxmpfgo4czLppW8fFexpdrGSF5cX0VEVHbi7TM2r8t7ZSFOZJR7oQbW+Nkvz4EViRdmAxjHbjqGhsloLrvUbQq3k/CZHRFhmFO1WitbX+vsk/Cb/45+JK0YR0TLnARhjrR+IAVA5tNNqEohm2lBCrLP0jfXYzlzg5vXuXs1/stojIi8o+XaMtzgmw3vmImsW/+9Ftgme6RA== 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:(13230031)(4636009)(396003)(346002)(136003)(39860400002)(376002)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(82310400011)(40470700004)(36840700001)(46966006)(54906003)(316002)(36756003)(6916009)(40480700001)(44832011)(36860700001)(40460700003)(4326008)(8936002)(8676002)(356005)(5660300002)(86362001)(47076005)(81166007)(70586007)(70206006)(2906002)(82740400003)(16526019)(26005)(336012)(426003)(2616005)(1076003)(6666004)(83380400001)(478600001)(41300700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 19:33:23.6000 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3a484235-5127-4661-e0a0-08dc2425d217 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: DS1PEPF00017090.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB7458 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: Brad Larson Assign 32 counters for flexible firmware events. These can be used as per-port or per-queue counters in certain firmware configurations. They are displayed as fw_flex_eventX in xstats. Signed-off-by: Andrew Boyer Signed-off-by: Brad Larson --- drivers/net/ionic/ionic_ethdev.c | 33 +++++++++++++++ drivers/net/ionic/ionic_if.h | 70 ++++++++++++++++---------------- 2 files changed, 68 insertions(+), 35 deletions(-) diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index 327f6b9de5..7c55a26956 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -196,6 +196,39 @@ static const struct rte_ionic_xstats_name_off rte_ionic_xstats_strings[] = { tx_desc_fetch_error)}, {"tx_desc_data_error", offsetof(struct ionic_lif_stats, tx_desc_data_error)}, + /* Flexible firmware events */ + {"fw_flex_event1", offsetof(struct ionic_lif_stats, flex1)}, + {"fw_flex_event2", offsetof(struct ionic_lif_stats, flex2)}, + {"fw_flex_event3", offsetof(struct ionic_lif_stats, flex3)}, + {"fw_flex_event4", offsetof(struct ionic_lif_stats, flex4)}, + {"fw_flex_event5", offsetof(struct ionic_lif_stats, flex5)}, + {"fw_flex_event6", offsetof(struct ionic_lif_stats, flex6)}, + {"fw_flex_event7", offsetof(struct ionic_lif_stats, flex7)}, + {"fw_flex_event8", offsetof(struct ionic_lif_stats, flex8)}, + {"fw_flex_event9", offsetof(struct ionic_lif_stats, flex9)}, + {"fw_flex_event10", offsetof(struct ionic_lif_stats, flex10)}, + {"fw_flex_event11", offsetof(struct ionic_lif_stats, flex11)}, + {"fw_flex_event12", offsetof(struct ionic_lif_stats, flex12)}, + {"fw_flex_event13", offsetof(struct ionic_lif_stats, flex13)}, + {"fw_flex_event14", offsetof(struct ionic_lif_stats, flex14)}, + {"fw_flex_event15", offsetof(struct ionic_lif_stats, flex15)}, + {"fw_flex_event16", offsetof(struct ionic_lif_stats, flex16)}, + {"fw_flex_event17", offsetof(struct ionic_lif_stats, flex17)}, + {"fw_flex_event18", offsetof(struct ionic_lif_stats, flex18)}, + {"fw_flex_event19", offsetof(struct ionic_lif_stats, flex19)}, + {"fw_flex_event20", offsetof(struct ionic_lif_stats, flex20)}, + {"fw_flex_event21", offsetof(struct ionic_lif_stats, flex21)}, + {"fw_flex_event22", offsetof(struct ionic_lif_stats, flex22)}, + {"fw_flex_event23", offsetof(struct ionic_lif_stats, flex23)}, + {"fw_flex_event24", offsetof(struct ionic_lif_stats, flex24)}, + {"fw_flex_event25", offsetof(struct ionic_lif_stats, flex25)}, + {"fw_flex_event26", offsetof(struct ionic_lif_stats, flex26)}, + {"fw_flex_event27", offsetof(struct ionic_lif_stats, flex27)}, + {"fw_flex_event28", offsetof(struct ionic_lif_stats, flex28)}, + {"fw_flex_event29", offsetof(struct ionic_lif_stats, flex29)}, + {"fw_flex_event30", offsetof(struct ionic_lif_stats, flex30)}, + {"fw_flex_event31", offsetof(struct ionic_lif_stats, flex31)}, + {"fw_flex_event32", offsetof(struct ionic_lif_stats, flex32)}, }; #define IONIC_NB_HW_STATS RTE_DIM(rte_ionic_xstats_strings) diff --git a/drivers/net/ionic/ionic_if.h b/drivers/net/ionic/ionic_if.h index 79aa196345..7ca604a7bb 100644 --- a/drivers/net/ionic/ionic_if.h +++ b/drivers/net/ionic/ionic_if.h @@ -2592,41 +2592,41 @@ struct ionic_lif_stats { __le64 rsvd16; __le64 rsvd17; - __le64 rsvd18; - __le64 rsvd19; - __le64 rsvd20; - __le64 rsvd21; - __le64 rsvd22; - __le64 rsvd23; - __le64 rsvd24; - __le64 rsvd25; - - __le64 rsvd26; - __le64 rsvd27; - __le64 rsvd28; - __le64 rsvd29; - __le64 rsvd30; - __le64 rsvd31; - __le64 rsvd32; - __le64 rsvd33; - - __le64 rsvd34; - __le64 rsvd35; - __le64 rsvd36; - __le64 rsvd37; - __le64 rsvd38; - __le64 rsvd39; - __le64 rsvd40; - __le64 rsvd41; - - __le64 rsvd42; - __le64 rsvd43; - __le64 rsvd44; - __le64 rsvd45; - __le64 rsvd46; - __le64 rsvd47; - __le64 rsvd48; - __le64 rsvd49; + __le64 flex1; + __le64 flex2; + __le64 flex3; + __le64 flex4; + __le64 flex5; + __le64 flex6; + __le64 flex7; + __le64 flex8; + + __le64 flex9; + __le64 flex10; + __le64 flex11; + __le64 flex12; + __le64 flex13; + __le64 flex14; + __le64 flex15; + __le64 flex16; + + __le64 flex17; + __le64 flex18; + __le64 flex19; + __le64 flex20; + __le64 flex21; + __le64 flex22; + __le64 flex23; + __le64 flex24; + + __le64 flex25; + __le64 flex26; + __le64 flex27; + __le64 flex28; + __le64 flex29; + __le64 flex30; + __le64 flex31; + __le64 flex32; /* RDMA/ROCE REQ Error/Debugs (768 - 895) */ __le64 rdma_req_rx_pkt_seq_err; From patchwork Fri Feb 2 19:32:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136349 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 1130A43A53; Fri, 2 Feb 2024 20:34:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5AF1842EBB; Fri, 2 Feb 2024 20:33:35 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2063.outbound.protection.outlook.com [40.107.94.63]) by mails.dpdk.org (Postfix) with ESMTP id 515ED42EB1; Fri, 2 Feb 2024 20:33:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B3h1Hg1HDJ1JpYQFj6MQfKlppwJY4Y6kcFIDYH1R8v88ydW6FQ81FatmEDtPjJYOocStI2QmnklgAa6RSpp92tglFV2p2xCWUPEcJtQGyUZGqQzJyRgIOP2xRrC2Llj7fFmkGIN42fGZBWdnGJQi02LjEL6Db7/KPPo+S9Rd8VTmJacPhzuJB1C0xp6oWC1bdXsVS02omZrZjJ7CwaeWeX8YYCYYS0z/3oQP4c5aPcsKH+97TxgJerpgGKnok0z2OPGXmbde+Mj2yMe4HTHOY5Zy7ToM13Md6Wa7rFaru7Wto6IV4daaLaGTeQxxHxdZBU074F1H+RNdVPtt/xtAMA== 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=LcRgPIMTJAnmXNj/5UNG2ORGY/fyNR4AsY07IQOYQQ4=; b=WVStlJhWBKjX2dtjHCDwqrBdawT5taOUZ/U/XrAdhCKgYdpQUQlI7t6SHM5l5aH0+p51PIyrPBbu92odSr58WSBrAO63gdQnZm7kQIcH7cijaNttnzl1OsnRg6q3+FvJ1+J60MXB72U3L7zuTUPOgOp2Rk5yWeFSnEuBUWEOubwIPIqRFtindcGy6EcC9vdlc84JFWnAsGwEBIuLFoZoDngk2634bAeE3JFG/h9NsG6g/VSJlPNTUUylpMkgt6arqzueSMFMYPM9843FbYV3ZIWVZEgfdUsDg+t+VYkSw0vdK6dnjCxM1EUvWXEb9pK/sGYCSDWzFvzjXOI8bEUWMg== 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 (0) 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=LcRgPIMTJAnmXNj/5UNG2ORGY/fyNR4AsY07IQOYQQ4=; b=Ex3lfbeUYNj5NTcZRVWxXXNvcrx+H8XUj038IYQm7vIZZMratC8JQ43X4InpDbpb61806VFzWJvvPZ8yPDSmPKD2+p87Zannolbzy5wo7qsc1HePvlW351sK/lSnIKPDhVCr4wS0gwrqSx8ODxZ5AN50AL4oPmpBGZIDoh5Lc1A= Received: from DS0PR17CA0023.namprd17.prod.outlook.com (2603:10b6:8:191::24) by PH0PR12MB8821.namprd12.prod.outlook.com (2603:10b6:510:28d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.12; Fri, 2 Feb 2024 19:33:25 +0000 Received: from DS1PEPF00017094.namprd03.prod.outlook.com (2603:10b6:8:191:cafe::aa) by DS0PR17CA0023.outlook.office365.com (2603:10b6:8:191::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.30 via Frontend Transport; Fri, 2 Feb 2024 19:33:25 +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 DS1PEPF00017094.mail.protection.outlook.com (10.167.17.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Fri, 2 Feb 2024 19:33:25 +0000 Received: from driver-dev1.pensando.io (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.2507.34; Fri, 2 Feb 2024 13:33:24 -0600 From: Andrew Boyer To: CC: Andrew Boyer , Subject: [PATCH 10/13] net/ionic: fix device close sequence to avoid crash Date: Fri, 2 Feb 2024 11:32:35 -0800 Message-ID: <20240202193238.62669-11-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240202193238.62669-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@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-TrafficTypeDiagnostic: DS1PEPF00017094:EE_|PH0PR12MB8821:EE_ X-MS-Office365-Filtering-Correlation-Id: 8519e23b-bf57-4bf5-d06a-08dc2425d31f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DOo860vTRuAMtJoNNlRptmwkS35OX520OXnRzSwKmCIiNrNEeoxwiUsmSUuo6XcMQSzmskzkWiRnWqvw55WAmtfO+CtOwo0efBXCKRB1Z5oV9mNcJyAUAWb56l95F5oIe+STb7WMB3OhaqFsjk7hcYLnZLllENWqFt6WXnnqoQfFhcxuYhZzqebFg1lVT9woLvSfe5d9QhjCDfI7eZyXszrbFG4HxnMQJFc3oQ6+u0Zjzc0pfiRm+3SOTdN6LlAhVBdrOAAB/vzwSnXWnu9NzWdXQe76jqPinJpSev1dlMG0ua0yCfg8Sf6XeXB8X95omsaXhTJB9FzWoGwh2JZt5GvjAKDTMo5PPPSrTclFa/0iWIsV/IQ19ZKi7O84d9e2c74P9ine8ZyFF4rKTu5CeKFIdU1P1AM5HO26R/LqIXSuPEqzQlkH0sAFPkhaDsI6W4rhSy3jo0UVVrVkD3kSW9QeRo/Bx36EAaswcFw53SYuwBmNwigSCYk+uL5ltslYQ/OU2rBOTAVP6DnsUSwRcGiFKz3mTmMr0/J33QP1CqVBAhPkF5VK6Mbx8mnh1XLn4FmR3hSpw5kBgHmCuWnvzh9EHuiTbFzU5k3aszsHHsf7F78m0sOejnQtHUSy7utdIzfJKeE3jtI6VZZxvnyFCNCAuD1cUNcWkPZ5NJeLdlwu1fjn/pclNl9ulA/q2e2Vl4wHhNRNScUqjJoNGHSSkGXQ3uTMMsYkqokzxGsaEua/kUQlOCSrx3M5yJbNcF1g5X1MHCi6vSycEe7HGS/pnA== 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:(13230031)(4636009)(376002)(136003)(346002)(39860400002)(396003)(230922051799003)(64100799003)(186009)(82310400011)(1800799012)(451199024)(36840700001)(40470700004)(46966006)(478600001)(41300700001)(82740400003)(83380400001)(40480700001)(36860700001)(40460700003)(81166007)(356005)(47076005)(336012)(16526019)(6666004)(54906003)(36756003)(6916009)(5660300002)(316002)(44832011)(8676002)(8936002)(4326008)(450100002)(70206006)(26005)(2906002)(426003)(70586007)(86362001)(2616005)(1076003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 19:33:25.3453 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8519e23b-bf57-4bf5-d06a-08dc2425d31f 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: DS1PEPF00017094.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8821 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 The close routine should release all resources, but not call rte_eth_dev_destroy(). As written this code will call rte_eth_dev_release_port() twice and segfault. Instead, move rte_eth_dev_destroy() to the remove routine. eth_ionic_dev_uninit() will call close if necessary. Fixes: 175e4e7ed760 ("net/ionic: complete release on close") Cc: stable@dpdk.org Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_ethdev.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index 7c55a26956..bedcf958e2 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -1009,19 +1009,21 @@ ionic_dev_close(struct rte_eth_dev *eth_dev) ionic_lif_stop(lif); - ionic_lif_free_queues(lif); - IONIC_PRINT(NOTICE, "Removing device %s", eth_dev->device->name); if (adapter->intf->unconfigure_intr) (*adapter->intf->unconfigure_intr)(adapter); - rte_eth_dev_destroy(eth_dev, eth_ionic_dev_uninit); - ionic_port_reset(adapter); ionic_reset(adapter); + + ionic_lif_free_queues(lif); + ionic_lif_deinit(lif); + ionic_lif_free(lif); /* Does not free LIF object */ + if (adapter->intf->unmap_bars) (*adapter->intf->unmap_bars)(adapter); + lif->adapter = NULL; rte_free(adapter); return 0; @@ -1098,21 +1100,18 @@ eth_ionic_dev_init(struct rte_eth_dev *eth_dev, void *init_params) static int eth_ionic_dev_uninit(struct rte_eth_dev *eth_dev) { - struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev); - struct ionic_adapter *adapter = lif->adapter; - IONIC_PRINT_CALL(); if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; - adapter->lif = NULL; - - ionic_lif_deinit(lif); - ionic_lif_free(lif); + if (eth_dev->state != RTE_ETH_DEV_UNUSED) + ionic_dev_close(eth_dev); - if (!(lif->state & IONIC_LIF_F_FW_RESET)) - ionic_lif_reset(lif); + eth_dev->dev_ops = NULL; + eth_dev->rx_pkt_burst = NULL; + eth_dev->tx_pkt_burst = NULL; + eth_dev->tx_pkt_prepare = NULL; return 0; } @@ -1267,17 +1266,18 @@ eth_ionic_dev_remove(struct rte_device *rte_dev) { char name[RTE_ETH_NAME_MAX_LEN]; struct rte_eth_dev *eth_dev; + int ret = 0; /* Adapter lookup is using the eth_dev name */ snprintf(name, sizeof(name), "%s_lif", rte_dev->name); eth_dev = rte_eth_dev_allocated(name); if (eth_dev) - ionic_dev_close(eth_dev); + ret = rte_eth_dev_destroy(eth_dev, eth_ionic_dev_uninit); else IONIC_PRINT(DEBUG, "Cannot find device %s", rte_dev->name); - return 0; + return ret; } RTE_LOG_REGISTER_DEFAULT(ionic_logtype, NOTICE); From patchwork Fri Feb 2 19:32:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136350 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 9940643A53; Fri, 2 Feb 2024 20:34:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7EE9442EC6; Fri, 2 Feb 2024 20:33:36 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2060.outbound.protection.outlook.com [40.107.220.60]) by mails.dpdk.org (Postfix) with ESMTP id D805C42EAF for ; Fri, 2 Feb 2024 20:33:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bp7E6zxJnUTEOLaAZ+m4ov2hGtUXCC803b4GHkjIAkfaQNoAd5vtFkRcrW9VFC4IwS02FiyeirVsrGGB7ZNHJDQkVi2ICy6zerTyIhCHUPlntMDwV8a5Cqzfh9QmC2QEqAvijKcVG4oEbfVtiFHVYtrDoDCnvzrcPKGWlTVa6zRpGwfiJF82MmUCyb92jZLnnOzLbzpdlAsMFKnLcYiXFhI28JMEPxvCcGzRXcOvxDKOgzWWFVxQOU2IBPsj2Ay5tOkQCs8b/uH4atWx8V3JtsN8dYHO3dy5OR4xn5ZocfoiJ4ysOJx1ZC3/uNxdVaOwi+i3HoUX1zTpkGpaMs2mlw== 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=5J3092k9T17Wa49OVwS9Nv2UbOxevuyZkdD+SgnvS44=; b=mLMmoecWYxrk54tEP85Vdhc01EpHHYeMp22d0ge9gHENc+epn4uBPMYJ4KmW1Uk93xKuwNuBgW7WKU2xZiKrOTkADyhCn+ZC+o+NSIeywQfOe0JFytyMUVD4bYGcg+XkBboxNKDwm0r6SDfv94hU/pv7XmqqA/pkoGakDdr1qFAmb1l7KV2fQIjun7K6wvOTP2IxADEfsC0Fz+6dBG9Nk7rHx/dzc2VW+im0rNxKWOdUIrf7aWTgIUg2tGOMQ/CRsJnDDYjXzkCJb1I6o4dOUIneaE/BVgEG1Xl2wn0Hnd/DzbdU/wx31QaCIIe/UUaFfNPPWZpfzUh4Lk/nVd7s0w== 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 (0) 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=5J3092k9T17Wa49OVwS9Nv2UbOxevuyZkdD+SgnvS44=; b=3Bnitc//GCEaZj2dscArL6CGoLcfNFw9mse+LMor55rC8nFT6AlXq50FDRnYwTzv6fL2PCUA2eMrOH4R3MlU9HEVNGALrgN1L3rZPJM52gu6WDENhC1rlBJ7kFeqKzmXOBO58fgialJDfm3x+g5tkkjU28pZMPeOU+XnpZoAuEo= Received: from DM6PR18CA0028.namprd18.prod.outlook.com (2603:10b6:5:15b::41) by MN2PR12MB4304.namprd12.prod.outlook.com (2603:10b6:208:1d0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.9; Fri, 2 Feb 2024 19:33:29 +0000 Received: from DS1PEPF0001708E.namprd03.prod.outlook.com (2603:10b6:5:15b:cafe::26) by DM6PR18CA0028.outlook.office365.com (2603:10b6:5:15b::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.22 via Frontend Transport; Fri, 2 Feb 2024 19:33:29 +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 DS1PEPF0001708E.mail.protection.outlook.com (10.167.17.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Fri, 2 Feb 2024 19:33:29 +0000 Received: from driver-dev1.pensando.io (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.2507.34; Fri, 2 Feb 2024 13:33:28 -0600 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH 11/13] net/ionic: optimize device close operation Date: Fri, 2 Feb 2024 11:32:36 -0800 Message-ID: <20240202193238.62669-12-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240202193238.62669-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@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-TrafficTypeDiagnostic: DS1PEPF0001708E:EE_|MN2PR12MB4304:EE_ X-MS-Office365-Filtering-Correlation-Id: 65545ed7-a55c-4616-a4f0-08dc2425d599 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vCtPzFqZv0j4HDZgYNk+2l7hMM29jvImfxatdt7jpBsRSf8+xMrVt2DaBT2hXeYN4J/iiJcoBQxM97r9VQ3aYQuAplxa6ngv9BX9kaXd43iuVPkp3KRpkKDNYiY1Ax5mm3EX7LGl7uKF1NY9yQRNgKNt1JdLgpAr6TQxwnu7uBbrINRPQglw8Am0xJ8YXAeA4n+c8TtUIotmmuLpJN0RQhqdaPF6xcC6kcA0NVDYm/iSGj34xvtupDAFxRSb7kSPqG7C2DbrcZgo1ZgIk5JhMH40PgmQMNHSk9k6g6lKX6LhvMz9+o7oGzgo6Af21S7ioIKbVAI5AQGcOsumiGyHF70zcdXTaYg/5r7AUZCqr+axZIiU47TtM2la3160a1zZXz5IdvIrgTnW6MheV6/RVjsWi8KV7or2XZaQG+HuFG9sqt2T12b651ykXEWDMhDE884Cwngv5vBlAtZ5tpeF7I1ha7XrNpPx4Kt/mvwypJPY0Dq1V4EyY0ql7hCRuENkXFym0ZdRo9If/pzMNfsJjyudAx/A3omXTUecvdy+29IzjIpTIGhI/jAk4K89XvEjwJETVMsecP6bpmq+Cnp3yUO2nEzPN/yvFkNEMfYGz+z/Ed5AfqjAtJbol77quYq7yK4ZZhoeLI/lpKigfo+hZOKjowqmvuZPCAlkHW80KjrxvKPlkJBVYgDcocjaMaSHU14W6UyPM1pLYKdv4IDX7sKQYqYGXvPxchsQKxY6tmAsRA2YzekjBi6V6oXNYDG9kH7F46FZkZ/MGhkfRjgThg== 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:(13230031)(4636009)(39860400002)(346002)(396003)(376002)(136003)(230922051799003)(64100799003)(451199024)(186009)(82310400011)(1800799012)(40470700004)(36840700001)(46966006)(6916009)(41300700001)(6666004)(44832011)(4326008)(70586007)(8936002)(70206006)(8676002)(2906002)(5660300002)(86362001)(36756003)(82740400003)(356005)(36860700001)(316002)(81166007)(47076005)(478600001)(83380400001)(426003)(1076003)(336012)(2616005)(16526019)(26005)(40480700001)(40460700003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 19:33:29.4992 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 65545ed7-a55c-4616-a4f0-08dc2425d599 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: DS1PEPF0001708E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4304 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 Use a single device reset command to speed up dev_close(). The LIF stop and port reset commands are not needed. This reduces the outage window when restarting the process by about 2ms plus another 1ms per queue. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_ethdev.c | 3 --- drivers/net/ionic/ionic_lif.c | 8 +------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index bedcf958e2..7e80751846 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -1007,13 +1007,10 @@ ionic_dev_close(struct rte_eth_dev *eth_dev) if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; - ionic_lif_stop(lif); - IONIC_PRINT(NOTICE, "Removing device %s", eth_dev->device->name); if (adapter->intf->unconfigure_intr) (*adapter->intf->unconfigure_intr)(adapter); - ionic_port_reset(adapter); ionic_reset(adapter); ionic_lif_free_queues(lif); diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 2713f8aa24..90efcc8cbb 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -1231,13 +1231,7 @@ ionic_lif_rss_setup(struct ionic_lif *lif) static void ionic_lif_rss_teardown(struct ionic_lif *lif) { - if (!lif->rss_ind_tbl) - return; - - if (lif->rss_ind_tbl_z) { - /* Disable RSS on the NIC */ - ionic_lif_rss_config(lif, 0x0, NULL, NULL); - + if (lif->rss_ind_tbl) { lif->rss_ind_tbl = NULL; lif->rss_ind_tbl_pa = 0; rte_memzone_free(lif->rss_ind_tbl_z); From patchwork Fri Feb 2 19:32:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136351 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 2BC2843A53; Fri, 2 Feb 2024 20:34:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8384C42EC9; Fri, 2 Feb 2024 20:33:37 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2044.outbound.protection.outlook.com [40.107.220.44]) by mails.dpdk.org (Postfix) with ESMTP id 7FC3042EAF for ; Fri, 2 Feb 2024 20:33:34 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ifsDaUyiJOFmPBBDAj13LrGsce3hWjHbO22Ucf1A6ZXpcBjLSmkxlBGO47oYvde4yyAzVmB2X7OsQZ8t47C4MetSjP/zpiVB5yitRmrsExU6b5ENdS0ayklZIFD5SBlS+o3zskfGjzxffFadDcC1RO75t8yHo0EHy8GbvtNZRnUo5Cb/xqgXTDu/kBgQ0aKD42lLpgzIZercd2JT2OAVDt/1Jg90zCS3Q/p6ckadNW3Q4KO4YXa5b2p/3FxIc3O3Zi/FMaYdYXi2L8poIY2acIjfR3TZjxc6d9MPhDBMD6aX+oSNGZoKPqMGLaEgAEYcx++NbHjWicu5oVZ0G0xqiw== 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=JcnOjrbyu4LihqXjzacMaal0qjFuDCbwiRUeSyI8nxI=; b=ARIG4Gk85OHR61hLobzd4KVc+iChXTIURarGAdHwpJbjJL9Nyq6CYZG/sTvaccgFiRZqZSzKRTxcyYkOIXfSdB/FW1MkvbU5Xj4XITKTA2TnEnLIQ/H1OFIB74EdaeAqp1Nu3a4wAcLE+/mT7gGUJNGF6qVuPztUuGuxNzHHcB/x3uqCs1ZNp48rwLPoxvMGXhFMlProtjruSfEakpy+V/vczNNn7ldA4GHlNkyRbSPcipiFomCUFSIR2cnCrSSwQ78O6eiMQUhujDLifcvHPGZpYXCwTL9cAvtSbgUVfnlop+Kwn06fDA/racWQ+s6l0C0lio0gb/2f7usiOSbO/A== 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 (0) 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=JcnOjrbyu4LihqXjzacMaal0qjFuDCbwiRUeSyI8nxI=; b=FRKZ6uNG8HiANKl9oOgz78Ip7hdmVMSa7m3LPUPf3TH9TTWqTj1+8wQsBhYysB1TmN5Bb+rv7XDVqtBWu0TgUJdHumpvsJddtI3tjJfVhMdiFFVThLbQtMjs4GzRVNGWJE77TFxCxKJAQpjPzd96XBGQhalzk6PpBA4+0PS+Ek8= Received: from DM6PR10CA0033.namprd10.prod.outlook.com (2603:10b6:5:60::46) by DM6PR12MB4314.namprd12.prod.outlook.com (2603:10b6:5:211::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.13; Fri, 2 Feb 2024 19:33:32 +0000 Received: from DS1PEPF0001708F.namprd03.prod.outlook.com (2603:10b6:5:60:cafe::e1) by DM6PR10CA0033.outlook.office365.com (2603:10b6:5:60::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.22 via Frontend Transport; Fri, 2 Feb 2024 19:33:32 +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 DS1PEPF0001708F.mail.protection.outlook.com (10.167.17.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Fri, 2 Feb 2024 19:33:32 +0000 Received: from driver-dev1.pensando.io (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.2507.34; Fri, 2 Feb 2024 13:33:30 -0600 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH 12/13] net/ionic: optimize device stop operation Date: Fri, 2 Feb 2024 11:32:37 -0800 Message-ID: <20240202193238.62669-13-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240202193238.62669-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@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-TrafficTypeDiagnostic: DS1PEPF0001708F:EE_|DM6PR12MB4314:EE_ X-MS-Office365-Filtering-Correlation-Id: a5ce3ed8-5786-4cc1-a7f4-08dc2425d722 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: smDOZoZU3aV8bTLhA+tM72fQWQLSxwD1kzC8b4NtdoV7e58GuEsx3oGAPHU23yqxKHrgD1P5v3W09p1XayHgwDVPBRpNJ2sE27xg0aLL85H+/vqaNgHpsh9Ykl1nJ92omXgsYdZBp4jJGV9MdRm+g8XlJkWGAXcrlqjLBRAG0czTPT5cV5QfqFXXBAvt5780ynVQUoi/ouqvgo7QimILj2iFAQOHaHKmwwVBtjfq8bg6MHrh0ngu0PUh+s6JeFBMnRqmp7FlF2+tlmgfWXMACgv2wxR/WGHM56vmkRK5MTQtiB7qo9vMwb1pVRKn1wQkpJ28cA8JpT3Isa8oMLi2nvTJ2f3z3QycULxFtArIThZnLuecEMkStzgQCJOEqnrRcgxHh++2bwDVdKWxlzD0DcuIaNb6+K+sx96oKGslnoZfyQ4Q+3OQ4WCBIdq7RhKldGFPcbMrZeqlvX2+ejh5YaMFedPqSEF6lC9eYq4U7dtA6wOPuTnclzmAfJ2zY9iALZT5OPif/GEYBbp4LYDIyVlzCUb44goR7IYsH23k/++KF6j6mauWJMkqcvTPrBNf6v0MZXBKUSAhRAKSsnsLmLAtgvw5WaU0e11IoVZRJJbEnImF9H/OdHw0MuyNuaXpRLvFv5OYUddKZt645dFbcZSNKdtih2fBoVWn6XSQIUH/uiq7Ola03adoV/3xqN8+0XHZqUVTVuaRWXohSJIews6x4mdASI53/kt2KZKlMD19cwVVrur7pousWAW2hM3Pg8Q8QibobhzpLa2ukKZWWg== 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:(13230031)(4636009)(346002)(136003)(376002)(396003)(39860400002)(230922051799003)(451199024)(186009)(64100799003)(82310400011)(1800799012)(40470700004)(36840700001)(46966006)(83380400001)(47076005)(336012)(81166007)(2616005)(426003)(26005)(1076003)(16526019)(356005)(82740400003)(36860700001)(44832011)(4326008)(8936002)(8676002)(5660300002)(2906002)(478600001)(70586007)(30864003)(6916009)(316002)(70206006)(86362001)(41300700001)(36756003)(40480700001)(40460700003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 19:33:32.0749 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a5ce3ed8-5786-4cc1-a7f4-08dc2425d722 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: DS1PEPF0001708F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4314 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 Split the queue_stop operation into first-half and second-half helpers. Move the command context from the stack into each Rx/Tx queue struct. Expose some needed adminq interfaces. This allows us to batch up the queue commands during dev_stop(), reducing the outage window when restarting the process by about 1ms per queue. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic.h | 3 ++ drivers/net/ionic/ionic_lif.c | 81 ++++++++++++++++++++++++---------- drivers/net/ionic/ionic_lif.h | 12 +++-- drivers/net/ionic/ionic_main.c | 17 ++++++- drivers/net/ionic/ionic_rxtx.c | 78 +++++++++++++++++++------------- drivers/net/ionic/ionic_rxtx.h | 14 +++++- 6 files changed, 143 insertions(+), 62 deletions(-) diff --git a/drivers/net/ionic/ionic.h b/drivers/net/ionic/ionic.h index c479eaba74..cb4ea450a9 100644 --- a/drivers/net/ionic/ionic.h +++ b/drivers/net/ionic/ionic.h @@ -83,7 +83,10 @@ struct ionic_admin_ctx { union ionic_adminq_comp comp; }; +int ionic_adminq_post(struct ionic_lif *lif, struct ionic_admin_ctx *ctx); int ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx); +int ionic_adminq_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx); +uint16_t ionic_adminq_space_avail(struct ionic_lif *lif); int ionic_dev_cmd_wait_check(struct ionic_dev *idev, unsigned long max_wait); int ionic_setup(struct ionic_adapter *adapter); diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 90efcc8cbb..8ffdbc4df7 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -31,42 +31,54 @@ static int ionic_lif_addr_add(struct ionic_lif *lif, const uint8_t *addr); static int ionic_lif_addr_del(struct ionic_lif *lif, const uint8_t *addr); static int -ionic_qcq_disable(struct ionic_qcq *qcq) +ionic_qcq_disable_nowait(struct ionic_qcq *qcq, + struct ionic_admin_ctx *ctx) { + int err; + struct ionic_queue *q = &qcq->q; struct ionic_lif *lif = qcq->lif; - struct ionic_admin_ctx ctx = { - .pending_work = true, - .cmd.q_control = { - .opcode = IONIC_CMD_Q_CONTROL, - .type = q->type, - .index = rte_cpu_to_le_32(q->index), - .oper = IONIC_Q_DISABLE, - }, - }; - return ionic_adminq_post_wait(lif, &ctx); + memset(ctx, 0, sizeof(*ctx)); + ctx->pending_work = true; + ctx->cmd.q_control.opcode = IONIC_CMD_Q_CONTROL; + ctx->cmd.q_control.type = q->type; + ctx->cmd.q_control.index = rte_cpu_to_le_32(q->index); + ctx->cmd.q_control.oper = IONIC_Q_DISABLE; + + /* Does not wait for command completion */ + err = ionic_adminq_post(lif, ctx); + if (err) + ctx->pending_work = false; + return err; } void ionic_lif_stop(struct ionic_lif *lif) { - uint32_t i; + struct rte_eth_dev *dev = lif->eth_dev; + uint32_t i, j, chunk; IONIC_PRINT_CALL(); lif->state &= ~IONIC_LIF_F_UP; - for (i = 0; i < lif->nrxqcqs; i++) { - struct ionic_rx_qcq *rxq = lif->rxqcqs[i]; - if (rxq->flags & IONIC_QCQ_F_INITED) - (void)ionic_dev_rx_queue_stop(lif->eth_dev, i); + chunk = ionic_adminq_space_avail(lif); + + for (i = 0; i < lif->nrxqcqs; i += chunk) { + for (j = 0; j < chunk && i + j < lif->nrxqcqs; j++) + ionic_dev_rx_queue_stop_firsthalf(dev, i + j); + + for (j = 0; j < chunk && i + j < lif->nrxqcqs; j++) + ionic_dev_rx_queue_stop_secondhalf(dev, i + j); } - for (i = 0; i < lif->ntxqcqs; i++) { - struct ionic_tx_qcq *txq = lif->txqcqs[i]; - if (txq->flags & IONIC_QCQ_F_INITED) - (void)ionic_dev_tx_queue_stop(lif->eth_dev, i); + for (i = 0; i < lif->ntxqcqs; i += chunk) { + for (j = 0; j < chunk && i + j < lif->ntxqcqs; j++) + ionic_dev_tx_queue_stop_firsthalf(dev, i + j); + + for (j = 0; j < chunk && i + j < lif->ntxqcqs; j++) + ionic_dev_tx_queue_stop_secondhalf(dev, i + j); } } @@ -1240,21 +1252,42 @@ ionic_lif_rss_teardown(struct ionic_lif *lif) } void -ionic_lif_txq_deinit(struct ionic_tx_qcq *txq) +ionic_lif_txq_deinit_nowait(struct ionic_tx_qcq *txq) { - ionic_qcq_disable(&txq->qcq); + ionic_qcq_disable_nowait(&txq->qcq, &txq->admin_ctx); txq->flags &= ~IONIC_QCQ_F_INITED; } void -ionic_lif_rxq_deinit(struct ionic_rx_qcq *rxq) +ionic_lif_txq_stats(struct ionic_tx_qcq *txq) { - ionic_qcq_disable(&rxq->qcq); + struct ionic_tx_stats *stats = &txq->stats; + + IONIC_PRINT(DEBUG, "TX queue %u pkts %ju tso %ju", + txq->qcq.q.index, stats->packets, stats->tso); + IONIC_PRINT(DEBUG, "TX queue %u comps %ju (%ju per)", + txq->qcq.q.index, stats->comps, + stats->comps ? stats->packets / stats->comps : 0); +} + +void +ionic_lif_rxq_deinit_nowait(struct ionic_rx_qcq *rxq) +{ + ionic_qcq_disable_nowait(&rxq->qcq, &rxq->admin_ctx); rxq->flags &= ~IONIC_QCQ_F_INITED; } +void +ionic_lif_rxq_stats(struct ionic_rx_qcq *rxq) +{ + struct ionic_rx_stats *stats = &rxq->stats; + + IONIC_PRINT(DEBUG, "RX queue %u pkts %ju mtod %ju", + rxq->qcq.q.index, stats->packets, stats->mtods); +} + static void ionic_lif_adminq_deinit(struct ionic_lif *lif) { diff --git a/drivers/net/ionic/ionic_lif.h b/drivers/net/ionic/ionic_lif.h index cac7a4583b..ee13f5b7c8 100644 --- a/drivers/net/ionic/ionic_lif.h +++ b/drivers/net/ionic/ionic_lif.h @@ -10,7 +10,7 @@ #include #include -#include "ionic_osdep.h" +#include "ionic.h" #include "ionic_dev.h" #include "ionic_rx_filter.h" @@ -99,6 +99,8 @@ struct ionic_rx_qcq { /* cacheline4+ */ struct rte_mbuf *mbs[IONIC_MBUF_BULK_ALLOC] __rte_cache_aligned; + + struct ionic_admin_ctx admin_ctx; }; struct ionic_tx_qcq { @@ -112,6 +114,8 @@ struct ionic_tx_qcq { uint16_t flags; struct ionic_tx_stats stats; + + struct ionic_admin_ctx admin_ctx; }; #define IONIC_Q_TO_QCQ(_q) container_of(_q, struct ionic_qcq, q) @@ -225,10 +229,12 @@ int ionic_tx_qcq_alloc(struct ionic_lif *lif, uint32_t socket_id, void ionic_qcq_free(struct ionic_qcq *qcq); int ionic_lif_rxq_init(struct ionic_rx_qcq *rxq); -void ionic_lif_rxq_deinit(struct ionic_rx_qcq *rxq); +void ionic_lif_rxq_deinit_nowait(struct ionic_rx_qcq *rxq); +void ionic_lif_rxq_stats(struct ionic_rx_qcq *rxq); int ionic_lif_txq_init(struct ionic_tx_qcq *txq); -void ionic_lif_txq_deinit(struct ionic_tx_qcq *txq); +void ionic_lif_txq_deinit_nowait(struct ionic_tx_qcq *txq); +void ionic_lif_txq_stats(struct ionic_tx_qcq *txq); int ionic_lif_rss_config(struct ionic_lif *lif, const uint16_t types, const uint8_t *key, const uint32_t *indir); diff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c index c957d55bf9..1f24f64a33 100644 --- a/drivers/net/ionic/ionic_main.c +++ b/drivers/net/ionic/ionic_main.c @@ -180,6 +180,12 @@ ionic_adminq_service(struct ionic_cq *cq, uint16_t cq_desc_index, return true; } +uint16_t +ionic_adminq_space_avail(struct ionic_lif *lif) +{ + return ionic_q_space_avail(&lif->adminqcq->qcq.q); +} + /** ionic_adminq_post - Post an admin command. * @lif: Handle to lif. * @cmd_ctx: Api admin command context. @@ -191,7 +197,7 @@ ionic_adminq_service(struct ionic_cq *cq, uint16_t cq_desc_index, * * Return: zero or negative error status. */ -static int +int ionic_adminq_post(struct ionic_lif *lif, struct ionic_admin_ctx *ctx) { struct ionic_queue *q = &lif->adminqcq->qcq.q; @@ -279,7 +285,6 @@ ionic_adminq_wait_for_completion(struct ionic_lif *lif, int ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx) { - bool done; int err; IONIC_PRINT(DEBUG, "Sending %s (%d) via the admin queue", @@ -292,6 +297,14 @@ ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx) return err; } + return ionic_adminq_wait(lif, ctx); +} + +int +ionic_adminq_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx) +{ + bool done; + done = ionic_adminq_wait_for_completion(lif, ctx, IONIC_DEVCMD_TIMEOUT); diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c index d92fa1cca7..774dc596c0 100644 --- a/drivers/net/ionic/ionic_rxtx.c +++ b/drivers/net/ionic/ionic_rxtx.c @@ -92,36 +92,40 @@ ionic_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid) } int __rte_cold -ionic_dev_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id) +ionic_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) { - struct ionic_tx_stats *stats; - struct ionic_tx_qcq *txq; + ionic_dev_tx_queue_stop_firsthalf(dev, tx_queue_id); + ionic_dev_tx_queue_stop_secondhalf(dev, tx_queue_id); + + return 0; +} + +void __rte_cold +ionic_dev_tx_queue_stop_firsthalf(struct rte_eth_dev *dev, + uint16_t tx_queue_id) +{ + struct ionic_tx_qcq *txq = dev->data->tx_queues[tx_queue_id]; IONIC_PRINT(DEBUG, "Stopping TX queue %u", tx_queue_id); - txq = eth_dev->data->tx_queues[tx_queue_id]; + dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_STOPPED; - eth_dev->data->tx_queue_state[tx_queue_id] = - RTE_ETH_QUEUE_STATE_STOPPED; + ionic_lif_txq_deinit_nowait(txq); +} - /* - * Note: we should better post NOP Tx desc and wait for its completion - * before disabling Tx queue - */ +void __rte_cold +ionic_dev_tx_queue_stop_secondhalf(struct rte_eth_dev *dev, + uint16_t tx_queue_id) +{ + struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(dev); + struct ionic_tx_qcq *txq = dev->data->tx_queues[tx_queue_id]; - ionic_lif_txq_deinit(txq); + ionic_adminq_wait(lif, &txq->admin_ctx); /* Free all buffers from descriptor ring */ ionic_tx_empty(txq); - stats = &txq->stats; - IONIC_PRINT(DEBUG, "TX queue %u pkts %ju tso %ju", - txq->qcq.q.index, stats->packets, stats->tso); - IONIC_PRINT(DEBUG, "TX queue %u comps %ju (%ju per)", - txq->qcq.q.index, stats->comps, - stats->comps ? stats->packets / stats->comps : 0); - - return 0; + ionic_lif_txq_stats(txq); } int __rte_cold @@ -726,28 +730,40 @@ ionic_dev_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id) * Stop Receive Units for specified queue. */ int __rte_cold -ionic_dev_rx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id) +ionic_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) { - uint8_t *rx_queue_state = eth_dev->data->rx_queue_state; - struct ionic_rx_stats *stats; - struct ionic_rx_qcq *rxq; + ionic_dev_rx_queue_stop_firsthalf(dev, rx_queue_id); + ionic_dev_rx_queue_stop_secondhalf(dev, rx_queue_id); + + return 0; +} + +void __rte_cold +ionic_dev_rx_queue_stop_firsthalf(struct rte_eth_dev *dev, + uint16_t rx_queue_id) +{ + struct ionic_rx_qcq *rxq = dev->data->rx_queues[rx_queue_id]; IONIC_PRINT(DEBUG, "Stopping RX queue %u", rx_queue_id); - rxq = eth_dev->data->rx_queues[rx_queue_id]; + dev->data->rx_queue_state[rx_queue_id] = RTE_ETH_QUEUE_STATE_STOPPED; + + ionic_lif_rxq_deinit_nowait(rxq); +} - rx_queue_state[rx_queue_id] = RTE_ETH_QUEUE_STATE_STOPPED; +void __rte_cold +ionic_dev_rx_queue_stop_secondhalf(struct rte_eth_dev *dev, + uint16_t rx_queue_id) +{ + struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(dev); + struct ionic_rx_qcq *rxq = dev->data->rx_queues[rx_queue_id]; - ionic_lif_rxq_deinit(rxq); + ionic_adminq_wait(lif, &rxq->admin_ctx); /* Free all buffers from descriptor ring */ ionic_rx_empty(rxq); - stats = &rxq->stats; - IONIC_PRINT(DEBUG, "RX queue %u pkts %ju mtod %ju", - rxq->qcq.q.index, stats->packets, stats->mtods); - - return 0; + ionic_lif_rxq_stats(rxq); } int diff --git a/drivers/net/ionic/ionic_rxtx.h b/drivers/net/ionic/ionic_rxtx.h index 5348395956..7ca23178cc 100644 --- a/drivers/net/ionic/ionic_rxtx.h +++ b/drivers/net/ionic/ionic_rxtx.h @@ -37,14 +37,24 @@ int ionic_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp); void ionic_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid); int ionic_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id); -int ionic_dev_rx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id); +int ionic_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id); int ionic_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, uint16_t nb_desc, uint32_t socket_id, const struct rte_eth_txconf *tx_conf); void ionic_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid); -int ionic_dev_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id); int ionic_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id); +int ionic_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id); + +/* Helpers for optimized dev_stop() */ +void ionic_dev_rx_queue_stop_firsthalf(struct rte_eth_dev *dev, + uint16_t rx_queue_id); +void ionic_dev_rx_queue_stop_secondhalf(struct rte_eth_dev *dev, + uint16_t rx_queue_id); +void ionic_dev_tx_queue_stop_firsthalf(struct rte_eth_dev *dev, + uint16_t tx_queue_id); +void ionic_dev_tx_queue_stop_secondhalf(struct rte_eth_dev *dev, + uint16_t tx_queue_id); void ionic_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id, struct rte_eth_rxq_info *qinfo); From patchwork Fri Feb 2 19:32:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136352 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 AB59343A53; Fri, 2 Feb 2024 20:34:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F065F42ED5; Fri, 2 Feb 2024 20:33:38 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2055.outbound.protection.outlook.com [40.107.237.55]) by mails.dpdk.org (Postfix) with ESMTP id 681B542EC3 for ; Fri, 2 Feb 2024 20:33:36 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rv8fG9/a4CSuNMMVazt6ZWvkJq7Tyu59ab0xWV043ffB710ekDrKAKr9hj01pVtaN2yAoFbZ6N/ELaOVyT4lKAzGwO4HSsRPTgwD3qM5Xw+1LNWqntvV+UBMYBxIgXTft2hwYVL+HuP6q7BHenGucFUQpFlBUIYgxvbq3yHuINeQhtvAhVy4pg+ikhpb+4p3CTpVe4xYSrUjpVojf7Ec1CB/OdSrJd8wRyHH1NcmFWpfMp4uJ0zhvpPJ1cGyrF1YJ9sQ0Tw/dlcHg+jb3JqSi7IO/y1gs96DH7cjz9DmI++QtQJ51AHd63gsgOBnePLvWmXODpJyF1DaGmtKr0/V3w== 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=yTBYAikkHKtugev7OW41YS0smiQTNLHz33mk/ossyTo=; b=CmqfFBH61wdN7SGuGXv5dM4cDFmO3qX0oS4PJmZ3/SVvMKXpCcEAe3SjY8dnMYam119J2p2ljoUqA0Bbiey6WZDXMbhbTD9q/FwT6FNMExO/vYINRa/ZfkOVAGQ74wb0Pzqzzgoch7NA3kbZXexGW0xfmzphiEbWfVDK60MfMu7ke8Y8tG73s3/naJtXwELSDWcdFcMU7zKVIp2fROyeFEAM0SzuZ/qFIaaNNL8ZiJ4iwG0t7tAgnEGulrcYNBG1kKVgTVjjHu3BoHJpdnlcsZSFdBlAC7luXyOu5KKCvjn80owbaWHQwZvRJruv/ARueEdw2IjEu884VRpXEIUXMQ== 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 (0) 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=yTBYAikkHKtugev7OW41YS0smiQTNLHz33mk/ossyTo=; b=gF6hOJwQquSpy1dbolM7l5D6ghB6D83urH4MWCRvuKEt9fW31tviA2ZD13FcL7zFyjNy5QSYGuYYkltO2gtxGikiBrgauXM5U8vH0T/oxs+Zeh7H+FVQW+ZK7Q1OtXiwBOQr0mblBqQ964Ixu9CmgL7PeGnEIro8F2Xpw+1w5Hk= Received: from DS0PR17CA0010.namprd17.prod.outlook.com (2603:10b6:8:191::26) by DM4PR12MB5118.namprd12.prod.outlook.com (2603:10b6:5:391::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34; Fri, 2 Feb 2024 19:33:34 +0000 Received: from DS1PEPF00017095.namprd03.prod.outlook.com (2603:10b6:8:191:cafe::71) by DS0PR17CA0010.outlook.office365.com (2603:10b6:8:191::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.30 via Frontend Transport; Fri, 2 Feb 2024 19:33: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 DS1PEPF00017095.mail.protection.outlook.com (10.167.17.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Fri, 2 Feb 2024 19:33:33 +0000 Received: from driver-dev1.pensando.io (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.2507.34; Fri, 2 Feb 2024 13:33:32 -0600 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH 13/13] net/ionic: optimize device start operation Date: Fri, 2 Feb 2024 11:32:38 -0800 Message-ID: <20240202193238.62669-14-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240202193238.62669-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@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-TrafficTypeDiagnostic: DS1PEPF00017095:EE_|DM4PR12MB5118:EE_ X-MS-Office365-Filtering-Correlation-Id: f95a4abf-2cb2-4a7e-ae0d-08dc2425d844 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SKPZI3iza04BGkouEhT4GQL3k0o3ipvfjky0ZRDo478BhM1miCaQCVeV2912uxjcpG2gvixmr+bAi9YkGUwikr32xDwx5XeUdUpUrrlvgu1U6m4nvI91/P3t6RyoiEpM3iOQC59BodlBSz6LBEoVIB+4/Nv+i+rfBSatAac2j2NRqtEHuL+EZKN3cHo39WTpoIick/9W9XFpUTxk7h+TU+DaBEPkXY59U1QOMUStx+IdfH3fnvHlBA76zpC3phiw28nFCd399t76q8SgERhHmEOQAfLTsuN73XrdWCSOcaYEMp18n3+DyVhyVpTypNWRYEVkbbAlBgJSsLdC8s300XG1iaiSHPvMcdGKks+UM74Q1sMSh+p9GUq79ZxvusMufYuFUau8lGbPwndGYNGA4wI50Qc6GOgoaFfkbHcfHQjSc+qdVLSM/AOWu+BP2wj4D7F/i3OdlgY4wvW1CHjY/Ox1rOAmbjyO3FtqzJ/BHYzpDrFd+x2R9y5uwe67AyTw4JZLrdPnMCUrHrXIbmS3mH2ebJVA3gSrQ00PIoV84MZlhiWutzKSPfZYmN8TVBODvg18b/MHMcmkjA6682LOkcQ3CYcA59Bmw4OIOcPlEZzv1R+8YbBm5LCa96Qch2VDLS3+la1uGCYzRGvQSqA3cTW4Y6+pHIgTqAry7+qsmU0IQGqj7wNCqsqLVaMue3fF+Md6yfdB7UJB9SdRo2iFhz+py3OmmIo7ABt7mM6MVZ42h1K1tJ4VKHQIXMA1AjdjMMUItN8NXF6jskdyb/NJzA== 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:(13230031)(4636009)(39860400002)(136003)(346002)(376002)(396003)(230922051799003)(451199024)(186009)(64100799003)(82310400011)(1800799012)(36840700001)(40470700004)(46966006)(41300700001)(16526019)(1076003)(26005)(2616005)(81166007)(478600001)(356005)(6916009)(70206006)(82740400003)(4326008)(70586007)(8936002)(36860700001)(426003)(30864003)(336012)(8676002)(83380400001)(316002)(44832011)(2906002)(5660300002)(86362001)(47076005)(36756003)(40480700001)(40460700003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 19:33:33.9599 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f95a4abf-2cb2-4a7e-ae0d-08dc2425d844 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: DS1PEPF00017095.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5118 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 Split the queue_start operation into first-half and second-half helpers. This allows us to batch up the queue commands during dev_start(), reducing the outage window when restarting the process by about 1ms per queue. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_lif.c | 178 +++++++++++++++++++++------------ drivers/net/ionic/ionic_lif.h | 6 +- drivers/net/ionic/ionic_rxtx.c | 81 ++++++++++++--- drivers/net/ionic/ionic_rxtx.h | 10 ++ 4 files changed, 194 insertions(+), 81 deletions(-) diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 8ffdbc4df7..1937e48d9b 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -1598,52 +1598,61 @@ ionic_lif_set_features(struct ionic_lif *lif) } int -ionic_lif_txq_init(struct ionic_tx_qcq *txq) +ionic_lif_txq_init_nowait(struct ionic_tx_qcq *txq) { struct ionic_qcq *qcq = &txq->qcq; struct ionic_queue *q = &qcq->q; struct ionic_lif *lif = qcq->lif; struct ionic_cq *cq = &qcq->cq; - struct ionic_admin_ctx ctx = { - .pending_work = true, - .cmd.q_init = { - .opcode = IONIC_CMD_Q_INIT, - .type = q->type, - .ver = lif->qtype_info[q->type].version, - .index = rte_cpu_to_le_32(q->index), - .flags = rte_cpu_to_le_16(IONIC_QINIT_F_ENA), - .intr_index = rte_cpu_to_le_16(IONIC_INTR_NONE), - .ring_size = rte_log2_u32(q->num_descs), - .cq_ring_base = rte_cpu_to_le_64(cq->base_pa), - .sg_ring_base = rte_cpu_to_le_64(q->sg_base_pa), - }, - }; + struct ionic_admin_ctx *ctx = &txq->admin_ctx; int err; + memset(ctx, 0, sizeof(*ctx)); + ctx->pending_work = true; + ctx->cmd.q_init.opcode = IONIC_CMD_Q_INIT; + ctx->cmd.q_init.type = q->type; + ctx->cmd.q_init.ver = lif->qtype_info[q->type].version; + ctx->cmd.q_init.index = rte_cpu_to_le_32(q->index); + ctx->cmd.q_init.flags = rte_cpu_to_le_16(IONIC_QINIT_F_ENA); + ctx->cmd.q_init.intr_index = rte_cpu_to_le_16(IONIC_INTR_NONE); + ctx->cmd.q_init.ring_size = rte_log2_u32(q->num_descs); + ctx->cmd.q_init.cq_ring_base = rte_cpu_to_le_64(cq->base_pa); + ctx->cmd.q_init.sg_ring_base = rte_cpu_to_le_64(q->sg_base_pa); + if (txq->flags & IONIC_QCQ_F_SG) - ctx.cmd.q_init.flags |= rte_cpu_to_le_16(IONIC_QINIT_F_SG); + ctx->cmd.q_init.flags |= rte_cpu_to_le_16(IONIC_QINIT_F_SG); if (txq->flags & IONIC_QCQ_F_CMB) { - ctx.cmd.q_init.flags |= rte_cpu_to_le_16(IONIC_QINIT_F_CMB); - ctx.cmd.q_init.ring_base = rte_cpu_to_le_64(q->cmb_base_pa); + ctx->cmd.q_init.flags |= rte_cpu_to_le_16(IONIC_QINIT_F_CMB); + ctx->cmd.q_init.ring_base = rte_cpu_to_le_64(q->cmb_base_pa); } else { - ctx.cmd.q_init.ring_base = rte_cpu_to_le_64(q->base_pa); + ctx->cmd.q_init.ring_base = rte_cpu_to_le_64(q->base_pa); } IONIC_PRINT(DEBUG, "txq_init.index %d", q->index); IONIC_PRINT(DEBUG, "txq_init.ring_base 0x%" PRIx64 "", q->base_pa); IONIC_PRINT(DEBUG, "txq_init.ring_size %d", - ctx.cmd.q_init.ring_size); - IONIC_PRINT(DEBUG, "txq_init.ver %u", ctx.cmd.q_init.ver); + ctx->cmd.q_init.ring_size); + IONIC_PRINT(DEBUG, "txq_init.ver %u", ctx->cmd.q_init.ver); ionic_q_reset(q); ionic_cq_reset(cq); - err = ionic_adminq_post_wait(lif, &ctx); + /* Caller responsible for calling ionic_lif_txq_init_done() */ + err = ionic_adminq_post(lif, ctx); if (err) - return err; + ctx->pending_work = false; + return err; +} - q->hw_type = ctx.comp.q_init.hw_type; - q->hw_index = rte_le_to_cpu_32(ctx.comp.q_init.hw_index); +void +ionic_lif_txq_init_done(struct ionic_tx_qcq *txq) +{ + struct ionic_lif *lif = txq->qcq.lif; + struct ionic_queue *q = &txq->qcq.q; + struct ionic_admin_ctx *ctx = &txq->admin_ctx; + + q->hw_type = ctx->comp.q_init.hw_type; + q->hw_index = rte_le_to_cpu_32(ctx->comp.q_init.hw_index); q->db = ionic_db_map(lif, q); IONIC_PRINT(DEBUG, "txq->hw_type %d", q->hw_type); @@ -1651,57 +1660,64 @@ ionic_lif_txq_init(struct ionic_tx_qcq *txq) IONIC_PRINT(DEBUG, "txq->db %p", q->db); txq->flags |= IONIC_QCQ_F_INITED; - - return 0; } int -ionic_lif_rxq_init(struct ionic_rx_qcq *rxq) +ionic_lif_rxq_init_nowait(struct ionic_rx_qcq *rxq) { struct ionic_qcq *qcq = &rxq->qcq; struct ionic_queue *q = &qcq->q; struct ionic_lif *lif = qcq->lif; struct ionic_cq *cq = &qcq->cq; - struct ionic_admin_ctx ctx = { - .pending_work = true, - .cmd.q_init = { - .opcode = IONIC_CMD_Q_INIT, - .type = q->type, - .ver = lif->qtype_info[q->type].version, - .index = rte_cpu_to_le_32(q->index), - .flags = rte_cpu_to_le_16(IONIC_QINIT_F_ENA), - .intr_index = rte_cpu_to_le_16(IONIC_INTR_NONE), - .ring_size = rte_log2_u32(q->num_descs), - .cq_ring_base = rte_cpu_to_le_64(cq->base_pa), - .sg_ring_base = rte_cpu_to_le_64(q->sg_base_pa), - }, - }; + struct ionic_admin_ctx *ctx = &rxq->admin_ctx; int err; + memset(ctx, 0, sizeof(*ctx)); + ctx->pending_work = true; + ctx->cmd.q_init.opcode = IONIC_CMD_Q_INIT; + ctx->cmd.q_init.type = q->type; + ctx->cmd.q_init.ver = lif->qtype_info[q->type].version; + ctx->cmd.q_init.index = rte_cpu_to_le_32(q->index); + ctx->cmd.q_init.flags = rte_cpu_to_le_16(IONIC_QINIT_F_ENA); + ctx->cmd.q_init.intr_index = rte_cpu_to_le_16(IONIC_INTR_NONE); + ctx->cmd.q_init.ring_size = rte_log2_u32(q->num_descs); + ctx->cmd.q_init.cq_ring_base = rte_cpu_to_le_64(cq->base_pa); + ctx->cmd.q_init.sg_ring_base = rte_cpu_to_le_64(q->sg_base_pa); + if (rxq->flags & IONIC_QCQ_F_SG) - ctx.cmd.q_init.flags |= rte_cpu_to_le_16(IONIC_QINIT_F_SG); + ctx->cmd.q_init.flags |= rte_cpu_to_le_16(IONIC_QINIT_F_SG); if (rxq->flags & IONIC_QCQ_F_CMB) { - ctx.cmd.q_init.flags |= rte_cpu_to_le_16(IONIC_QINIT_F_CMB); - ctx.cmd.q_init.ring_base = rte_cpu_to_le_64(q->cmb_base_pa); + ctx->cmd.q_init.flags |= rte_cpu_to_le_16(IONIC_QINIT_F_CMB); + ctx->cmd.q_init.ring_base = rte_cpu_to_le_64(q->cmb_base_pa); } else { - ctx.cmd.q_init.ring_base = rte_cpu_to_le_64(q->base_pa); + ctx->cmd.q_init.ring_base = rte_cpu_to_le_64(q->base_pa); } IONIC_PRINT(DEBUG, "rxq_init.index %d", q->index); IONIC_PRINT(DEBUG, "rxq_init.ring_base 0x%" PRIx64 "", q->base_pa); IONIC_PRINT(DEBUG, "rxq_init.ring_size %d", - ctx.cmd.q_init.ring_size); - IONIC_PRINT(DEBUG, "rxq_init.ver %u", ctx.cmd.q_init.ver); + ctx->cmd.q_init.ring_size); + IONIC_PRINT(DEBUG, "rxq_init.ver %u", ctx->cmd.q_init.ver); ionic_q_reset(q); ionic_cq_reset(cq); - err = ionic_adminq_post_wait(lif, &ctx); + /* Caller responsible for calling ionic_lif_rxq_init_done() */ + err = ionic_adminq_post(lif, ctx); if (err) - return err; + ctx->pending_work = false; + return err; +} - q->hw_type = ctx.comp.q_init.hw_type; - q->hw_index = rte_le_to_cpu_32(ctx.comp.q_init.hw_index); +void +ionic_lif_rxq_init_done(struct ionic_rx_qcq *rxq) +{ + struct ionic_lif *lif = rxq->qcq.lif; + struct ionic_queue *q = &rxq->qcq.q; + struct ionic_admin_ctx *ctx = &rxq->admin_ctx; + + q->hw_type = ctx->comp.q_init.hw_type; + q->hw_index = rte_le_to_cpu_32(ctx->comp.q_init.hw_index); q->db = ionic_db_map(lif, q); rxq->flags |= IONIC_QCQ_F_INITED; @@ -1709,8 +1725,6 @@ ionic_lif_rxq_init(struct ionic_rx_qcq *rxq) IONIC_PRINT(DEBUG, "rxq->hw_type %d", q->hw_type); IONIC_PRINT(DEBUG, "rxq->hw_index %d", q->hw_index); IONIC_PRINT(DEBUG, "rxq->db %p", q->db); - - return 0; } static int @@ -1959,9 +1973,11 @@ ionic_lif_configure(struct ionic_lif *lif) int ionic_lif_start(struct ionic_lif *lif) { + struct rte_eth_dev *dev = lif->eth_dev; uint32_t rx_mode; - uint32_t i; + uint32_t i, j, chunk; int err; + bool fatal = false; err = ionic_lif_rss_setup(lif); if (err) @@ -1982,25 +1998,57 @@ ionic_lif_start(struct ionic_lif *lif) "on port %u", lif->nrxqcqs, lif->ntxqcqs, lif->port_id); - for (i = 0; i < lif->nrxqcqs; i++) { - struct ionic_rx_qcq *rxq = lif->rxqcqs[i]; - if (!(rxq->flags & IONIC_QCQ_F_DEFERRED)) { - err = ionic_dev_rx_queue_start(lif->eth_dev, i); + chunk = ionic_adminq_space_avail(lif); + + for (i = 0; i < lif->nrxqcqs; i += chunk) { + if (lif->rxqcqs[0]->flags & IONIC_QCQ_F_DEFERRED) { + IONIC_PRINT(DEBUG, "Rx queue start deferred"); + break; + } + + for (j = 0; j < chunk && i + j < lif->nrxqcqs; j++) { + err = ionic_dev_rx_queue_start_firsthalf(dev, i + j); + if (err) { + fatal = true; + break; + } + } + for (j = 0; j < chunk && i + j < lif->nrxqcqs; j++) { + /* Commands that failed to post return immediately */ + err = ionic_dev_rx_queue_start_secondhalf(dev, i + j); if (err) - return err; + /* Don't break */ + fatal = true; } } + if (fatal) + return -EIO; - for (i = 0; i < lif->ntxqcqs; i++) { - struct ionic_tx_qcq *txq = lif->txqcqs[i]; - if (!(txq->flags & IONIC_QCQ_F_DEFERRED)) { - err = ionic_dev_tx_queue_start(lif->eth_dev, i); + for (i = 0; i < lif->ntxqcqs; i += chunk) { + if (lif->txqcqs[0]->flags & IONIC_QCQ_F_DEFERRED) { + IONIC_PRINT(DEBUG, "Tx queue start deferred"); + break; + } + + for (j = 0; j < chunk && i + j < lif->ntxqcqs; j++) { + err = ionic_dev_tx_queue_start_firsthalf(dev, i + j); + if (err) { + fatal = true; + break; + } + } + for (j = 0; j < chunk && i + j < lif->ntxqcqs; j++) { + /* Commands that failed to post return immediately */ + err = ionic_dev_tx_queue_start_secondhalf(dev, i + j); if (err) - return err; + /* Don't break */ + fatal = true; } } + if (fatal) + return -EIO; /* Carrier ON here */ lif->state |= IONIC_LIF_F_UP; diff --git a/drivers/net/ionic/ionic_lif.h b/drivers/net/ionic/ionic_lif.h index ee13f5b7c8..591cf1a2ff 100644 --- a/drivers/net/ionic/ionic_lif.h +++ b/drivers/net/ionic/ionic_lif.h @@ -228,11 +228,13 @@ int ionic_tx_qcq_alloc(struct ionic_lif *lif, uint32_t socket_id, struct ionic_tx_qcq **qcq_out); void ionic_qcq_free(struct ionic_qcq *qcq); -int ionic_lif_rxq_init(struct ionic_rx_qcq *rxq); +int ionic_lif_rxq_init_nowait(struct ionic_rx_qcq *rxq); +void ionic_lif_rxq_init_done(struct ionic_rx_qcq *rxq); void ionic_lif_rxq_deinit_nowait(struct ionic_rx_qcq *rxq); void ionic_lif_rxq_stats(struct ionic_rx_qcq *rxq); -int ionic_lif_txq_init(struct ionic_tx_qcq *txq); +int ionic_lif_txq_init_nowait(struct ionic_tx_qcq *txq); +void ionic_lif_txq_init_done(struct ionic_tx_qcq *txq); void ionic_lif_txq_deinit_nowait(struct ionic_tx_qcq *txq); void ionic_lif_txq_stats(struct ionic_tx_qcq *txq); diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c index 774dc596c0..ad04e987eb 100644 --- a/drivers/net/ionic/ionic_rxtx.c +++ b/drivers/net/ionic/ionic_rxtx.c @@ -203,27 +203,54 @@ ionic_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id, * Start Transmit Units for specified queue. */ int __rte_cold -ionic_dev_tx_queue_start(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id) +ionic_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id) { - uint8_t *tx_queue_state = eth_dev->data->tx_queue_state; - struct ionic_tx_qcq *txq; int err; + err = ionic_dev_tx_queue_start_firsthalf(dev, tx_queue_id); + if (err) + return err; + + return ionic_dev_tx_queue_start_secondhalf(dev, tx_queue_id); +} + +int __rte_cold +ionic_dev_tx_queue_start_firsthalf(struct rte_eth_dev *dev, + uint16_t tx_queue_id) +{ + uint8_t *tx_queue_state = dev->data->tx_queue_state; + struct ionic_tx_qcq *txq = dev->data->tx_queues[tx_queue_id]; + if (tx_queue_state[tx_queue_id] == RTE_ETH_QUEUE_STATE_STARTED) { IONIC_PRINT(DEBUG, "TX queue %u already started", tx_queue_id); return 0; } - txq = eth_dev->data->tx_queues[tx_queue_id]; - IONIC_PRINT(DEBUG, "Starting TX queue %u, %u descs", tx_queue_id, txq->qcq.q.num_descs); - err = ionic_lif_txq_init(txq); + return ionic_lif_txq_init_nowait(txq); +} + +int __rte_cold +ionic_dev_tx_queue_start_secondhalf(struct rte_eth_dev *dev, + uint16_t tx_queue_id) +{ + uint8_t *tx_queue_state = dev->data->tx_queue_state; + struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(dev); + struct ionic_tx_qcq *txq = dev->data->tx_queues[tx_queue_id]; + int err; + + if (tx_queue_state[tx_queue_id] == RTE_ETH_QUEUE_STATE_STARTED) + return 0; + + err = ionic_adminq_wait(lif, &txq->admin_ctx); if (err) return err; + ionic_lif_txq_init_done(txq); + tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_STARTED; return 0; @@ -680,22 +707,31 @@ ionic_rx_init_descriptors(struct ionic_rx_qcq *rxq) * Start Receive Units for specified queue. */ int __rte_cold -ionic_dev_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id) +ionic_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id) { - uint8_t *rx_queue_state = eth_dev->data->rx_queue_state; - struct ionic_rx_qcq *rxq; - struct ionic_queue *q; int err; + err = ionic_dev_rx_queue_start_firsthalf(dev, rx_queue_id); + if (err) + return err; + + return ionic_dev_rx_queue_start_secondhalf(dev, rx_queue_id); +} + +int __rte_cold +ionic_dev_rx_queue_start_firsthalf(struct rte_eth_dev *dev, + uint16_t rx_queue_id) +{ + uint8_t *rx_queue_state = dev->data->rx_queue_state; + struct ionic_rx_qcq *rxq = dev->data->rx_queues[rx_queue_id]; + struct ionic_queue *q = &rxq->qcq.q; + if (rx_queue_state[rx_queue_id] == RTE_ETH_QUEUE_STATE_STARTED) { IONIC_PRINT(DEBUG, "RX queue %u already started", rx_queue_id); return 0; } - rxq = eth_dev->data->rx_queues[rx_queue_id]; - q = &rxq->qcq.q; - rxq->frame_size = rxq->qcq.lif->frame_size - RTE_ETHER_CRC_LEN; /* Recalculate segment count based on MTU */ @@ -707,10 +743,27 @@ ionic_dev_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id) ionic_rx_init_descriptors(rxq); - err = ionic_lif_rxq_init(rxq); + return ionic_lif_rxq_init_nowait(rxq); +} + +int __rte_cold +ionic_dev_rx_queue_start_secondhalf(struct rte_eth_dev *dev, + uint16_t rx_queue_id) +{ + uint8_t *rx_queue_state = dev->data->rx_queue_state; + struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(dev); + struct ionic_rx_qcq *rxq = dev->data->rx_queues[rx_queue_id]; + int err; + + if (rx_queue_state[rx_queue_id] == RTE_ETH_QUEUE_STATE_STARTED) + return 0; + + err = ionic_adminq_wait(lif, &rxq->admin_ctx); if (err) return err; + ionic_lif_rxq_init_done(rxq); + /* Allocate buffers for descriptor ring */ if (rxq->flags & IONIC_QCQ_F_SG) err = ionic_rx_fill_sg(rxq); diff --git a/drivers/net/ionic/ionic_rxtx.h b/drivers/net/ionic/ionic_rxtx.h index 7ca23178cc..a342afec54 100644 --- a/drivers/net/ionic/ionic_rxtx.h +++ b/drivers/net/ionic/ionic_rxtx.h @@ -46,6 +46,16 @@ void ionic_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid); int ionic_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id); int ionic_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id); +/* Helpers for optimized dev_start() */ +int ionic_dev_rx_queue_start_firsthalf(struct rte_eth_dev *dev, + uint16_t rx_queue_id); +int ionic_dev_rx_queue_start_secondhalf(struct rte_eth_dev *dev, + uint16_t rx_queue_id); +int ionic_dev_tx_queue_start_firsthalf(struct rte_eth_dev *dev, + uint16_t tx_queue_id); +int ionic_dev_tx_queue_start_secondhalf(struct rte_eth_dev *dev, + uint16_t tx_queue_id); + /* Helpers for optimized dev_stop() */ void ionic_dev_rx_queue_stop_firsthalf(struct rte_eth_dev *dev, uint16_t rx_queue_id);