From patchwork Wed Feb 7 03:13:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136457 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 9BED043A2A; Wed, 7 Feb 2024 04:14:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8995E42D90; Wed, 7 Feb 2024 04:14:19 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2075.outbound.protection.outlook.com [40.107.94.75]) by mails.dpdk.org (Postfix) with ESMTP id 3AE1340274 for ; Wed, 7 Feb 2024 04:14:17 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ss+cIWu7HXWzmNyxIbKtB+kMWCjUCQm13uYX49c+jkoj3Z6bVgjP+6U6rsK+TeYKJcefDiXwJnsXBuK2dWLJd7+m/ocXBM9p65oyIiz6Hfwo/xaH7J3/VuFA1HABKLlS0O9edSFb7kcgOsOyeI7KtaRjre+H1ukpDQrxprvy3wk2e1fZVaACeIwpxhpJWWOVSe1UwN9s4JqntdC2zc2FcxnE1R7yNhFMTMhxb3clhL+QWi0lO+rKfwbll+kqE89wqgMmUEcFGaNYfR5H80CbpsAudHUCLc547LxdyR5k2PhrIdqTDQmBUz7OQesNRXKj/r/yJm3zRh47aE4fb2Z1NQ== 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=jle5j8LXCAJhJNzD1bwJk7z5aYacUEDwFHN8RrVUMuC/ISmnIi0N15FB0w1FIsyaawoCmaC5oSlivSjjB+P/E/rzdbx2ATPPpVw+0fp3CciUsX/OiIQIF0AG92y8tyqtmVMelSYgVzyuoJhbzzaNVW4lZ6Il/UCKU37nikI1DvvqHnNSZbkoet7rOkuXuusYiF1rcG0Q3f3DN5P9E4ApRscVB/9B+U1F5MrxQDukiuaFjnWXdQ9dRd/NaeO4Oh6ZjusybEWtE4Ph7i5afr9jIi3nEQ0APP5th3PKudLVQZTAsbBeDlgzF+VHs1ok4TuQ5RwOUdHnMQEYHiOixUBoiA== 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=VRKEJDCtyex69PLPfAIvZ/hp+O4AGhBI/CvH3SHCLzJ/yQGvoYCY3sJa8qPXaVBQ9HiNGEnt8/aceq+MbtBHeyJ1DT86BdFPtbIYrBO2oWW1K/IY9XMGANe6igwL+d7JrF07kmyzvzYNllF+0H9fJp/Xt5PYLsmRuJmIKBeqib8= Received: from DM6PR02CA0055.namprd02.prod.outlook.com (2603:10b6:5:177::32) by BL0PR12MB4993.namprd12.prod.outlook.com (2603:10b6:208:17e::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 03:14:15 +0000 Received: from CO1PEPF000044FB.namprd21.prod.outlook.com (2603:10b6:5:177:cafe::97) by DM6PR02CA0055.outlook.office365.com (2603:10b6:5:177::32) 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 03:14: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 CO1PEPF000044FB.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.0 via Frontend Transport; Wed, 7 Feb 2024 03:14: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; Tue, 6 Feb 2024 21:13:52 -0600 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH v3 01/13] net/ionic: add stat for completion queue entries processed Date: Tue, 6 Feb 2024 19:13:05 -0800 Message-ID: <20240207031317.32293-2-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240207031317.32293-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@amd.com> <20240207031317.32293-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: CO1PEPF000044FB:EE_|BL0PR12MB4993:EE_ X-MS-Office365-Filtering-Correlation-Id: e31a182e-d1fb-4adb-cd7d-08dc278add38 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y9o+SSzirr8Ut4BS3CCOSY/q8wMPUo7n83gpA8bcBY+q5FQ+1EIXxpmrsh8qs4Btv+xUN960JG49mKbsoJfsSgEZ9OLWw+n2pjgy9keuf1Jg78raBrwf1yztzn5toGeKmGQ5CNfXqgdiex8hipnkr2jn7ntrdc/+P/mwNRDfM2lt+EYstoR6u/hWWUM/+cteuByz3uM8ko5uolhg6mLPnH4BIWQVVFkbbGndjTwWBVTV87uJWi//v8zUgfA8RyOYJmb+MORqFDGtG3dm4JGRJ7XIsi3yDP/6OQU83OyTqjd9XFoLDbRZoW5FSiJnQEIpcw2y010B4sWOT9rNoT1O9+ENMgB7Xmhwob/8MWfoFm3apy1BRNusRGKvuETQXXIeo1Xg6r1eig6eFU/M9cZkyhrM1zPOVOQzOPiHuVox60mncKnvMDBiefGWMFtGH7S23eXj7MJQ1CW8lYTT1P8kVDiUzaizGk8yKK4BrHUvGySo5Esjlzj+rbDIeRzKUAyBo9KS6DPdsbQI/XIu0QkbXffp8qaSn/MidpnUgOReULPwBNwTrDFjthXdoWbYAzvaoWw4M6jyTjk/kv0uFTbr0qIpe3mjzAmaX/dK/FKm4M2k5Jl0m9wb7rk7yLEzG6efhZ4c7IeQlQXWbyOAQsewEEiRbUGJWFJ+d2o5cJLDnjD8JGw/OmB0Nbo6XvJ7ekDT9+wJ0t7O4gUrGPkthF2psUUU9mEpphoh/xucg0FNnlHSOpF2dN/Q5+uUcytLrDUeL7fxPxh7jN4FDBgEKO45Bg== 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)(376002)(346002)(136003)(396003)(230922051799003)(82310400011)(186009)(451199024)(1800799012)(64100799003)(40470700004)(36840700001)(46966006)(41300700001)(44832011)(47076005)(70586007)(8676002)(8936002)(70206006)(2906002)(5660300002)(86362001)(4326008)(6916009)(316002)(36756003)(36860700001)(356005)(82740400003)(478600001)(81166007)(6666004)(26005)(2616005)(16526019)(426003)(1076003)(336012)(40460700003)(40480700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 03:14:14.8819 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e31a182e-d1fb-4adb-cd7d-08dc278add38 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: CO1PEPF000044FB.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4993 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 Wed Feb 7 03:13:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136459 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 9C8FC43A2A; Wed, 7 Feb 2024 04:14:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1908442D9D; Wed, 7 Feb 2024 04:14:24 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2054.outbound.protection.outlook.com [40.107.244.54]) by mails.dpdk.org (Postfix) with ESMTP id E6C0C42DC4 for ; Wed, 7 Feb 2024 04:14:21 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F5ZJmj8auKZ84BUW15x4eS0d6fOrJrOljKc5rGieW4DtP0qoK5Y3Rnbpiy+ADeJaU/9WDkrOHb/hp56ZNm4o6bObdkms9sDaZHLw3EmbeKOVaX3WM+taYPSOiyoe66boyCzFq49H0sq7PjPOXneDxa2qCpc+V1PHzP8A441IQdxkx0sOl/v4tiGac3cSsg6lwvcpCow6EkINc3w2Wd3T1X0Hb7iyTNuFyoT0ztdGTKqtQAdDZosQRh7AajcPnNLB8i9ZnvIjlSz6QtkAx3NaCCY0J8p9PDx6VJ7Mev/v09VVeVtJZiP9lx0rTqeN9Bw9Y4AgP0kEgsMOswW8Ot+U7w== 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=mkc1NhgRJdPGo4zijEW0qfqxsoO+K3OyQW8BuVCQ/Nk3MiYcUC4gfL9UeYOcL8nEpU/HmobVxAUhRvvGsf7IKdyeQu3MAsMSx7tgiGb8sPCKTYtY8MDXU/Wzk0oMZ8PEObWZtt3Lciy60/jTEYkhKndvKWxLDNKFXujrZi5yQRCsOzaB1VHb8Qok8BtfD7+TSoFa8wr+z1ylLxLHavDyo+XNg3KHl3pKS/EZIOtnwWI3k8HF0muLX1U7CHZNIy6PHpG5JthkUKmAPX8Ld1hjbboeITbYTJ4ZF7meZWOa4VRYtmh+yL8ZRBIYCWCdxZLQAjQZR60feUxdSKpxuBUZww== 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=DlR64k1ZXhSB5MDe+uqfZLMv/bw777Lmr/ZrtmOosin8zW7in+7JthNP7SR3a7SsC5SAIde/clOZawPSMR9bPxTfZPIs0jiNZcktANHhUf/Y8360/H71D9lVMoWP8LJS2lTzL7O083DG2+R+YAUvzpyKvXtybROiUYnLDpUCToA= Received: from DM6PR02CA0066.namprd02.prod.outlook.com (2603:10b6:5:177::43) by PH8PR12MB7423.namprd12.prod.outlook.com (2603:10b6:510:229::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.14; Wed, 7 Feb 2024 03:14:17 +0000 Received: from CO1PEPF000044FB.namprd21.prod.outlook.com (2603:10b6:5:177:cafe::b3) by DM6PR02CA0066.outlook.office365.com (2603:10b6:5:177::43) 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 03:14:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044FB.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.0 via Frontend Transport; Wed, 7 Feb 2024 03:14: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; Tue, 6 Feb 2024 21:14:13 -0600 From: Andrew Boyer To: CC: Andrew Boyer , Bhuvan Mital Subject: [PATCH v3 02/13] net/ionic: increase max supported MTU to 9750 bytes Date: Tue, 6 Feb 2024 19:13:06 -0800 Message-ID: <20240207031317.32293-3-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240207031317.32293-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@amd.com> <20240207031317.32293-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: CO1PEPF000044FB:EE_|PH8PR12MB7423:EE_ X-MS-Office365-Filtering-Correlation-Id: f94c8336-a557-46ae-48b2-08dc278ade78 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UMqEqJsF53qzWpyccsLz8phloJ0yXqJ6kmSFsi3NFhYuPDdWd5DXgYjVjLb27GQZIB5SkyFnD2sZXR02D+Ag44QczY/KEEG+oKtOCQoxukG9R0nfc9wkfrdAh7dVprWViVAWd0PKWK9QOY6dqawmvDz2RpTYW7BkUc8joxQeCN7R1aF3LRbXtqXTYUn6hCFuPaV/lK1bqMEG/cEGRDvXBfPQNDN5xUzHMvDFHhty47POtjF3+MLgdv8+Dqjd0rRA9VHW3gEKLhoPmqD0AlalPllwqlKshghu893AFIhLdfIuiu7401DQlVoC9Atw1FbJvRrwHTtxG1ySATledwOSBwlbLIzyv0u+5xKHdrR/7wGV3XVgxH9Eof2zarYjg3tZsJ0+bfDzjnKYAhBMbpuHQzKfQKozgVjcCYSTMMd/7PNzKve9paI0mY9edg0rIr+xZbYy3/DrPOE4o2M+Ws3gQ47R0TzlK0xUNHw7qszESCHtX11IPacyi1kHedtdFUp/7j28UF1OTdQ+J5Ciczs6gbVo9aF1kA0trrVGiLH94YniS5NWEcXR4TIXj3QggroqHurKLlK1RImjVARy3vGTdV+mgQ6O5rvRHDGIgNbyk9aP95SGDoeetg6rMvUk5A7HRwUrv54101ERIC9IwRU9HBO02mwmJoSTzKtUzgJFY8cWeSLAoPiYkg/kiSkfy+qDdbwBmTKHUuiYA4bP7JzsYKIf8az4mIlfNxndzZJmTFj6LUfJnR3aWkd+AgulPNmAQbl5+MVxcfoqDC3TXtMQCA== 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)(376002)(136003)(396003)(346002)(230922051799003)(82310400011)(451199024)(186009)(64100799003)(1800799012)(40470700004)(46966006)(36840700001)(41300700001)(36860700001)(44832011)(70206006)(70586007)(5660300002)(86362001)(4326008)(8676002)(8936002)(4744005)(2906002)(6916009)(81166007)(54906003)(6666004)(316002)(82740400003)(47076005)(478600001)(356005)(83380400001)(2616005)(426003)(16526019)(336012)(36756003)(1076003)(40460700003)(40480700001)(26005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 03:14:16.9600 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f94c8336-a557-46ae-48b2-08dc278ade78 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: CO1PEPF000044FB.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7423 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 Wed Feb 7 03:13:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136458 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 6206343A2A; Wed, 7 Feb 2024 04:14:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D164842DBE; Wed, 7 Feb 2024 04:14:21 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2040.outbound.protection.outlook.com [40.107.243.40]) by mails.dpdk.org (Postfix) with ESMTP id 90E7A42D9D for ; Wed, 7 Feb 2024 04:14:20 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a1CIz8GSwzfTI7Im+B1ZEPjHFGOdqSyrtz7MLMJc+6cDzDInqVluCelibc0vndAY6q56ksWF0lEld5FmHPaXAE7kO88r5kdQuhYZaWjbXEXDZpFBdVFdpQB5ewYauz1133DunIkXs7ah48h3z31DMOHL1PHwaSpE2PMy9gCWM32ik+K0pchonZIoV34q6XQWSvVIPiuQO/4t1A6piW4s14PTx9FvdTlaAdjC2DDODAa0wpQKdnTDyWruYc3ws3PrJvrGQsP78qtPDTPQnHwkyO11INlHNkxWHxNPPNSsoFD54htyD5rAh7p1OuuO5uo7rZPsCmwMKcZax2kTlJFpCw== 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=QUp2qaWwJ1m9yBQEvUNeD0TZUKm9Q8PUh0UAGpi9VmVP2JAgAjwWriZxPwj9etTQNNy2wrYihXKvB3kMDxFGHyC7CKuIp9DJpaKqPFj4uxwsyWVWtlteDPulsCm5aLqzVnV49j+2OLW6Hka63JExX46DB6T2ILoApoBlEhnsf280gRw7dlyFKRcPGkYEnwuIwY5Ftb0l3vkBSJXE8D+MzDR7OKw8QxgUNIap689NhBaApCUkd8WajSGyv/B09Alc6HlaSFyni3kXkPQocLhI1Vc/uq/aguzal6cxqAsh0d3NA5JsAbVoL6PtI7N1Q8JfUsOPUMlrqWUe1oC4aOMExA== 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=Q+iecznTxwNo3R4OPUPf0+oPcn4Xs23U8WCrQPWG4l6EtILKw/LeTBV+5joQmpUQuf4vvsNX+ff6XR43Fs+DsUjCgRk0LSrlp4Apk7TEJXzBYfCdBxSr4FgF7jE1e6f6cNQE6shGi1cYa+IvkDIXlJ+Gt36AEpWkOEu82/L3EGo= Received: from DM6PR02CA0145.namprd02.prod.outlook.com (2603:10b6:5:332::12) by PH8PR12MB7304.namprd12.prod.outlook.com (2603:10b6:510:217::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.15; Wed, 7 Feb 2024 03:14:18 +0000 Received: from CO1PEPF000044F7.namprd21.prod.outlook.com (2603:10b6:5:332:cafe::2c) by DM6PR02CA0145.outlook.office365.com (2603:10b6:5:332::12) 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 03:14: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 CO1PEPF000044F7.mail.protection.outlook.com (10.167.241.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.0 via Frontend Transport; Wed, 7 Feb 2024 03:14: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; Tue, 6 Feb 2024 21:14:13 -0600 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH v3 03/13] net/ionic: don't auto-enable Rx scatter-gather a second time Date: Tue, 6 Feb 2024 19:13:07 -0800 Message-ID: <20240207031317.32293-4-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240207031317.32293-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@amd.com> <20240207031317.32293-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: CO1PEPF000044F7:EE_|PH8PR12MB7304:EE_ X-MS-Office365-Filtering-Correlation-Id: e5292af0-85c2-4ad7-0ac8-08dc278adf31 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gKQMxP7O7JOhAMuu/JSUq/Y9ubYkifuhnRvltpUxQAw9IpgjNOVAs+TVgHeS6SYPgRmajsOpFSbkzmVbok0UsckoPUGpPP4g4gJ0YQOc/RTXGpoF7adREP/ThF5JoyGmxU75f448WqqFllbv1rGDdtL02hO8AGZPpSmBiQdXbsPRDlPW2ia7nNcsfu9WN1hgTc2f28rKClF8k4O+8YJexfCUmNyAaREfpS06TWM90GK2pz+JuYgrUAQtQ50opOYZTBg0n4fcq61/uI9QIXaYbjL+PKio+jd/y4FzWzKfoXrcZYFd/dE7fEcEYN1+c1E6QmeceWfyX6gg+folqYnoH9iJV0GhRkn3jMguS3jnbYsdmIlcXpXtsKRQ0lL2KUh3djvwWaKpHHA3+AugMUbFdM+lKoJtYJ70dLK7wQ0s0KEZrZuODMOr0e7iLu2n9CWP3XdLQqyf4d9XI6QITD0sKsuYYvGRH3bSTCbuqL7ipoFEpnOIRnZRNiuBQBleqRCTJmH7jgYBf15F75p5hpM72DmRhsWPSQ9xKpekCWUSKIXV7Ha2mgsmvBgUxq44r/m6SA+yaRaBqck5yi6+ErFrlwtZG9Qkgv5O4ZmIYXVW6D1nN8jNk+c7sZrbo8Nkkf8nPvWWtkZRe6MZEUpIBDNxiX2nyOSNGpoXw33GZQBccfBOXcAaJ6CadFh+NkU1helFqMRXGZnwe/W+bdTq3WwfxJgSSZG1QMrbzFpJJiOaQRf/QtdvtVU/owvd03ui0dc4sa+s1RDL54OGDM14bLwsxA== 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)(376002)(346002)(39860400002)(396003)(230922051799003)(186009)(1800799012)(451199024)(82310400011)(64100799003)(46966006)(36840700001)(40470700004)(41300700001)(16526019)(26005)(47076005)(86362001)(336012)(1076003)(6666004)(478600001)(70206006)(8676002)(44832011)(4326008)(2906002)(70586007)(5660300002)(426003)(2616005)(316002)(6916009)(83380400001)(82740400003)(4744005)(81166007)(356005)(36860700001)(8936002)(36756003)(40460700003)(40480700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 03:14:18.1552 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e5292af0-85c2-4ad7-0ac8-08dc278adf31 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: CO1PEPF000044F7.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7304 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 Wed Feb 7 03:13:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136461 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 0320943A2A; Wed, 7 Feb 2024 04:14:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D86A442DE9; Wed, 7 Feb 2024 04:14:26 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2082.outbound.protection.outlook.com [40.107.237.82]) by mails.dpdk.org (Postfix) with ESMTP id 99F7D42D9D; Wed, 7 Feb 2024 04:14:21 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cvbmbPo0wyA45w5GpaZZSMcPKEwGc4mam2GCBiTPQqRttmVMthUeq71o02QzKaBupJqoSGPMFFRbf1MepDkxRSn6wav8TjAZ8FHSvzyl+zN/7baBNrHlsp6X3DQFfJ413AJRc0WN0lx2FpUeH3G4lanuyj7t6Iu1olCcxfP6ZFGt9EXTCprVtb1BKYamZ+x3EfrDEOqE+A+ti1ONfb0CaZyya/IVQ4fBP6QyDuy/Rl1YIuf/2MNlU/qrig+gwaGNZWdy4pVUxhFu+GNGhoi6acOHbBJqlSk+E2g+vcp11F7k9yYKOEjOBfkrnUoqU3LtjxOCoVCxZ2BxWsxkwTvJBA== 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=YnhcSGuWg3jjfPIsTwcRBGYKgNSPpd01jpGgiWOtX0Rhr1k0di0u921SS71x6z3ITKLWk4VKRJqZzbGvw+0tfxREHbSVvs8Cl54OWkY12JfZ6qkIW+AiIC7zFArTIRI1d3vWYNaWLwtXsmbYizmT95b9CoWGFMXy77mYP5V9/NOCaiB2TT+S7AMhWchAjU/4HheIKRxt8w/p35N35hgYcLQgo5dlk0JZDlLZNX1BdOPnbjQoxHSoLU5PauIsu8ChNBRZM8xGiUuPj5xN4WVTc96Az88EyRVjlmJpOSaCzakRXWmeA4GNvTNjLDZXak6S4KTpJcLUPdOoUUc2RII5Ww== 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=JhKzfNcC3qWvcTVYsentw5upkJONj8LmhI9HlkNy5xRegog1Wf2H7ggnyiMkNos8edtKeLzOB2S0LajAcqmq4OoRpXg5IJO3acBphvWUEs95A3q+mXTsHImxB/2xLhH11KtvbUxSWYZy6ury92i4B9icFpUz+1TGCfwPd/hYP50= Received: from DM6PR02CA0153.namprd02.prod.outlook.com (2603:10b6:5:332::20) by BY5PR12MB4274.namprd12.prod.outlook.com (2603:10b6:a03:206::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.12; Wed, 7 Feb 2024 03:14:19 +0000 Received: from CO1PEPF000044F7.namprd21.prod.outlook.com (2603:10b6:5:332:cafe::3d) by DM6PR02CA0153.outlook.office365.com (2603:10b6:5:332::20) 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 03:14:19 +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 CO1PEPF000044F7.mail.protection.outlook.com (10.167.241.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.0 via Frontend Transport; Wed, 7 Feb 2024 03:14:19 +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 21:14:14 -0600 From: Andrew Boyer To: CC: Neel Patel , , Andrew Boyer Subject: [PATCH v3 04/13] net/ionic: fix missing volatile type for cqe pointers Date: Tue, 6 Feb 2024 19:13:08 -0800 Message-ID: <20240207031317.32293-5-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240207031317.32293-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@amd.com> <20240207031317.32293-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: CO1PEPF000044F7:EE_|BY5PR12MB4274:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a8d5ef5-d083-449a-52d2-08dc278adfbb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iD+H+bVgJLhxhNq6CpqZStv0wbRtjPV3m/5qWFtisn3NjuJYXqs0LcczvGOhRJ0ms5nGPQzGBr4ZAYfSfTpAsEFw4YUyOsTcW/IH2v3OxIyprCOaRdUU6DjIrdUkfW9Hop/aXOl1QlLZBwlBklL+2x/uGjPHCLP8EK+pf1MXxayDIQdfbCyLMBUfA7zDcibJfNaXX2+BgXPwONc8pDlbd1j6WTUUixOJ+XxhBjkdPkSf3WMA3lnfGA6rPDHopy79cmVUQhQfmwJuc8ZpWbXi0DImUP1ubuC6VSUe/R9LQM5BPjVKYXwKiisaBgaQvH/xknNp7/N69f5L/yFn6Ixp4s2V9jdaTcM2ypN+EypyAvSNGOVJTZK4KUFUZlYY8vTILZAR09KxeqgQ7BifNTtRGtxkQWG+ItGJVLSJ19BflWt0fsBiMgwdW9dwkEyzFem9nskouW0f2cKiC/xuM5uvXvGAYxwErWB49FWQLMfS3IZ3vULugNi99544ATpHLlCHyyXbOxDmQDJb9NrBlvwWx+FPTRSixmYAYaB2SBwNrwIzB41y0cpdbkGy8xftxnv94iEHvufOOFj8O3O5JOgn2GCpucVDy6tKJcpkfokkvVCwtqO/W+ld+y6OUITJ1++y2qGpAA5BVPFRqDx+AXDWBlwGrrXxKbohgKTaOP3hAgoopWFAFuDxExCnMBuVaMVz8NQNLzyWmJjNvr7iydnqB9h8fbB0HibWyKhtTVXIJc4LkWSwnDT0JSSLCHAthItakbtb/eEXaLlcSXdtXOT1Hg== 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)(396003)(346002)(136003)(376002)(230922051799003)(82310400011)(186009)(64100799003)(1800799012)(451199024)(36840700001)(40470700004)(46966006)(40460700003)(40480700001)(478600001)(5660300002)(41300700001)(2616005)(86362001)(4326008)(36756003)(2906002)(81166007)(83380400001)(426003)(450100002)(26005)(356005)(54906003)(1076003)(47076005)(16526019)(70206006)(8676002)(70586007)(44832011)(6666004)(316002)(336012)(6916009)(82740400003)(8936002)(36860700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 03:14:19.0614 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2a8d5ef5-d083-449a-52d2-08dc278adfbb 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: CO1PEPF000044F7.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4274 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 Wed Feb 7 03:13:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136460 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 4038643A2A; Wed, 7 Feb 2024 04:14:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 47B6642DDA; Wed, 7 Feb 2024 04:14:25 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2071.outbound.protection.outlook.com [40.107.102.71]) by mails.dpdk.org (Postfix) with ESMTP id 9610842DC9 for ; Wed, 7 Feb 2024 04:14:22 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ADQdRp9uexAXwtKW7yCqohR3C4S6nQIfiUBrCn18g5wf50G4L6Fql9edrLUSktubVC2RVNOgDQsCHeD71A7pK7TkMLLMmAR9puHYCcNAPmasxe3E9nxxkCsMqJJveSKw85f6l3EpAI8AqDnycw8rBr8L4IZh6vRNWM14zThOsCVdVeviHitLdjvnp/TiM6oVNtVFFjjgGur6b0iiDNt2d6kGEERLJUhA2LZa+G0DFV3CoV4ya1c+3H7NNxVEpG7FSGQu6jOzY+GQntsmFpl+/Q5BVh1TLwItMohfE5LTg8y9BPkeapCR5A5aTfGWggiPcCsV74XzNpagAG5oFZ19cg== 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=a3On1CPKA1o0sO5GzElCdpVO7PaT8iQMqT7kG77MoJWyGk0Ni89zLutm9eBNK38tfvMhBFobd6eeZUkir4N/kikiMGJv2T5iFADU76kn1Jfly0KGg5rQqjXNLNpmFEAtin9LN7SrhiEeYvN5I4H2fao6ahr3SSKZeroqNlqGoEEkSQSbmTNaR4QqGxiNvUorE8R5B/Pq8N9xxCo6Ai6s4XhUwn2ZboLvMSQGy6V53QNB+TC1XwLMUBrP5v7egg1BkXrXLuyqtRLEdYjUGW68Y44H+u1XBuNSTV9aC9LtuiGGtPm+KiBDjRjBqisBIcQqchxFmVFyGJ8bfwkB1IDWYA== 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=RBHFQvlsN4Evn9PXrx0dYdwF2HsHA8Fgfqdr8mqHLnUDR8RdnCTcpJ9wGhPgY0vPVEZdKjKCd05paHJxPSicHX2faGNbrSnEMnfr1IgjA9J7HOROanJGord1XltrE6RmlDooJiPjHCJrW0PUKk/10F6swRdxB6/WGFNEBRBVwRM= Received: from DM6PR02CA0145.namprd02.prod.outlook.com (2603:10b6:5:332::12) by BN9PR12MB5113.namprd12.prod.outlook.com (2603:10b6:408:136::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.17; Wed, 7 Feb 2024 03:14:20 +0000 Received: from CO1PEPF000044F7.namprd21.prod.outlook.com (2603:10b6:5:332:cafe::18) by DM6PR02CA0145.outlook.office365.com (2603:10b6:5:332::12) 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 03:14: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 CO1PEPF000044F7.mail.protection.outlook.com (10.167.241.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.0 via Frontend Transport; Wed, 7 Feb 2024 03:14:19 +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 21:14:14 -0600 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH v3 05/13] net/ionic: replace non-standard type in structure definition Date: Tue, 6 Feb 2024 19:13:09 -0800 Message-ID: <20240207031317.32293-6-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240207031317.32293-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@amd.com> <20240207031317.32293-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: CO1PEPF000044F7:EE_|BN9PR12MB5113:EE_ X-MS-Office365-Filtering-Correlation-Id: 97f3bc89-318a-402b-d628-08dc278ae040 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z2wSdFE1x8u8nMS3JGDXIhZuIogZLDsMzZEY6OTcA62iGkI2ag5hRsuRl/zcxE/sTNr3/rF5jw2zrlAFawddznlTbvXOuliMXF4xMpTIQMsabA+EFVnM/HvsUPwqHNmTVvcWs9TFIZdJ7x7gKbm3MmZViKuZdq6cKLR8jzqGoPhlm8Y4mZye20FtULHTYgxBO7RP8zAewZ11MzYA6HLyQtT7kPuEw6+7QwwUdrOZvWFZ9sFnE8AvX4Yy6/9r2y4JIbjqtIzuFI1y9aUyTpG+XacFXH1tCUQeMsty6gzWhoSKq4BT53bhNXts5xAMosmaChrg64oXUncnau0kwNlnqdmjGlXA/tyBsF3TjkIODRpOwaVH59JVqyH5fFHPgHsTUjTJp8B2A75Pj8ORAvc7seB0lr3u3ezsb0MlS3DLvD/2TzsPVvvcxzE4lBcK0jXE32jI6wML880USC5XHaL6cYEUs6XFqfzCj/5gJZKa7yosiqLBnThSbxfMEHp1OWMHHlXMbRUQdbV8mM190EURlpBLLLFoLW0V+9wyH7Opyt5F2ThxFfFzAVcFiQtqgrC6k3U5eMjvGkN7qk20mkMzdhV4uhxPio0m49sVu+ymy7nE2ipijNUzu2Mx+DLBsKwnk1sHFSAj2952s/4oD8QyUYK4QEs8G15ILSeBfq18oZn9Pro1PQGHx5/hHEAqORzggBnA6G0O/FP7fpZOipv8fBr7lKGRl4+ZRgSE3/SxriCOWOBRqOn9VN0FXi2XeVqLYb2ZNmc4hb+y2eO5O3B51w== 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)(39860400002)(136003)(396003)(346002)(230922051799003)(451199024)(64100799003)(1800799012)(82310400011)(186009)(40470700004)(36840700001)(46966006)(1076003)(16526019)(336012)(26005)(426003)(83380400001)(40460700003)(40480700001)(41300700001)(6666004)(4744005)(8936002)(36860700001)(44832011)(86362001)(5660300002)(47076005)(70586007)(70206006)(6916009)(2616005)(478600001)(2906002)(356005)(81166007)(82740400003)(8676002)(36756003)(4326008)(316002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 03:14:19.9364 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 97f3bc89-318a-402b-d628-08dc278ae040 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: CO1PEPF000044F7.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5113 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 Wed Feb 7 03:13:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136465 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 6A73643A2A; Wed, 7 Feb 2024 04:15:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5FDB742E08; Wed, 7 Feb 2024 04:14:32 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2072.outbound.protection.outlook.com [40.107.92.72]) by mails.dpdk.org (Postfix) with ESMTP id 12A2042DD3 for ; Wed, 7 Feb 2024 04:14:24 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U5WEGO+7VpE+asWHlYKyqMFBMLh7FZ6p+EAVmTRS6iOmvGrIVHoLTtbiG5XlRJQqcGoimTokf4iL0/kdvY57hs2jH/ll3q2LOspBWN2DtGFNekasz6OUbS//JuL5PvTipBo/L6Wrs6KyKVAcDjeOHmC7wxK21DfsFj3Nz2Kxf7ASbasVZBqwnI6K0LiXkraFPEUinM0EIPAQ2D3W9PJjnwV0Z3XV2tKhWq+kn7cfT2Q6A/BFvKr80PWpTvEXw/xvuG3LeZoanYPLZQDsxUfpOgTPeuZn25sBtc+9PgpDN/oVaIaPlQuYthbTUaS5VcOBuQHjsCpWaR+GhEWluHlTUA== 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=WP0O4HVaJqFm//3J6N3bUSbzt9iY6y0BEWZgpAEFRo1WkJoFfvhidLJ7VtzCc293Bj4uFel3wolL8YIhAFjJO0QZ2D+l+N2mTRGXZrIc+ONSgWW4RkA+Nf7NjoAz1gIvgUwFt/DbTYoH+hp/cVq5kcphJDoj7m3LnrHKH1ss8EGhTM7Y+elqO5g6zjLJOvz+01Y7eSDCfL1NgvBhYQ+LZXW46vgCGzdpfbpS2q718vqtHr8NqNR3tF84+0KcGX/Xu0pGz194YBcViGa6lOKqD32tTAnDwBjm3A72Di5WT9HGvF0DOTvfno5opjf5ZnPSanZrSwReWrzMCtpiCs7jdw== 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=0Hxqyz3CqkNk4dH7eTIcrPKAyzzUUA+BeKDCg3386QaJsa0npmlC6b4fR+VHZtC0peR0QjzBtsUJlBdslpQg9SFFBrDPnR8TDV0sU9audKBFBrM4lozRCn89KID9yYIr718xnPzdBdn2xp9l/oyWPAC5han2hy4G1iQsrQ3bUg8= Received: from DM6PR02CA0068.namprd02.prod.outlook.com (2603:10b6:5:177::45) by IA0PR12MB7603.namprd12.prod.outlook.com (2603:10b6:208:439::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.14; Wed, 7 Feb 2024 03:14:20 +0000 Received: from CO1PEPF000044FB.namprd21.prod.outlook.com (2603:10b6:5:177:cafe::4d) by DM6PR02CA0068.outlook.office365.com (2603:10b6:5:177::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.37 via Frontend Transport; Wed, 7 Feb 2024 03:14: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 CO1PEPF000044FB.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.0 via Frontend Transport; Wed, 7 Feb 2024 03:14: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; Tue, 6 Feb 2024 21:14:15 -0600 From: Andrew Boyer To: CC: Neel Patel , Andrew Boyer Subject: [PATCH v3 06/13] net/ionic: memcpy descriptors when using Q-in-CMB Date: Tue, 6 Feb 2024 19:13:10 -0800 Message-ID: <20240207031317.32293-7-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240207031317.32293-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@amd.com> <20240207031317.32293-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: CO1PEPF000044FB:EE_|IA0PR12MB7603:EE_ X-MS-Office365-Filtering-Correlation-Id: 135ae32f-9cde-4159-e280-08dc278ae078 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q8HJfJNU3ybXmbJzI0GSydfhwoHUR3XK3V7Z+/T8d1TXulXp7GWiWMPXINFsYtdvYfDXUyRPVXZyTDXZ5U3qmUMM9tM9qbRJDFLH3X7Jm1BkMzt/PSpNTt06YKL3dqjK9S7QTNuaL8XFEdCLXQr0Zg4oOcDVt7Sy1qVk3NVJErFGHdEjlidG6TtbZrssDqb3z3GBkre9ypcBGQ2dpZyokgquPMmec+Wvf+LhFXFmI+V4sHfVPSr326Z5Q3nJL8ktAm3BAgPv7oIKBzmHiOF1FXqbNaXthFEcIaA0XHN/zkSLt3fBYms0NrrtuRVdB4mBn6qzmvfdik0R8oc/Pk3b6kZCoYSxxH01Ku1so1iUciZbi2LCs5Jqdi6Xf6wDHnnNPUCNBEL51TqbqXAiObgQpMyaFmtcmQUKK0N9mpRS2KbjYabemSpUKWo81GKp0EebX+uiylKbOY5KeqGbfdh831Nt3C+ylnj8vnBkwE4ymuRgMLOin5xi4BR3JJxT02xSNwqrOQQI+xYee//mirJoZkOrrfnJc6c3mCZpBtt/uWUUkK2oXI1O+AEtSdncDh2s8RmuhvzS+6/Ztw6RLkfn3ZcZBgkOILeZmo0pFjGoiToOUPSPSQllk83p2Fu9qEHxP5Tma2rgFXw5zngkkmLbbvUp1UAMssjfGyDz9i+02a5QtHq0RuFKHcEv32rI1npnDZ2wF2H3FikbyMGWzA39u89j7L28JIMFtUMSEmO2lGeemZUNvWGMeUemjVu/EwGGJq/spO5ct9VZj+sbjPqGew== 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)(396003)(376002)(39860400002)(346002)(230922051799003)(64100799003)(186009)(451199024)(1800799012)(82310400011)(46966006)(40470700004)(36840700001)(40480700001)(40460700003)(356005)(86362001)(41300700001)(47076005)(81166007)(16526019)(36756003)(82740400003)(83380400001)(336012)(36860700001)(1076003)(26005)(426003)(54906003)(8936002)(8676002)(478600001)(6666004)(2906002)(70206006)(5660300002)(2616005)(316002)(44832011)(30864003)(4326008)(70586007)(6916009)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 03:14:20.3194 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 135ae32f-9cde-4159-e280-08dc278ae078 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: CO1PEPF000044FB.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7603 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 Wed Feb 7 03:13:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136466 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 DE49A43A2A; Wed, 7 Feb 2024 04:15:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B6C7B42E18; Wed, 7 Feb 2024 04:14:33 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2046.outbound.protection.outlook.com [40.107.94.46]) by mails.dpdk.org (Postfix) with ESMTP id 2CF5A42DD9; Wed, 7 Feb 2024 04:14:24 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ExdNgE8EB0769tZT7hjEvXjUFGXMinNkVpHyZEzojdO2TVDkT/NM0ef7E4FNCV0OF39Ac2e/L8dwWg2OprCmRH5foK2Psdp67GfvyGsbQVgNYwm+yG8ozGqTbM8dPPt44xvf8uV1jskqJtTTnVzlz3eLy//2wICprUblLQmQmKt23ZdBL8E4qM3bWURoeTqIgVJzKz5xY1ijWfhXNnM+06GC4CJ/WpPNqqeAxHmAlsG9YQ5qHjX+U6YLecB6Tzk/l5Pi6kcXiVIUWkQWPGCAIsfaftuj5NRB9Njqi/5tWZht0LgqKebhsvbC60sq+MVVPTpVF23t19js3ToJy/izxQ== 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=KyI0/J+yXH0Bbge7csA3yEg+AtxZdoL5g5J8mCYnwqTAGX9V7xQ8cFBuly0cqCxq5jy5WSxN0B+y9Jb1E/gOIJx6dr23ZqLKzJImGNFsFJKRZiqet09LgcheY3YLyPHXZAj6HqqpiBCBPvjYMqVc0GtAA0kdyWPps1ZMA1yhVRWOwdhNOeelwk4I4eCZl/0N+ggA1GRbw+Ki2IwUul2woJnf6cHbG9ZwtptOgLysT+PtuHJH/nv+NXX2R8uBDttu6UsFrxAxmdPZJlEPKnOE/4JS4xw4WDNKvvT3eh3tzb2oI3t63LyISAA6fVL9LC85roTS/l1WvA4XfYEAxqmA5w== 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=ciNkSw/frPUxLc0NEsNTxQdcxgyXoj+GMCohaZwV2ZjAoWJtiVWgUuLHqxNl0Iy2GRbFnwo9EMqn5N2yEdbTPbNVOXDDT0ZgRoqiQr8nLvS0IMo5LjnI4r/uupf2XBLKtUlGi108wucNxQ5EXaIXdoKgP2BitYPt+LgO0aXQcA4= Received: from DM6PR02CA0152.namprd02.prod.outlook.com (2603:10b6:5:332::19) by SA1PR12MB7247.namprd12.prod.outlook.com (2603:10b6:806:2bb::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.14; Wed, 7 Feb 2024 03:14:21 +0000 Received: from CO1PEPF000044F7.namprd21.prod.outlook.com (2603:10b6:5:332:cafe::a3) by DM6PR02CA0152.outlook.office365.com (2603:10b6:5:332::19) 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 03:14:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044F7.mail.protection.outlook.com (10.167.241.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.0 via Frontend Transport; Wed, 7 Feb 2024 03:14: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; Tue, 6 Feb 2024 21:14:16 -0600 From: Andrew Boyer To: CC: Akshay Dorwat , , , Andrew Boyer Subject: [PATCH v3 07/13] net/ionic: fix RSS query routine Date: Tue, 6 Feb 2024 19:13:11 -0800 Message-ID: <20240207031317.32293-8-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240207031317.32293-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@amd.com> <20240207031317.32293-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: CO1PEPF000044F7:EE_|SA1PR12MB7247:EE_ X-MS-Office365-Filtering-Correlation-Id: 06d085ca-27df-4f3d-f7ab-08dc278ae0c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b6Qbuu2nVPLq+/TggQhfTafU5+UvDDPf2ImQ7RA4E9m1G7QVO/kUInYJpBDr6pN1w7308UbUteO0WQ3Y9ywbqPpE+aWBU5HViJE8j7y5hoQ9zXxvxcOL0mhxPAwTeyu4W9+bPxWqlQ9aZKeOZHuFruK35NnTnGbc7EMBi5XxMqapYxuX46s+fFWe+2alKZtqRtN26+cP23ikZQzrCxPMdNfPzwqOAmvbqHQnnAi2VhDFvr/kQL1/7YdSXlvpHE0oQC9XHMV5gTbRIjh2k2aR/bX5cR28ue8innnp/byl9kHs70MxkoakIF6BBkSQkCJ4TIZOqPc1ot6NSbtxPWENOjRLS01SUpN8maobOfMFFY1XL/3Lwzq6Bl10ccluB2dVtu3FXb8FzNsqyjVAdRmE3wtlza1ZiEbYDew4hf1pWMzif4pYuLzszLjHBvoU6qDkJMG1RhUOpXwVfxThFHNAMMMYGPxCcSxjsLYWBCkt6fWXekHwDTzkQQkXSEqimALLVHfnjzYXgUg8DPA3d9BeBeKFS4NfwGKyJuhFksic4g1sjxqUeNTtUXVDQOfTsep/isggcvgOjSL+QcbDTp1+2Ak0V8y9HDjA4mwcvW7w/foW4j62mv+FZZB2oNbz0Pxlfh6QCLrDNUz/Y0ppEFoPlIAAuclgxc7ZRB//GDtgQoehevYDj2OLXm9LmPOqtLVApe/eqUpjxn/zpNBjU9k25eVs4hyL09VZu3UrxOhUuD7KvIJ9oBmFHPYjcYZbmuORyDFpP5gEhZPekmDewuHJGA== 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)(396003)(376002)(346002)(136003)(230922051799003)(451199024)(64100799003)(82310400011)(1800799012)(186009)(46966006)(36840700001)(40470700004)(40460700003)(478600001)(26005)(83380400001)(2616005)(81166007)(336012)(16526019)(82740400003)(41300700001)(54906003)(2906002)(36860700001)(8936002)(6916009)(70206006)(356005)(316002)(1076003)(44832011)(8676002)(5660300002)(47076005)(6666004)(426003)(70586007)(86362001)(4326008)(36756003)(40480700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 03:14:20.8114 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 06d085ca-27df-4f3d-f7ab-08dc278ae0c3 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: CO1PEPF000044F7.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7247 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 Wed Feb 7 03:13:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136462 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 0985343A2A; Wed, 7 Feb 2024 04:14:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 28A2F42DF1; Wed, 7 Feb 2024 04:14:28 +0100 (CET) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2059.outbound.protection.outlook.com [40.107.95.59]) by mails.dpdk.org (Postfix) with ESMTP id ACFCA42D9D for ; Wed, 7 Feb 2024 04:14:23 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hnu9of2Uqb6xpXol2Huhwct+PUcuGf7lfsr8NTu3wq4TXawl+kRM2I596vp5Rl7N8348EZe1VKiVDpfH+fRubN8FUFGP1C0fjfDq+YclXH4RssB/DdOmmd3I7x7PbOVC9CFKWSWrcrXngJkmHpwVPhFaCRXICAIubQa80MSX4/RjmB5XeXeuGzD+xhzGdp88uZxO1h0pPgfPciCrlThviz0rG2L8BKvXepHSrdXH0/YDKNXHbzwoa0MQfFJJvMVZtmFhe3+RMbw44elpg2HRD9o7mzcHVgG2RQQ7lQtjPtNrxnPQBc+KMtwDkLBS3oL73TqVXT89582eEJw2P6LaXA== 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=Mud7eW8ehzyayk94GxmYlByg4wBZClN0osnCczrdqgU1qidcjT7JagFY4a0FwzoWEmjnuB3Ga9hIeHHFnuLosk+5D8KXMLSBW0g18owuxfSUWXf6brM2jGZ/A4zOUl22pSjF9+yokCBgcBrjnfDIwe5RC5Ht+MT5PnP6bnVcETXVGvpXO86AAMcbzoG/PyvfV5oQkoDfqPhUDxmTxReHw8ZbvtJmV1jFsFXcYyLjdf9AC+GAq6OqQyY4EoRfQNgQNjPwh9P43IcDzgzWrse3/n4PO7Zy3z/Np0GkUOZVKyv0LbQ4Cgs5TdTSlz6rrD7yQZzCSonJ/LocgZmE+Ki2Bg== 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=lif+A2uK6ixbsI7kR7/8fMXFlr+6O2SNA5buhbN5rTgu4rZ8pgRgYyQ7woN7FAnOgdTxepOo3jPnGvtlHqkbYb3oETlP1DOkZMR9fDRdnu3j9dQJsTTiKuocmynxoAy9qcc9k0IaoB9YO5seNu9o8KLkV+kEDSIV0mmdcnvp/o0= Received: from DM6PR02CA0061.namprd02.prod.outlook.com (2603:10b6:5:177::38) by BN9PR12MB5161.namprd12.prod.outlook.com (2603:10b6:408:11a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.17; Wed, 7 Feb 2024 03:14:21 +0000 Received: from CO1PEPF000044FB.namprd21.prod.outlook.com (2603:10b6:5:177:cafe::fb) by DM6PR02CA0061.outlook.office365.com (2603:10b6:5:177::38) 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 03:14:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044FB.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.0 via Frontend Transport; Wed, 7 Feb 2024 03:14: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; Tue, 6 Feb 2024 21:14:16 -0600 From: Andrew Boyer To: CC: Vamsi Krishna Atluri , Andrew Boyer Subject: [PATCH v3 08/13] net/ionic: report 1G and 200G link speeds when applicable Date: Tue, 6 Feb 2024 19:13:12 -0800 Message-ID: <20240207031317.32293-9-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240207031317.32293-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@amd.com> <20240207031317.32293-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: CO1PEPF000044FB:EE_|BN9PR12MB5161:EE_ X-MS-Office365-Filtering-Correlation-Id: 5caef424-5ee5-40d9-8d35-08dc278ae105 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hWtE4NP4KIRQf2z1CFrTdGaA/KZq1CVCbzPCV5SWJvyozmITZuD4G2aV5Y1BHT76IgvFjFkz7ODyY5NIKdtEH1fvGD40ELYdc3BQzUOg21LvF2EV3hOTWb0KOrsg/CMrrNCCmaEVNMZIczgjPmPiPtNW5IxMiJ7jSDgepd3thPCYj0xAVy9HYCiiXbjDucJIgSk8pl7fWtmaers9OqFnbyQ6kMegxekxKpNITnfbt0EiIQnlWfBHE2ydeG54hmrpP5+8Zs4Z6OZ5MpPvk0zRl//1cahRdbJgvapbDaQBT6CQMaj3B0NIWZmamx69pY/fiHPj+PHp2t3Pzicc8vxa5fKljbN1DWJfemzJH0enD2tC1ccuBwZDp97MY33Qj/mTYFTvekdNqpc8b4lCBmLam21zdVLRAWcwRyslU7xMyFGSNq+ZGfQ4Ww924jM3qH+pjoOF1q2fTKNvd8tftC/Iqk44+8mi3fxCFT4z+/akL2JS3XMqxcIEHb2A1sg3Wqcqm28oDcOtrqW26AMOHy2EC1OlxbzrFk9xs8QTFetxuw0vOvW3AmziCePWADuLyTlA2Lb7boiqk/yzl3wQ4Nwg0EKbxT0q2hPGvUbkjjUCL1luswAZ0BoIFRHulDHZirk88Vxy8MXIJgRim7sprwkI9hb6ydjb1Jcgys/s3SJFuxOjpQHtPoeggoEsO2t2yXMlzoHAMfbSZn2783a5nAfy3GDGthqAacXRSMlyZ4nyiQ5QYt/C1uR21vz1O05EY8Fk8/N6n4fPkjnyChCvrTUIzA== 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)(376002)(39860400002)(346002)(396003)(230922051799003)(451199024)(82310400011)(1800799012)(186009)(64100799003)(46966006)(40470700004)(36840700001)(41300700001)(4326008)(26005)(2616005)(6666004)(8936002)(2906002)(16526019)(86362001)(70586007)(70206006)(44832011)(8676002)(47076005)(5660300002)(478600001)(316002)(54906003)(82740400003)(81166007)(356005)(426003)(83380400001)(336012)(6916009)(36860700001)(1076003)(36756003)(40480700001)(40460700003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 03:14:21.2569 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5caef424-5ee5-40d9-8d35-08dc278ae105 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: CO1PEPF000044FB.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5161 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 Wed Feb 7 03:13:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136464 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 6F01943A2A; Wed, 7 Feb 2024 04:14:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C343042DFF; Wed, 7 Feb 2024 04:14:30 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2046.outbound.protection.outlook.com [40.107.93.46]) by mails.dpdk.org (Postfix) with ESMTP id E6AA342DC9 for ; Wed, 7 Feb 2024 04:14:23 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=me/pyKXHWPqVA82IitIT5PyhO0FNQoLS+K0CIXL2LfPZsTBUb+agdPjw5/vcpmBp8jLOyz+G2nHDL6mM1Nwa8XI9EkKRN+HIyKYv9mdsGllhdxXHEUeMiZ9IxsTHO+aSKeCEtG287ZpTWn47qbp0auP3Yu7uxLyMIX13ckG48jorCSX64hzFes5nNIrKbyd4tZaz6YGwIOp8gsg3wxb6r0ieS1RTPtwF3pRgaeGlY+GE9rXf8+nrcTHqTSf0b3DruApbYAGj6wsrcxB7hqlyNy67noGu0ujbbtXStjhQuZNrBL9AOr3Ndr2jUF+v9DAEjqnz+3r0nmJBDqSaEHjcbA== 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=frvhIkFUSTYAqhjq5I0kq0NuYe+vevxa01AsatLTdr11SwAexA9ClmpSWT24MpKggCfKocrIPaKnBCbQIHLwxNMYNyYxnLc2WzAVc9qSI4rGB/e3ape9TqPL+j4LQjIcUe3c8J3uMa54XqNuGY2PR2QuGcrFgw58uV/IpRuwKthkr4oRMIKHbGaNNNGqESKW6IW3i/876Ah8AXwlFLQRDK31rnOjrLYUKf0xNgKBRqb5qvPiCEU+gYeX+1IgZ/ma15ailBPrnjqjSSH8lGahzTzGcfA1qoY1aq3ZlcYmfBh/kWV47fC4Zznd8G+JO9J06NhkwgoP21XyHu/3VmcCAg== 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=SPUkBwvrxGU91oqJCRWJHDGaGWDXigj3+BW80zRDZ+I4vCFvk89Q+Ofrzz22UKAIvfrLL0wdbnWxTvl5nUTNYCjNSv9mepdLWvAPA2SWOK5nLFb6XJplaNDiaS1H++KXo8f4X/TsDUXNuGK9K/56iEmw163NLtLqmQGMUK6NmHE= Received: from DM6PR02CA0044.namprd02.prod.outlook.com (2603:10b6:5:177::21) by MW4PR12MB7014.namprd12.prod.outlook.com (2603:10b6:303:218::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.15; Wed, 7 Feb 2024 03:14:22 +0000 Received: from CO1PEPF000044FB.namprd21.prod.outlook.com (2603:10b6:5:177:cafe::c7) by DM6PR02CA0044.outlook.office365.com (2603:10b6:5:177::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.37 via Frontend Transport; Wed, 7 Feb 2024 03:14:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044FB.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.0 via Frontend Transport; Wed, 7 Feb 2024 03:14: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; Tue, 6 Feb 2024 21:14:17 -0600 From: Andrew Boyer To: CC: Brad Larson , Andrew Boyer Subject: [PATCH v3 09/13] net/ionic: add flexible firmware xstat counters Date: Tue, 6 Feb 2024 19:13:13 -0800 Message-ID: <20240207031317.32293-10-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240207031317.32293-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@amd.com> <20240207031317.32293-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: CO1PEPF000044FB:EE_|MW4PR12MB7014:EE_ X-MS-Office365-Filtering-Correlation-Id: c8caae0a-3914-412f-6344-08dc278ae13c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QzBE9V2layskIcPYu5+2gUc1DETFBpPMXi2n9M6uvXq5Jpx9VLEZUCcrMhSf2qSwaLJAwwuBp/2Aao5D8cMNk+p8nEkIuaoGrBHDYb5KINCl5sNb9MI4ZHWfPLoht0tXjAwM6jbF8m1lCU/kBKLb8FC/+Zo4T0JfHrX+bR75ghQmtYW31QHfS/Z6l4ExWYeZNAypA/HmbM4TgTl3y7EgKPS+gWOeI7WPNsYyHkUGxkF9KX/036ZIZhyLD82nTLIHsGLe9fjgCLGAyclJzicwS6S7zVEkX8oRMPGl5v6JVj2BSAIVJfuci2iMcmscHAyonrjQ+YdzfxTGBKGQqUSzBn3zyMBa+wqNp7Feg7P9K2KGf0Y8RhVXivetW2IsIlTcaWThTclVH/x6d3J26wZoW+jNvFi96osPNUvnBKNDpeU7L8tDocCN1DiZyVjdRrJKN2URT3JWgZdiqqJlwRRAuqMWOA68i45inuXjbQY5Yh6MbTwhukSFEf5hP0a3DrZZE/E4NFr8dZQOQbDLc/y1GpyjJy9NhjymsCfZ7Dtzv7ZfAdIWQJOs+U/yJKjr6dYftw3lk0vb0k7nHZMiUwjPN4SJ67Z0rDMVPKsIlIoyQgy9U3YGuAg6/KgzYK3cwRyJeW04KtPfEyrhhrzp74QfbeQZ2M+j54UelvKSSULnX+lRFDU3eanJQ9jPE0kAUutZIEAdD+sySY0dvPSNpf8r25WDM+VTjFn9BehAH3FAeC73QWrcFjl113en13wDwdZL+lonlVOPjHdRA5izrb5wHQ== 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)(346002)(39860400002)(376002)(396003)(230922051799003)(1800799012)(451199024)(82310400011)(186009)(64100799003)(40470700004)(46966006)(36840700001)(44832011)(6666004)(16526019)(26005)(356005)(83380400001)(1076003)(426003)(47076005)(82740400003)(54906003)(336012)(8936002)(2616005)(4326008)(6916009)(70206006)(8676002)(5660300002)(2906002)(70586007)(316002)(81166007)(36860700001)(478600001)(86362001)(36756003)(41300700001)(40480700001)(40460700003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 03:14:21.5850 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c8caae0a-3914-412f-6344-08dc278ae13c 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: CO1PEPF000044FB.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7014 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 Wed Feb 7 03:13:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136463 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 1BA9943A2A; Wed, 7 Feb 2024 04:14:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8AFE342DFC; Wed, 7 Feb 2024 04:14:29 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2078.outbound.protection.outlook.com [40.107.92.78]) by mails.dpdk.org (Postfix) with ESMTP id DF16F42DBB; Wed, 7 Feb 2024 04:14:23 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MC5nhYhNerC4M+KEHB/d573v3MJeW8QuaNG+q0cTt+KdpeSriE3jxbtiisFcxZs/9MFX4di4BP+py9JRm4HWPh8eRNhDwCEjutwCNPgzJ7I/7i/FDZNOBQzS6UJ1HT7EaTtlsAvV6IyOvdcM0q+jryH1fmHEmdZU7A1fkKNTCKK/gk1qcX0bygj4w7v73D6qUk7wow8uYNXwpjr8cV/PwJ/g+tem8n7hBmmDwaQ7fNOhxfnwvJ0JUpAjJZbet6ch4ug9oe0T/Us2FjGaGiahreMdQw8zTbSyVwkgDMGy87Sl5nmTXrFGLJQARGBebwJSkaYO0zbGclmNEhHJTEglvQ== 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=LlDhuDNdgNKPwGFAPVDEjfBE45TBCZxZ5Atj3msuepTS3pjQYGGyGVljf8Q6tnrJEMzhN1QxJCrWGQydZnONwtSPoyC6eyPKbQCWpdkFhJwy2RFcnWFRNOcSQfcQJv0n4Clre5xtMYR4lHn4s54Tesuv+2kB8TJu3lk2P321VBJLLtIVwmq6dP19O0RBbLWKBwGt0VChjVyjOZebwrtN5kcGs78abkF4W8bK1A9FijgnM3FhXVGHP8I65E7uwCCKSxwD7kT1uXJlPt8gXfcBgoYhDoUrFJwWwrn6/KNMnDxsdOvBOBzKk1TQIxraKSUpSo/ZC47B5RPjy0wek5h2yg== 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=xwEN8z3uie7OMex18Wq8v0giPq2w5R6zoZLvpNmpBgj6HvC1qlc4aXIMLjJ/5QkKbrKQ8ERbQ7cVDvl2XB2VsYBS4rB4w2hqx9K9BL6CZg+SO77EbhgyCzCaRDjAT5LhAkOZMYp0+EJqsF/t6bBx97QvvsYCee/cV8NFNWNNDII= Received: from DM6PR02CA0147.namprd02.prod.outlook.com (2603:10b6:5:332::14) by CH2PR12MB4167.namprd12.prod.outlook.com (2603:10b6:610:7a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.17; Wed, 7 Feb 2024 03:14:22 +0000 Received: from CO1PEPF000044F7.namprd21.prod.outlook.com (2603:10b6:5:332:cafe::5f) by DM6PR02CA0147.outlook.office365.com (2603:10b6:5:332::14) 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 03:14: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 CO1PEPF000044F7.mail.protection.outlook.com (10.167.241.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.0 via Frontend Transport; Wed, 7 Feb 2024 03:14: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; Tue, 6 Feb 2024 21:14:18 -0600 From: Andrew Boyer To: CC: Andrew Boyer , Subject: [PATCH v3 10/13] net/ionic: fix device close sequence to avoid crash Date: Tue, 6 Feb 2024 19:13:14 -0800 Message-ID: <20240207031317.32293-11-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240207031317.32293-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@amd.com> <20240207031317.32293-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: CO1PEPF000044F7:EE_|CH2PR12MB4167:EE_ X-MS-Office365-Filtering-Correlation-Id: 35192e18-22da-4fc1-8d76-08dc278ae15c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NGQIWcY+V8b7SlpTnINZ7WXbsKRFOF/W1fgKh+VxYHcumKdD99Fn1tWu3086Dk97NtJ2yciBTyI1rAk/uxWFi6VPWRcCqaAf02JT6iDRiWf+H7CWVBXJm6WozzsAAR+Q3jf2kJOAZ3StZG6vfmZ2TkuheoPW0yQqI4cC+RpBbN2myipgsxDiOR5XJx7DxCkQ8d6hu7oA93sSm4jepwAj4eBDp74+zYVQQ7EvIDqG3vgKJ3ey7OBlynQdyvogaMX1pMbvEbHSMVRD9mLb13fQVhpdSjVfwl2kC3MifFZ6DO8+27q364MpU8kTJa41ZVZXjF3h7e35YhlpdFKvjeUmBPiDaFqQwfEL0Y38h/x5j6HhMaRyYRmNzWZdZBRa/odPVXTM5xUZP1tuMobTzN3sr55qmiVrNxpLkgbsE4QD0XR51vhAEOyE786a6BcjRH2bwoLjUnkZMWrcYqTgF3OEFva1zMBgp6Y1uxI8yM+53reDvt22oarlt5c33zWNN+m2Ih8z4d/RvIF9BhJRS7qPKoTgiIfmkP6wl736pqCQR/pHKg9Yacj9eZtsHED81tlPIHTsK577use1du7Gp8mUfsnNE3K3gWM+LpmoCKvOfySh30uHBpVKYf8PFJkIIEvBjalgy4dV6NHv2Z64waSq5x506w6+Cmy8Fe/F7+2w911s7L5UOLAyImj67nGMdXf5kN3ZeMclcPdBNliCacwlBJDsON+jV7WnGNyFNDnGNdGTJnoTf8Ehqfskaqs8pt6GnCm2EQj39Hy26mh0P9Y6Tw== 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)(396003)(376002)(230922051799003)(82310400011)(186009)(64100799003)(451199024)(1800799012)(46966006)(36840700001)(40470700004)(41300700001)(36756003)(426003)(478600001)(316002)(5660300002)(8936002)(8676002)(70586007)(450100002)(6916009)(70206006)(4326008)(54906003)(86362001)(44832011)(36860700001)(47076005)(82740400003)(2616005)(356005)(81166007)(83380400001)(1076003)(16526019)(6666004)(26005)(336012)(2906002)(40480700001)(40460700003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 03:14:21.8114 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35192e18-22da-4fc1-8d76-08dc278ae15c 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: CO1PEPF000044F7.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4167 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 Wed Feb 7 03:13:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136467 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 56CB543A2A; Wed, 7 Feb 2024 04:15:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F349A42E1C; Wed, 7 Feb 2024 04:14:34 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2040.outbound.protection.outlook.com [40.107.92.40]) by mails.dpdk.org (Postfix) with ESMTP id A19BA42DC9 for ; Wed, 7 Feb 2024 04:14:24 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EpIUIQPksY/uiFGwRplf9z2ZtupomSeceNM8V3swKmuw1qd7FyxqRBQI6MZLJj5I0ESkpLLvu07Y54XFiLzUSLGUONvVt34+7tY5sYwy2tYsbs6LfH7FYKvMr/xheuVI1AwUgOAfQ5Ev5Q8Ne+YSnCUkTpvV6EFTllTnUW0auwmfJwWE7DbwkPPDTpGgMM9tfckV0m6Vz5nkkL+dxriWYTGz8Wp7NKMP6DHLQGcOpTMxX5b7/z/bNR5lGepqts0lIUe1Q+v0wf7xv4o1GkZ9e8RR2jtxExFsEq1Q7keC9o684gnDuosvdKR9AYj2p1ZFd1JUk7vgdYAskn5crxOJKw== 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=VJ3cmrZlT19dNZTpqKUnNbGTCXo8SyjOjCf1JOqNgGMea7Xy/1YnF0otR3UA3WbFuFVYA8h4YJHoG8J8Om7lRTDqVspJQI1gQPuJz1lYPFvO1tQJQlEpuPH0+RQCIIIwsXddgkwRovwm+QXuCoMqQ65ZO4JVGH+ljLCiQ6ZOCsgOLw9XaCPcUhtIzRTEodDCoPKw04FjEavb3s0FQ1tQLsxghuJKqhfRRwG33zbfSP51irD1NcztOzvhCpn0dD58WKuq70jAGaahM0WvNoHiXkVW4AcuZ17QQ7i2AWyCZZs+Lb2SfkyntMxXzl8LHhrfLFlQ1iNbK5106IXQO+A/dA== 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=R3EUUQcCBMC5HV2//4EStyKRfCuyTJ9V0GdC2vCLhIa8I1u2Ik0eWYsttREsU+/z+IudDC2YeXN8nOBQdedk2t4Cemqi/WuScxwxcyyK9TAuibv4jCL+rh93n1QpvrC4GQLvwlOrHoWTPAs4V3DK/m9fkc5jitPIKb6KEsHvgeE= Received: from DM6PR02CA0044.namprd02.prod.outlook.com (2603:10b6:5:177::21) by IA1PR12MB6555.namprd12.prod.outlook.com (2603:10b6:208:3a1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.17; Wed, 7 Feb 2024 03:14:22 +0000 Received: from CO1PEPF000044FB.namprd21.prod.outlook.com (2603:10b6:5:177:cafe::c7) by DM6PR02CA0044.outlook.office365.com (2603:10b6:5:177::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.37 via Frontend Transport; Wed, 7 Feb 2024 03:14: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 CO1PEPF000044FB.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.0 via Frontend Transport; Wed, 7 Feb 2024 03:14:22 +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 21:14:18 -0600 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH v3 11/13] net/ionic: optimize device close operation Date: Tue, 6 Feb 2024 19:13:15 -0800 Message-ID: <20240207031317.32293-12-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240207031317.32293-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@amd.com> <20240207031317.32293-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: CO1PEPF000044FB:EE_|IA1PR12MB6555:EE_ X-MS-Office365-Filtering-Correlation-Id: 8cd84cd8-43a6-459c-c150-08dc278ae19b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xcldkd4Jmc8GjSh5+BMucguye/zS4DZ7WDXZHzxBraJk+YikMjn9c+TOk5AAXWr4LoqA0sbcbPli6pg8UIxUECKwRSyGnoFeMDECz396yCsfUAhhZzdvEpBERDYwBDWsYpEcoX0CHKvQw3yTyRBJEsGkWpR8JO/iqH3D7RxjzMlL+smZWAjSpui4oq0VozvkKOPUTiswNvikRAGWn0wnPQv6MWRHP16p0RXeCQBCFgkfvwwgN8/epZUBqkIot5qRmVM0HrJbhjxwyFp3giDOhIMWWV28dihyNKPktjkNR4XY36NSoGs56HgsQfXqbNahP/KyXtSGlollI7pTb04icKHj9dpx+XoyhiUYpIHbx9o4Th6C4bNz7RuKUCbCUns51FIiqZiBLc3maewp47dXvyl0Uwwwf1g/Xyd8dPzXlanJKPv/VRQqLNMOyAtnzGyY1nvPehj8+E+hetKJq9i06RRI1FGa6vlHz3mb8T3zew2ZcWQ/TgjtWkU25TXtr76jx1cvEIfQyhdxdYpJOApTIIDR5rZVhfMjgOcCz3yVqmcn9yMIpOSXxizzJU1yl+3yaILoIRWYv0DgVR8YQmPJXX/+TSG3SJ5+xDpwSTrP8MSgfYzvjDJiV6mFaMnnvQdooSImSUqb5eZA4IbYaxTAiC0nFfcPlxaHsKuDRJ4zTml7aZhaPX5r/yoPYVA39uYAGy5FKTT0eRk/0u00m+ZN2EFZE+qBTmCvSQap4Nw4tNOcCCeq8x663qf4/1XbH9XMfvPDYfxuP0KY/9GL3U/3ow== 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)(346002)(39860400002)(136003)(396003)(230922051799003)(82310400011)(186009)(451199024)(64100799003)(1800799012)(40470700004)(46966006)(36840700001)(426003)(26005)(16526019)(1076003)(336012)(83380400001)(40460700003)(40480700001)(6666004)(81166007)(47076005)(2616005)(41300700001)(356005)(5660300002)(2906002)(70206006)(70586007)(6916009)(86362001)(36860700001)(478600001)(82740400003)(44832011)(8936002)(8676002)(4326008)(316002)(36756003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 03:14:22.2256 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8cd84cd8-43a6-459c-c150-08dc278ae19b 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: CO1PEPF000044FB.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6555 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 Wed Feb 7 03:13:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136468 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 EEF2F43A2A; Wed, 7 Feb 2024 04:15:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C71D42E22; Wed, 7 Feb 2024 04:14:36 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id CEB2F42DD3 for ; Wed, 7 Feb 2024 04:14:24 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hNJlUuPh9TMC7UQB5vD4Ci7fq5RUH+ma2uk2cXwYizCrm4uBWHhT/DjZs7c9HOkVRYJSpqkIGWRN/87tQoG6fJ3mE7Qc44UK36BNRCMR5wzrGrBXyVTqbuISCfYA2dDtIw3UueWl8DOodg8NfRIIhLQY5uFg51UxP79z2lYzLKI1MrEEmGRoe1mbSobdxdVJewsxKr+S+aV5ph8pfo2FAXAIKe9NKocicWGdph85iRJhQxFlT3RRVWO+WjyVw2k5HYqNna0bHF8BT/0M9sowwcMY9E/GP8ARWR+awq7TmYv//LnegWRD3p7MhJo06NlmVXBOUAWhKeJWhFknKemH/Q== 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=CVs1p3K6gIoLHdTSAJlsJC7fz6W+lcpDPrQmAeJaRrTB6xlyOigfYIO9V+9QV1+f4OQWZ+np1easEoxxc18knVee3rqRUS9Y91MT4C5kQAvI3sL3MzxRIYEeftzIXePTPwQQUYZ/ItZCLIzLmbm+Uk7wrqIX8/cPibuulmyKfOdL/pgxtH0YQ99SpTjSqudsKSaXKHinkdRR/EnLX5j4f6zcAligva1LEu+RmnCfn0gNxTx6mKxStnlmGKBtQLKDyy1TGnqjPKIFgUH8S+kcypSSowMBdGd0HxNTUaHKbmgJvkL5Zgxk4n/OkilV7yHLuUBs1OrsGXfRSGX2Z+/yWg== 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=DGwYywdQtE9gxgG2un2mTJ9B6tHSDbchVaTafnLPIhjYuBmAIT4QPbc/oql9pltG42Tsfy9mPQypC/5qvaXeSMuZEeG5yv+MmyLRaWdc94VhLx7P2216bm74u/P1jzIQaq5NYnO+v1RA3mv8vhhWAGWB6fREcKUyR58eu+5i49A= Received: from DM6PR02CA0054.namprd02.prod.outlook.com (2603:10b6:5:177::31) by CH2PR12MB4135.namprd12.prod.outlook.com (2603:10b6:610:7c::22) 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 03:14:23 +0000 Received: from CO1PEPF000044FB.namprd21.prod.outlook.com (2603:10b6:5:177:cafe::4d) by DM6PR02CA0054.outlook.office365.com (2603:10b6:5:177::31) 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 03:14: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 CO1PEPF000044FB.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.0 via Frontend Transport; Wed, 7 Feb 2024 03:14:22 +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 21:14:19 -0600 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH v3 12/13] net/ionic: optimize device stop operation Date: Tue, 6 Feb 2024 19:13:16 -0800 Message-ID: <20240207031317.32293-13-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240207031317.32293-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@amd.com> <20240207031317.32293-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: CO1PEPF000044FB:EE_|CH2PR12MB4135:EE_ X-MS-Office365-Filtering-Correlation-Id: a55fb12f-497f-4a18-abbd-08dc278ae1c6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XVIFdW8w0v/4mHnRs6809EEiMW2wJa0reShFYDbfLNOSmwly2CYOLp7cCLrQUUi/1RIiVizi+tfaHcSgHOpsUsuXBNhfSMt0HDDPqCzGFjJoGw7IL37G/DggUlmaGO7LJ426JQ9Jt4Dd9Ed0yM2FOZebGlR5PLaGlHeu6y87i+xdM6lbrw46sIrGsGsg/csZ9uX5RaJcZjTfWdXw4G6D4MxazyqSAwrbmPlqX1hVccy62hh/EBYV2BjpXTb9m22ER2HpKrefirekfh4MIvD55zAxwk+xhe4U5cuZjpsVe33ZMHWg7PzyDT6ZHLdps6+q+dcAob+kZuJA5dI1F730ySZo9oA27F8CgAgTdDu63dUC5fQ7q/Ldvwgdz12wB7ItI70D4+ZE65SPw2ITYRpYdsUu6rbUPMFkPFbNAismZ+XKu3oa2HImtcijOcspI61jHEqdrx01MgGx4LJwG+CyBPk6pnD47/sV1SFiGqRXMnBjnd6FYtAHh+2OFU+6wq9STXk4LHCaDjDeqnaaClsoOGXBrdiycaJhs7Xozv9+Fo+tYsf/X7M1omhEUS7kZ1rnN14EoTPz85+0jjF7KTF0hf7urRVBlJn80nT/nmRNXVdtg3AIjLBF2YM3BnwM5M5GjxW5M5s/4EacQmV3AmPmMtA3C9NHJwdvjaHm/QsK0MWh08hRejRShUSeNiWDVyaOBZFOeXuHg6Zs3d1lHxpxEnn0mwcWJLE07L9OQFGg/8ISM8hT39dn1ijouXqtMRgICFfEEdpo44TLJpjT+EvnuQ== 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)(376002)(346002)(136003)(396003)(230922051799003)(82310400011)(186009)(451199024)(1800799012)(64100799003)(40470700004)(36840700001)(46966006)(41300700001)(44832011)(47076005)(70586007)(8676002)(8936002)(70206006)(2906002)(30864003)(5660300002)(86362001)(4326008)(6916009)(316002)(36756003)(36860700001)(356005)(82740400003)(478600001)(81166007)(6666004)(83380400001)(26005)(2616005)(16526019)(426003)(1076003)(336012)(40460700003)(40480700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 03:14:22.4444 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a55fb12f-497f-4a18-abbd-08dc278ae1c6 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: CO1PEPF000044FB.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4135 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); From patchwork Wed Feb 7 03:13:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 136469 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 1168243A2A; Wed, 7 Feb 2024 04:15:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B00C42E33; Wed, 7 Feb 2024 04:14:37 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2069.outbound.protection.outlook.com [40.107.94.69]) by mails.dpdk.org (Postfix) with ESMTP id DF7B742DDD for ; Wed, 7 Feb 2024 04:14:25 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=la5AYwI6Awkx4+fqE7nV+M3WNGV7qHcYsY8uy7a9Bm8ZCl0hf5G+3QKQgQiyvfAiM+nrc6/dMakOq62c/Ga92u6Ch7NlSkgXfi86ZZ5myN9WwGq4yiT5MrP8MvetNGBHZp9GF10ZuRn4zV2MIMr7cW+T3b6w6w0uWmtokoJSBkh10wWGxKmH+uOkFvXRA+4Dt2zXEFf9CVTBoE9hqxD18/InbyfyiaTAUD5+ARfnZmJX6HRtph8UmNs95VUtm2FSRDCi6jDiOvjUe2DHf11I3zIjubdKU5QU7Z/COvx5nNWOTGBUP2QVjCRztynm6ukonfeCk4K3zji4qROe+pK18w== 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=okDj1gGOQDERFOPPHnEUfrA7tZ9RXZ88UMHOjZEblJg=; b=ZH+9QuuMRb9OZnMdXZ0t1I4iHvH2mxVh+XBbux02YRqyrpLNrjnPpfHxRfSjGI3vFik3MWIpjmCaJLJGMZHSosLGqrzhh0RaXQ9tuHvmlKvqGjhS6L9QAixcdE/gK5h4zzQ9wOU6DW23E7WPvgQzDxbOpASHcrrhLai1vWuCwpZ+qREtLMi7gmf5uxuaaQWmqRrPxx3LTsLZl7BQ+LnONNzLYyYSMeKM4R1LsXQpbuYiKl1b4+s9wzps+D9iyjH0WudDpkhC1iW0Lbju4IG3XbOdQ40AtlspB7f9D/lQfahTeUxSN/WjtYX0NVfdz8+2om4FTbEgKNr/T7N2Ibc+Mw== 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=okDj1gGOQDERFOPPHnEUfrA7tZ9RXZ88UMHOjZEblJg=; b=ftYXRmcHEOtaJWWvW0ZOGY9FWFEV7/mCmZL5Sr7UhXO5a5zyJDMgxdPs40LHt52t6UuPOLGOrM3BuW7R9ufsnKyBJ49xUFEdTgJG1G7PzqHcvJnTN0jo5jTIQ+YLUwMBP6hdtYIGXrfgI7LmsqvfuxCVbJ/5C9v5juwljbvk+Yo= Received: from DM6PR02CA0070.namprd02.prod.outlook.com (2603:10b6:5:177::47) by DS7PR12MB6070.namprd12.prod.outlook.com (2603:10b6:8:9e::14) 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 03:14:23 +0000 Received: from CO1PEPF000044FB.namprd21.prod.outlook.com (2603:10b6:5:177:cafe::e4) by DM6PR02CA0070.outlook.office365.com (2603:10b6:5:177::47) 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 03:14: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 CO1PEPF000044FB.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.0 via Frontend Transport; Wed, 7 Feb 2024 03:14: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; Tue, 6 Feb 2024 21:14:20 -0600 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH v3 13/13] net/ionic: optimize device start operation Date: Tue, 6 Feb 2024 19:13:17 -0800 Message-ID: <20240207031317.32293-14-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240207031317.32293-1-andrew.boyer@amd.com> References: <20240202193238.62669-1-andrew.boyer@amd.com> <20240207031317.32293-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: CO1PEPF000044FB:EE_|DS7PR12MB6070:EE_ X-MS-Office365-Filtering-Correlation-Id: ecedaaa3-0e7e-477a-a62b-08dc278ae242 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Sw+g5Jp+QLCWM7UgGOT/xUk3R3FVQKH2QY3T8TAf+hBG3BIMGPrt4gzHnjXGDknYCfHZZBWOjR9h3t+CWJjwnyCw4JC4hHjg9Hzh0nH0ykN+PuZFSUrZiR4Gfxr4S+Dl7wBt8KJf9HGupcT0clvzQXcRqPytJ8ESpegtgzN81ImW0Xj1udQODRnaORkhxv6R33rPMv519cJ0cUeLEjc2CP5p2o06ElMF+JqeQawPD+PskM3g1ms+TT4mNIsIxsmZ1/FPdSbbaWuDWiA/OE2j8U/qDz3ItMO3UBTg7oAg8JkEVA2kUNIuCc86pj9YK5m+PUQQp9YLHLg+EIQ8G+5428cTHTK5ok+GWlVe9fKsr635pklhayPIE2SCV9cAsIm/SQajMqTBOEgOTozGJY63tMs7PZnytZetr5kv2f/aAaF3YjraOp1Y9mXkFGGYYr9C7zCRfqGkW2G1jbavkjD9tWDVJsj7h6PAKyNdrq/duMthHkVe4Wgujd1R+zOSfDvLwQoH7G6Fp/vofZQDtCLsoXVSOrk6lo9wLR94mWYWuvMlm2KDtN+Zgqe/NiBbG16qqx/FT5TDPAe6GI4AgnbWHSWY6PlIwK++UOwKQdp1AL36Eryt7lt8t7kpTRADQZS0sjE0COSj9MX06ng32JH8DHXRvBtPwiVt870c5KCzgQHSS40T3MkKLqdFemYkkPaiMG1qNdmFaGvd3RhE4s1D8eTdbUqxiuwZTZLIjpBewp4aEh6EJ4tTqQfzeUsM0IVx7+Zy45bJgFM3C1XDwuv3+w== 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)(346002)(396003)(376002)(39860400002)(230922051799003)(64100799003)(186009)(1800799012)(451199024)(82310400011)(46966006)(36840700001)(40470700004)(478600001)(6666004)(81166007)(36756003)(1076003)(26005)(41300700001)(86362001)(36860700001)(356005)(426003)(82740400003)(336012)(16526019)(2616005)(83380400001)(47076005)(8676002)(8936002)(4326008)(40480700001)(44832011)(40460700003)(2906002)(5660300002)(30864003)(70206006)(6916009)(316002)(70586007)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2024 03:14:23.3037 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ecedaaa3-0e7e-477a-a62b-08dc278ae242 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: CO1PEPF000044FB.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6070 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 | 136 +++++++++++++++++++++++---------- drivers/net/ionic/ionic_lif.h | 6 +- drivers/net/ionic/ionic_rxtx.c | 81 ++++++++++++++++---- drivers/net/ionic/ionic_rxtx.h | 10 +++ 4 files changed, 176 insertions(+), 57 deletions(-) diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 45317590fa..93a1011772 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -1601,13 +1601,16 @@ 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 = { + struct ionic_admin_ctx *ctx = &txq->admin_ctx; + int err; + + *ctx = (struct ionic_admin_ctx) { .pending_work = true, .cmd.q_init = { .opcode = IONIC_CMD_Q_INIT, @@ -1621,32 +1624,41 @@ ionic_lif_txq_init(struct ionic_tx_qcq *txq) .sg_ring_base = rte_cpu_to_le_64(q->sg_base_pa), }, }; - int err; 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); @@ -1654,18 +1666,19 @@ 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 = { + struct ionic_admin_ctx *ctx = &rxq->admin_ctx; + int err; + + *ctx = (struct ionic_admin_ctx) { .pending_work = true, .cmd.q_init = { .opcode = IONIC_CMD_Q_INIT, @@ -1679,32 +1692,41 @@ ionic_lif_rxq_init(struct ionic_rx_qcq *rxq) .sg_ring_base = rte_cpu_to_le_64(q->sg_base_pa), }, }; - int err; 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; @@ -1712,8 +1734,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 @@ -1962,9 +1982,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) @@ -1985,25 +2007,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);