From patchwork Wed Feb 7 02:18:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136455 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 CAC6B43A2A; Wed, 7 Feb 2024 03:21:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E397342DF3; Wed, 7 Feb 2024 03:20:09 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2042.outbound.protection.outlook.com [40.107.92.42]) by mails.dpdk.org (Postfix) with ESMTP id C871142DD9 for ; Wed, 7 Feb 2024 03:20:01 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RA+yc0QPxtJ7vORMM9xmdw/2HLbgSRdN6Orbx29AmmMZj6x/g5J+MercXQkPjf/FBTDASd+wVFDbBpTczcDR9mNo1nYd2CH0ERzQTnjJGQkK8GxXq0YMYn5+hnni155VP6iJ6NlmsFOfB+7JCLVd1eQbDvISQb4fgJbPFFP3W+hsI9bcnoIgIvr97w+Zg4/vVvSZKrCJ1ZrE45zPlddowtq4ZfB+oVwaqvGF0UykwzY7RH/wDttsu9WwDKikrVDQvzuW0OEDBOoJb+o0P4nl8qtJjUWSQEThSE9M2xb/XZs7TOZx1BrYk7RnHEN26cCtw7wlntrSNIXq98/hWm/bdA== 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=8DSXhgzgwelg7ionxOwieFnXyNEuuP4o5FhvdpHVJxA=; b=lhKck8cNeeLpYfyrTsVsiWm2B+YPBuLDo0bO2Lh4cTtizikSYXv/gRoFjkqbeonw4Dg4VXULopRtizQDd08svvsA+rDFwRiNkuZPAUGEXoRPuton1shjzN8zaPFK7ga2OQqh3Bedf/svZ+Tbv/Ulfx/kdJ0bwR22RIOCWKyMRXJBBrom/OGdp6oWzyTDbJuHkjOtUulzq8AW/FIth1za6lOK95x7w8lJU1szvFYIWdJDyXkFH08AulM0b5qO5MAQvLky5XTjcIrypYEA5vny6OYN8IqI5s/JJUlqWAiWoR+lFmNDKexQNP9DS1ddF3XHxWGFrmHIyRz6H0WtqguLYw== 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=8DSXhgzgwelg7ionxOwieFnXyNEuuP4o5FhvdpHVJxA=; b=XhUAJHyrvqquQipWpcQjFmAgDgP0sOm/iy1WwkJEbadvjNrw+XDt5GoUqhA/NO7flVyj9TNzggKP8aPPKmcPUI1Ljg5Uc+XfsE4hKjqKPe7nUqIX0aQQXHu1v4845QGrnIxHcXmz2jZ7+hYFng031ShsndwcBas2OVCBH1CoTGU= Received: from PR3PR09CA0002.eurprd09.prod.outlook.com (2603:10a6:102:b7::7) by CH3PR12MB8545.namprd12.prod.outlook.com (2603:10b6:610:163::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.16; Wed, 7 Feb 2024 02:19:59 +0000 Received: from SA2PEPF000015CC.namprd03.prod.outlook.com (2603:10a6:102:b7:cafe::ae) by PR3PR09CA0002.outlook.office365.com (2603:10a6:102:b7::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36 via Frontend Transport; Wed, 7 Feb 2024 02:19:58 +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 SA2PEPF000015CC.mail.protection.outlook.com (10.167.241.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7249.19 via Frontend Transport; Wed, 7 Feb 2024 02:19:58 +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; Tue, 6 Feb 2024 20:19:52 -0600 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH v2 12/13] net/ionic: optimize device stop operation Date: Tue, 6 Feb 2024 18:18:48 -0800 Message-ID: <20240207021849.52988-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: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015CC:EE_|CH3PR12MB8545:EE_ X-MS-Office365-Filtering-Correlation-Id: ea80e3da-96ab-4ada-ced1-08dc27834813 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PAn1L5ZRfwQEqNZhyJ6api9h7i7r37rW1XVm8N0NhgWmfWH0eSO1Kz3c6+4W2doYoxH2NzC7AjLhRIvOOK9TVRfh2NrLN/pSqsngFBbwI43rBgj/cGguKjYsfuoZCcKPGvPocpY0j3S5luhy4CA6oZQeIobre/ZDSGLZODn01wFeIktKebbMOLXM/JxRVzKn7WRxFJ92yz3ylVnk6agto9qTbY7N05iboep9GAU9LmFUNmG8+l6DhhxMnSBB6ytOnVtMcOsOJDQniHG/JaSrrUvaMCh+Q7h6Um9AMhpryTzXpNCT0xY9O4ECHv16ecEnBbkcvZh99eLrtYJPhZmwNPyyA/Fk0raTPM4fcaz1dAdsMxvkzqrksijO/JwuxUlbZvxRrTBIj8vV1FYboihteCoeIzxs3w7hHuBRKmyObrYUI2dhpDQqY0oMmPJ4JNxkYWpc8b+h2/5Au3MRW7ZBZkrAH/sNrKWdgWw02cywcpfYTYlSB446wKys7/bAvF3dCUbTRTGw6xglzkuYcl5r2n1LQSnoiI7pAB8e9qmXcQr3ttTB5RNQlUWeOBmFTOSvTJ7mQTNA+7tBMumlq9PKy+33/RKbBzhgef/Pk4n1hqUAGZhKBT+/egoZX43zPxUA+S8vyiqjnFscCt9qJ+hyZaPgwiLA4qZQm7AvuSuKir3zogSYNabBYBcs6vrN8eEn1o0H7rffkE+gQUKwRM4dxivLobt0C8gMtDExSp3+dcrMABaVwoL7rbwrOk1bUypaYVtZZ0vjIxflP3Pyzh0L7A== 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)(82310400011)(64100799003)(186009)(1800799012)(451199024)(40470700004)(46966006)(36840700001)(40480700001)(40460700003)(41300700001)(316002)(478600001)(86362001)(36756003)(2616005)(2906002)(81166007)(356005)(426003)(1076003)(47076005)(26005)(82740400003)(16526019)(83380400001)(8676002)(4326008)(336012)(5660300002)(44832011)(70206006)(6916009)(36860700001)(30864003)(6666004)(8936002)(70586007)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 02:19:58.0724 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea80e3da-96ab-4ada-ced1-08dc27834813 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: SA2PEPF000015CC.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8545 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 | 68 ++++++++++++++++++++++------- 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, 138 insertions(+), 54 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..45317590fa 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -31,11 +31,15 @@ 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 = { + + *ctx = (struct ionic_admin_ctx) { .pending_work = true, .cmd.q_control = { .opcode = IONIC_CMD_Q_CONTROL, @@ -45,28 +49,39 @@ ionic_qcq_disable(struct ionic_qcq *qcq) }, }; - return ionic_adminq_post_wait(lif, &ctx); + /* 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 +1255,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) +{ + 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(&rxq->qcq); + 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);