From patchwork Thu Jul 14 13:48:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: abhimanyu.saini@xilinx.com X-Patchwork-Id: 113976 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 2E69AA0032; Thu, 14 Jul 2022 15:48:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 87C5242BB2; Thu, 14 Jul 2022 15:48:29 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2050.outbound.protection.outlook.com [40.107.94.50]) by mails.dpdk.org (Postfix) with ESMTP id E8D2242B6D for ; Thu, 14 Jul 2022 15:48:25 +0200 (CEST) ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=RovToPg17wTW7cm7ftaorqt25Sk/8SRQf30bmSrzSFXZL5LQKUSxUBT8ilnA3C+TLFrZxTHhkiD4aRNF3GU4ZjyQI+MZt/YLFVLNX+eih+keCME4h4iBAZUu38Ai98LPYCY+/8HUJXgS0ow5BXROFqU8cKgsMv34cS7zaQdr5ZuBRG/wXyvfRfU3Avod6g3D3oXoGvWy8XI4tIJcbjcvmL25vj+0w+MByANCGuLeGYrIS9FA5WOq9oOTD+Of7mcMai9KixTugxlmT/HciP8k+eQSrjAdkLKv+q71sm2wTZApvhMQHDRvv9hGyZ/fo98und+YRDzd37RyLyTTHuPK6A== ARC-Message-Signature: i=2; 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=m0novxHFNmL1C6Dkb7W65HUTio3Syfn2snulUMxO4B0=; b=kml7+kWhWtEQqUJ9SreKCScAfQhIWPVvW+ZZfBdpDB+803runRfoWlity0Bvydt41MZ95uEpd3rIc8RbE8M/EAMqahZePtGqpAoc6gQptK2ZNPmnghydDMIPaXo3iCFa5Y1FB5eQlzc8Qo24N1G6yyn/6EnHwStZPXqd92gtfeqsMdvBnwKIzwef8OzgPT0LU8nbAitlmMRKPY+iE6XhlTnG+QCSmWUJRaYwhUo4Z1nrRFitxtRAINTg3P/MeuYevjLRRz82BKNiG0FuBCTfk45KB0V3whmyUzaavxUp5DA/AhfGKEDMGq2ODjV95DdChVVINT4svxBpjGpGK/Z5Ow== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 20.83.241.18) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=fail (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=xilinx.com] dmarc=[1,1,header.from=xilinx.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m0novxHFNmL1C6Dkb7W65HUTio3Syfn2snulUMxO4B0=; b=sa17z4HU1r5QjCjO6lHBUjutcY/atXYjYHrvOVwxd5Lgv2yJjlyt43YVa61Y+pGkO8y85FYheZZNgmb8xMS3L4AgewruJHusVCHbjt4euvcf/FvlQp+mSv0nZ4tQqZFsUz6ehgKKawpiW6ZGqgJ42Y5b2LEc/Rx6NNYvFOYiOG5f4oMrIz+XOcFTu+q8Wv7RxecFhT1gCdHH8200f9MoI+KaubElfi2Cju7RJry3725zX31X3hxsglx1UG85rKVEnVnv5yEq+r3j0rF6FifVgBIQASVL6xmEvzQYOT3UVmFfp1SlourhKIchjCiU7/2pBZZk6c1yTF/7/7ZSJtiEog== Received: from BN9PR03CA0156.namprd03.prod.outlook.com (2603:10b6:408:f4::11) by BN6PR1201MB0228.namprd12.prod.outlook.com (2603:10b6:405:57::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.20; Thu, 14 Jul 2022 13:48:23 +0000 Received: from BN8NAM11FT007.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f4:cafe::ec) by BN9PR03CA0156.outlook.office365.com (2603:10b6:408:f4::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.17 via Frontend Transport; Thu, 14 Jul 2022 13:48:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.83.241.18) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 20.83.241.18 as permitted sender) receiver=protection.outlook.com; client-ip=20.83.241.18; helo=mailrelay000001.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net; pr=C Received: from mailrelay000001.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net (20.83.241.18) by BN8NAM11FT007.mail.protection.outlook.com (10.13.177.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 13:48:22 +0000 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2046.outbound.protection.outlook.com [104.47.66.46]) by mailrelay000001.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net (Postfix) with ESMTPS id 0E2A141F85; Thu, 14 Jul 2022 13:48:22 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FupqUC2czbEh+lOzrRDwyRfLb/9ICzLGPkqWZ+2xuIvKfHx76KAhzQhN2wXHTIIBkx7TKxjg7xSANTaTO/pvyYguXicUQgJsoUy5UeXOvCh3BhmiU2hnY3wMf48r6t3rPSxaFgs/trWr9mgnrrxD6CLuhGkA5Xybm66v0gRFYZMhV+mLKEiKqR+lf7HVOCDcWNuRWSTVmvnIEg+Ospr237mcJONONblJwYRBLtanMOHDWPBU5RLpfaOWvUthZyAdKjzLG4uDUbp4mNJWq5QTX1nhOZWr4mOCOliW0CJVXI+ChDmirkSzJbdKndYaB1OGpqCmLd6jtELHvU+MyNOUHA== 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=m0novxHFNmL1C6Dkb7W65HUTio3Syfn2snulUMxO4B0=; b=FwYYnZByX2kXPmrLmcHpCGPA85fvhSK4S8wdL+AZoQdz4maNq7Gobj0MbSXXWRdbnzfxZfqPmPnQSzNORp2GNZYYkstXs68qCkfAJ4MyUUYtwpiAd6Ih46qzC2kMI4uadSGx22AbIMF/UkyY/fwGPVIBPLGoTI9sm/oNWX53Z2s/whgJ6u6qEoF8htUv+HynZ+Y0lvm/fCeGgGLnzlaUw9jHo8eEwRGCwtqHke4nCqURDZxZ6d831uAjbArOZIZdAGc1Aj48wCWCj3CY3R/yFkNFJ1U3gIhCeFBu6ImRZozlqJNYBi20teSzNRlHeE4/qZJamWBrKbaWA4llDHHjuw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.62.198) smtp.rcpttodomain=dpdk.org smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=none Received: from BN9PR03CA0134.namprd03.prod.outlook.com (2603:10b6:408:fe::19) by CH2PR02MB6197.namprd02.prod.outlook.com (2603:10b6:610:4::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.16; Thu, 14 Jul 2022 13:48:19 +0000 Received: from BN1NAM02FT006.eop-nam02.prod.protection.outlook.com (2603:10b6:408:fe:cafe::b9) by BN9PR03CA0134.outlook.office365.com (2603:10b6:408:fe::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.17 via Frontend Transport; Thu, 14 Jul 2022 13:48:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.62.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received: from xsj-pvapexch01.xlnx.xilinx.com (149.199.62.198) by BN1NAM02FT006.mail.protection.outlook.com (10.13.2.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 13:48:19 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) by xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 14 Jul 2022 06:48:10 -0700 Received: from smtp.xilinx.com (172.19.127.96) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Thu, 14 Jul 2022 06:48:10 -0700 Envelope-to: dev@dpdk.org, chenbo.xia@intel.com, maxime.coquelin@redhat.com, andrew.rybchenko@oktetlabs.ru, absaini@amd.com Received: from [10.170.66.118] (port=50892 helo=xndengvm004118.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1oBzCM-0003Fq-6C; Thu, 14 Jul 2022 06:48:10 -0700 From: To: CC: , , , Abhimanyu Saini Subject: [PATCH v3 1/5] common/sfc_efx/base: remove VQ index check during VQ start Date: Thu, 14 Jul 2022 19:18:00 +0530 Message-ID: <20220714134804.60495-2-asaini@xilinx.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20220714134804.60495-1-asaini@xilinx.com> References: <20220714084451.38375-1-asaini@xilinx.com> <20220714134804.60495-1-asaini@xilinx.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: dad3d0b2-d22a-4b5a-8d48-08da659f84f6 X-MS-TrafficTypeDiagnostic: CH2PR02MB6197:EE_|BN8NAM11FT007:EE_|BN6PR1201MB0228:EE_ X-MS-Exchange-SenderADCheck: 0 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: vhWwvGyOBW3TGSsxGswcEKXDz3Q+ar1TXG/9n2HhqMJoERZPnz19XQktcAUdrc9a2Po0jCpbqCGcTQKN/dxS1U4nHD0HlEuxV63qYKN2STUXfd5l6ZqV+DF8VsTJ1qiww/nhko0uIl9GpcTwvfcqPHq9gRMS+4re0GrbtyZ37tyj4sZEL79PUAhKZfpquIRpkWBNim0xb9rjBV28dFFjUCwNAQU+lX/XJI8lBA3KI7AOywGnMVMOAUB3d/8i8fpX6mZCSKfjDooeVcIr3kABTddfyhJU0IhBFMgIW1K2T9GWB4muTb6qtr/07CoTwhD5/jTASxtOf6nWX39KeYFkVA1b2Rv0V5SKBILlIPADEOn6u57pA2j4ZNjqKHbFnI183cXU9EdgCUuv6YeTls9g3HwJmRqRgax+aaYteugquBmw3iDAGzHO4sOMWoyz8MThd4ur/nMohho6RcDGfPFIRXOR1pu3XzU6PeWveplWjr3cBoEV2Hu9ORbqU2dSDjEuLS+kDyrxnurxqfXVmJg7GauqnvPucS7nwVVpG4Qvg82RYQjWy1TQcuhk6Q/mPqCQdrDJgpvplykY/wI2Of6iPwOh63maf3K6TwX1aUyiHSJB2yRkl34SouvxYzf+0UqSf+O9CKBUt4DsTfH22GDNYIOtnuQcG2RvWye2+hKwCfpOz+k3mpRZQ29a2/EMPKOPG0TnnrpzIXeCLrMgXF5gHjHIgVDM3lZ2XlPw8/xhTMTEOpbJ6wdAW5b+d4fP327U/CsxnLc/yQW92MblbDrb1e3yIS3tRIxHdT8ZX86tFwKsBC4JDFTMcTn6wbbHturUgVarPNEac5J/1SobkTYI4C7zJghrVHKy4v5ueF0Bs2s= X-Forefront-Antispam-Report-Untrusted: CIP:149.199.62.198; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapexch01.xlnx.xilinx.com; PTR:unknown-62-198.xilinx.com; CAT:NONE; SFS:(13230016)(4636009)(346002)(376002)(136003)(396003)(39860400002)(40470700004)(36840700001)(46966006)(336012)(47076005)(2876002)(7636003)(2906002)(426003)(36756003)(82310400005)(356005)(83380400001)(40460700003)(36860700001)(40480700001)(186003)(70206006)(70586007)(41300700001)(8936002)(1076003)(26005)(478600001)(6666004)(82740400003)(9786002)(2616005)(6916009)(7696005)(5660300002)(8676002)(316002)(54906003)(4326008)(102446001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB6197 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BN8NAM11FT007.eop-nam11.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 5ff5f031-25c2-44b7-3c2e-08da659f82cd X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7wLEONcd6QYpgR2f3AcbUy6z6Sb6ez/7fCQTuOOPuZeEcYq/wHLhaTMWzCxAGe7vX+ezNgbr3q4RgS8o+qC8Nkohai+93Lno6rKyttXPnxfJ2QbzTB7y+Ov68sJmA+A0yPPKfVcC6FUOHNHZJAJ05mDA+SKe/0uLmZRiBIR8iuZI9HLgeoB1qe9k7duDsh4KsCCoyGTTVo56RY6l3Dop9djkLvZS4S1ySCjUSXELUKlTiT4tLf57ogvqfBkBEdKvKpPyavOcu3P2zkckm7fkH49hgfAwDM3jqBU4aEXDEj7ueiMj3KTcTny65tqhMzevsXB+Xkq7d5yxrqKoME955ZJAM+3pUbSlTyo9Ug2QDV3ICVj9+pXRkdDHmqFQ1zruvMrqJhHn4GFsJF2Wb8GNPOuxB5vBVPhzlcKhZPLxh3Ip9Z4ye1HDjeXe4aNP8GCYsB5VtKgv5ijwrl4OWSxmlq+d9+sQ+cbDCyKjGvjUFjgvE6x7+23pg6VBPt4Zgsils4z1eXlR+llHu+o1IOw8mqtrMCAoe0px/mVCywZ6CJsLLCRnySHfKoh0Haek4DujtdKC/haperYoeMS1/QJXnnDE26KuEtJGmW9GGSagGQi2n5o2642j3kXKisoitY5E8eqRE8ppfMBMj82jAA1PQjwEoDzkFM0skes349UbABJLsnW/YTCk0f8TEMreX4rA8Jyb0W+XiBT5a73JI5u9MjyL8geZEZ/0UdqJsU0y29BOs6mQN9tVgyvYfC8Zu1KZYmKZGmsWsXJpFDpjYaX4StTZdAmzurDw/1aNctw3Cc0afFWJBIgeZ+0BkRgGguAA6+wnBZUUozJRxIG+DFp1AIDiKn97Lx4BCZeTRT0/P7c= X-Forefront-Antispam-Report: CIP:20.83.241.18; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mailrelay000001.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(376002)(136003)(396003)(39860400002)(346002)(36840700001)(46966006)(336012)(426003)(2906002)(83380400001)(47076005)(42882007)(82310400005)(7696005)(36756003)(40480700001)(41300700001)(70206006)(316002)(4326008)(478600001)(5660300002)(36860700001)(186003)(81166007)(54906003)(6916009)(9786002)(82740400003)(83170400001)(2616005)(2876002)(8676002)(6666004)(8936002)(26005)(1076003)(102446001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2022 13:48:22.8333 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dad3d0b2-d22a-4b5a-8d48-08da659f84f6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[20.83.241.18]; Helo=[mailrelay000001.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-BN8NAM11FT007.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0228 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: Abhimanyu Saini The used/avail queue indexes are not bound by queue size, because HW calculates descriptor entry index by performing a simple modulo between queue index and queue_size. So, do not check initial used and avail queue indexes against queue size because it is possible for these indexes to be greater than queue size in the following cases: 1) The queue is created to be migrated into, or 2) The client issues a qstop/qstart after running datapath Fixes: 4dda72dbdeab3 ("common/sfc_efx/base: add base virtio support for vDPA") Signed-off-by: Abhimanyu Saini --- v2: * Fix checkpatch warnings * Add a cover letter v3: * Restructure patchset drivers/common/sfc_efx/base/rhead_virtio.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/common/sfc_efx/base/rhead_virtio.c b/drivers/common/sfc_efx/base/rhead_virtio.c index 335cb74..7f08717 100644 --- a/drivers/common/sfc_efx/base/rhead_virtio.c +++ b/drivers/common/sfc_efx/base/rhead_virtio.c @@ -47,14 +47,6 @@ goto fail2; } - if (evvdp != NULL) { - if ((evvdp->evvd_vq_cidx > evvcp->evvc_vq_size) || - (evvdp->evvd_vq_pidx > evvcp->evvc_vq_size)) { - rc = EINVAL; - goto fail3; - } - } - req.emr_cmd = MC_CMD_VIRTIO_INIT_QUEUE; req.emr_in_buf = payload; req.emr_in_length = MC_CMD_VIRTIO_INIT_QUEUE_REQ_LEN; @@ -116,15 +108,13 @@ if (req.emr_rc != 0) { rc = req.emr_rc; - goto fail4; + goto fail3; } evvp->evv_vi_index = vi_index; return (0); -fail4: - EFSYS_PROBE(fail4); fail3: EFSYS_PROBE(fail3); fail2: From patchwork Thu Jul 14 13:48:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: abhimanyu.saini@xilinx.com X-Patchwork-Id: 113974 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 E9E27A0032; Thu, 14 Jul 2022 15:48:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4869742BA6; Thu, 14 Jul 2022 15:48:27 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2078.outbound.protection.outlook.com [40.107.223.78]) by mails.dpdk.org (Postfix) with ESMTP id 1EDBB42B6D for ; Thu, 14 Jul 2022 15:48:25 +0200 (CEST) ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=UImbGkKeAqlIBxJ9FX/ozNgBJQTc2vrQsPqEZN4M5dk5lrXbyzYGElm0oBLb9KV+PHNoD5TgC4s3Wp7K8WrxXtPSWan+gZhoL3mac0T8i1IDILIqK4xX+r8rASBoqjnaHrFoLQBUsX4T5fpRNxj0wYmScDfoeVvCkAI04AT3Vo6f06+fMJ1nGwW4n08BFzxPiNKmzC0LZhrrPsFGXDJQ89K2bwGsIVh6w2GFdL+oS85upueud61/LdAx1VikDRaf5rKp3388Br/igAgt4KlYr9MtaPWJd3XvL2YWqafprWCuuRhpy0EpYywn1FnYN3IFU03xq7zEUUZI4b4XmAsG1Q== ARC-Message-Signature: i=2; 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=mW9EUs+jVJUewQXBpMZFz0g2LHQ+TxUpKRKuGq0MMvI=; b=BTE0+k/syRO/h2Xu34cs/89DIvzWS3o3wymqJYkhZKaqoBEuJP7xTMzKR9s9EekQDtgY8ujW15PtplyjFO+ooZn9SCc94mjyFvhdE+rarEQZoy8EhJKPPl5sgSK8Es2sa4wH2IvGYEIkfZ8bwtJ9/m0VcE3hnT9lDESVSxgwoAuZ24b4+sXvQFRIgzIN8I/vdCuvk3IuD7mV1MhHPepFCZ3uz9K+WEEOxZWXAXkeVfAxpLB9BM6bGo42U1pXPXl+CJpimNddHATESRO+lxx74oGvOlnzYaT1lRHlJV4IhsfCTWyRK5mjvNxb9gy4HHO8QICqkiZBDsXaUln9DHlVIg== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 20.83.241.18) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=fail (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=xilinx.com] dmarc=[1,1,header.from=xilinx.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mW9EUs+jVJUewQXBpMZFz0g2LHQ+TxUpKRKuGq0MMvI=; b=oOhGoZOStBQQyjiFbxqXgy1m4U8fn+92wmBV0e19XYH5B/EJCfE4jDWmeeP4OLsjCtU/8xnYrGHHiXAX9KnBCGW0B23Vk7fql4kaATFeAMF7Q6m7ewRvDqe1796qnmKbieCJgx2EPP9aFgY7wtw6KUEIzyBVeaF3huPDtnkgXgHFCJI32vupef2Ap3b81FaMO0gxN4lmVutfxKBsPTbxTNYnT8xCnimEPTaAwl6ostamnHoi+W+AnZBJ+h77IVTRR+Ll+0foy87ESotdPP6uZKnU+DGRAHfUFP3EFTGqt2/9f8h+fOinhsP+x4xqCfy+gzLzBK4ikEiplpitviM0Fg== Received: from DM6PR02CA0092.namprd02.prod.outlook.com (2603:10b6:5:1f4::33) by MN2PR12MB4605.namprd12.prod.outlook.com (2603:10b6:208:3d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14; Thu, 14 Jul 2022 13:48:23 +0000 Received: from DM6NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1f4:cafe::1) by DM6PR02CA0092.outlook.office365.com (2603:10b6:5:1f4::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.22 via Frontend Transport; Thu, 14 Jul 2022 13:48:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.83.241.18) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 20.83.241.18 as permitted sender) receiver=protection.outlook.com; client-ip=20.83.241.18; helo=mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net; pr=C Received: from mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net (20.83.241.18) by DM6NAM11FT040.mail.protection.outlook.com (10.13.173.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 13:48:22 +0000 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2109.outbound.protection.outlook.com [104.47.70.109]) by mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net (Postfix) with ESMTPS id 5792941F77; Thu, 14 Jul 2022 13:48:22 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QxejqPiKtebNKtuQEJFjWakIn4ATyYf+k2up0BsItryDm6L+Kt7Sh90x9/XzVPSjDe3mHfllBwqMg6wfLsN8AR0iuRXmax/QCwXMcT/95ysegpX61rk5x4/OCBAgISpDz+gc+WHIB75ql3no9DRxHLJg7fyGLH+vD9G5/mRfSzGi1sAiyRRCO09pK0ml7l30QW8uefSQp3xPpA3bU6nEzstcKoTl+P/Nb1o9Q9rXXsA9FRW7a7sZTYNiXxlZuDapjiPbZZGrJ6gNJX1YoOEepm496fOVo4/Ao9Rh2UTX4x5WHMlec6lxQnmSdNhu3S1eXZ++a17l0R8ews1vSBa1PQ== 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=mW9EUs+jVJUewQXBpMZFz0g2LHQ+TxUpKRKuGq0MMvI=; b=Ez2gx4S+S7W/ODy5Q5L6S7L4cHlgtGNDnQ+WcogMAxmX8FldlvMsNW79o3u1LcnNvTvZVeJtKtFD9NiWh/xZHA8rqbDINmu1Q1VxyBWL7jaZGo1bcesUjC0cNs593UZZ/YMf3bcoRBEabi1YylhxuaVk1XxbFRxJPxEJbL+YydGmzMID9jKAABP5B/5VIdUEDbnTxl0QBLJoajFouUttOT3qcQIz3Skv7Pv1Fh8LjcrtfJsLlkrzYnon6ORHPH0CRJJCoAyh65XJVLgwNd72FyNBSPUACbTaKWk8fWX7pH4AObbAIXEIDQ5gvWa9SHi/9z8pHuhEG+/+CRAI6M61hQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.62.198) smtp.rcpttodomain=dpdk.org smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=none Received: from BN9PR03CA0131.namprd03.prod.outlook.com (2603:10b6:408:fe::16) by DM8PR02MB7893.namprd02.prod.outlook.com (2603:10b6:8:30::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14; Thu, 14 Jul 2022 13:48:20 +0000 Received: from BN1NAM02FT006.eop-nam02.prod.protection.outlook.com (2603:10b6:408:fe:cafe::cc) by BN9PR03CA0131.outlook.office365.com (2603:10b6:408:fe::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.17 via Frontend Transport; Thu, 14 Jul 2022 13:48:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.62.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received: from xsj-pvapexch01.xlnx.xilinx.com (149.199.62.198) by BN1NAM02FT006.mail.protection.outlook.com (10.13.2.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 13:48:20 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) by xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 14 Jul 2022 06:48:13 -0700 Received: from smtp.xilinx.com (172.19.127.96) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Thu, 14 Jul 2022 06:48:13 -0700 Envelope-to: dev@dpdk.org, chenbo.xia@intel.com, maxime.coquelin@redhat.com, andrew.rybchenko@oktetlabs.ru, absaini@amd.com Received: from [10.170.66.118] (port=50892 helo=xndengvm004118.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1oBzCO-0003Fq-Ko; Thu, 14 Jul 2022 06:48:13 -0700 From: To: CC: , , , Abhimanyu Saini Subject: [PATCH v3 2/5] common/sfc_efx/base: update MCDI headers Date: Thu, 14 Jul 2022 19:18:01 +0530 Message-ID: <20220714134804.60495-3-asaini@xilinx.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20220714134804.60495-1-asaini@xilinx.com> References: <20220714084451.38375-1-asaini@xilinx.com> <20220714134804.60495-1-asaini@xilinx.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 1e67316f-5def-40c7-570a-08da659f84d4 X-MS-TrafficTypeDiagnostic: DM8PR02MB7893:EE_|DM6NAM11FT040:EE_|MN2PR12MB4605:EE_ X-MS-Exchange-SenderADCheck: 0 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: RymREW2QS1dqVyMi/pLeck+CS16VxgPFOKKMTgzAyjvNWbefJPxdRP7f/QtZfaW0SuuH+xtIea45z4vMqIgwpFmTS6MWLY8m9g8uIjqO1U39pWYb3F4KWkKthtU3mhK5Rg/jc1RsVjttnT/ZyqVExGE5McKxTnQImvy/CuenDejJLZELctPRKwbT2T7nGkR+/0zA6vr0ZnTqwLSrPRsAHZO7Oi/HjEZgezd9yUWi0fz9aB6Z0KRdzVv52wi/ZLv+QipPAY/udPvqP4BkMpVJraE4Xlm+o5tpzMJdb4YzmHQyAE5kN+eybvF2tebCSGXFvziuwW6KWC1LHq6lYCa2xWO6ONiywxSGjQzxEn3eF3/3kI87SV9naf62T2igCEUkLc8k35AMPE66RdK8eb/g0+vJ0XhsXJ2ZiqyfoXshnYy0Jkm8OHmcf7V8i1nMC6Bc2GJwdP3spXaCG+t8V51eDYNgXVO2gaD5/jYoB9EPreBFTYUNY3U7+DXTFSzq9QlnbyP1VwQTgeob7Gz6OhY19VuiVXwv1C3DDW1IWy4qmeHUEX4Zdr5fAT5XOJtDwzRswqmVaL2vy0y7vAfwmN7T0eYot1+ecrTbW6dmy2ycUDGvpC5m442sxzccR1vlV/05NCdFb1sva9t6/O33/yEi3U+JrF3UdQHj9XXpnPOcmrTXBxDK4Dn6btQfthNifn5CVUokCCcftJNsnPtkM+3um9NeMHcaJkVARFUUUKN+/fF+LcdBmNURyneEiT2ZGUImKjPL50uLCE72hYPuX5pt4zCN3PQYEEgwrOZuV0uR1umVC6+bGcjyaRRa56KMCKueZM1yMNS6L5d/oizPhZQv2A== X-Forefront-Antispam-Report-Untrusted: CIP:149.199.62.198; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapexch01.xlnx.xilinx.com; PTR:unknown-62-198.xilinx.com; CAT:NONE; SFS:(13230016)(4636009)(376002)(346002)(39860400002)(136003)(396003)(36840700001)(46966006)(40470700004)(356005)(36860700001)(7636003)(40460700003)(82310400005)(82740400003)(8936002)(478600001)(9786002)(5660300002)(316002)(70586007)(54906003)(6916009)(8676002)(70206006)(426003)(336012)(4326008)(186003)(1076003)(47076005)(83380400001)(40480700001)(2876002)(6666004)(7696005)(2906002)(36756003)(2616005)(41300700001)(26005)(102446001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR02MB7893 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DM6NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 8f563c68-e5c5-4a69-abbd-08da659f833f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RephCw52g9Wk3o9NMMBzviQKz6vShH5Bm3ZshXMf8eeCpUySv4087Cjzpu+ur6DS0Ajbqqj2X3WMRCgQ9/mRmvrbpI1jzqSiceEISjUQzOOK1+DxWTbCysKX/oNHoySxtC31cDVySay0RoaDdYoehuC7MsrG0/V/QGPOcvKOzSv99JwoDW5s2ZCLmFKzou2ocNsAFdHHECYLnVO3s/WdJkdDJPy0lq1j7s+ulcIk/151ipBjIV6A37+xYwK0aiYY/stDWC+BDOU4Db0EmC35TTBVadFJr3ur/Z17+jwqhoIbB8ISk9sq7EOFfDzaVZm4m/aBSK1bsErS4ifo08ItftvfOanJBC0HPgiU13a+VRd9ect9qfBrhGbfXiYyXKJASGMv3p375DXagPIXYxIFQ/0FwNAFZb+Ozxj5i07E+UizKubxxccNAnY2q20wwVTjSf9xdQLFO+UNa958ghb82cg1jbzYtz0qmh4WFGZMCETwvZuVS9IopLqiwpXvGat9j5YBMJfVjEpi3vE6bXttt7GTNvtpBx39Ux9EMewl5iVw9PRXmHlpRgTVRpB6qXE+fKwW4U8mQ65BGiedl6zEFtRqSpgf9s8S+RQOGkp0XHq1ZPiMXBG74S2GSk/UqzZscLoi4747BK5J3nFh8LGomcupPWjkYEEcfY6bAWHn3eQ5jb4In8GvhmrKI59QE1MjQmA8c3ogozorECDw182SKNoe156nkTPoFTmdApbpeldD1FA4XQWGwyRWjAgy2Nx9EF8jxABXoYMTZ4NJAhtKCNlT5WRjt9tSRO5LXkmNwPoEpQLDtE6jm2s4XughlvYF/B5dOkJhrScHS5aEQuFVZQ== X-Forefront-Antispam-Report: CIP:20.83.241.18; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(346002)(39860400002)(376002)(396003)(136003)(46966006)(36840700001)(36756003)(5660300002)(70206006)(426003)(1076003)(336012)(47076005)(186003)(36860700001)(83380400001)(42882007)(82740400003)(4326008)(2876002)(8676002)(9786002)(8936002)(41300700001)(2906002)(478600001)(7696005)(40480700001)(316002)(26005)(2616005)(6916009)(54906003)(82310400005)(83170400001)(81166007)(6666004)(102446001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2022 13:48:22.7966 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1e67316f-5def-40c7-570a-08da659f84d4 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[20.83.241.18]; Helo=[mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-DM6NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4605 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: Abhimanyu Saini Regenerate MCDI headers from smartnic_registry:72940ad Signed-off-by: Abhimanyu Saini Acked-by: Andrew Rybchenko --- v2: * Fix checkpatch warnings * Add a cover letter v3: * Restructure patchset drivers/common/sfc_efx/base/efx_regs_mcdi.h | 36 ++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/drivers/common/sfc_efx/base/efx_regs_mcdi.h b/drivers/common/sfc_efx/base/efx_regs_mcdi.h index 2daf825..d1d8093 100644 --- a/drivers/common/sfc_efx/base/efx_regs_mcdi.h +++ b/drivers/common/sfc_efx/base/efx_regs_mcdi.h @@ -28071,18 +28071,26 @@ #define MC_CMD_VIRTIO_INIT_QUEUE_REQ_FEATURES_HI_WIDTH 32 /* Enum values, see field(s): */ /* MC_CMD_VIRTIO_GET_FEATURES/MC_CMD_VIRTIO_GET_FEATURES_OUT/FEATURES */ -/* The initial producer index for this queue's used ring. If this queue is - * being created to be migrated into, this should be the FINAL_PIDX value - * returned by MC_CMD_VIRTIO_FINI_QUEUE of the queue being migrated from. - * Otherwise, it should be zero. +/* The initial available index for this virtqueue. If this queue is being + * created to be migrated into, this should be the FINAL_AVAIL_IDX value + * returned by MC_CMD_VIRTIO_FINI_QUEUE of the queue being migrated from (or + * equivalent if the original queue was on a thirdparty device). Otherwise, it + * should be zero. */ +#define MC_CMD_VIRTIO_INIT_QUEUE_REQ_INITIAL_AVAIL_IDX_OFST 56 +#define MC_CMD_VIRTIO_INIT_QUEUE_REQ_INITIAL_AVAIL_IDX_LEN 4 +/* Alias of INITIAL_AVAIL_IDX, kept for compatibility. */ #define MC_CMD_VIRTIO_INIT_QUEUE_REQ_INITIAL_PIDX_OFST 56 #define MC_CMD_VIRTIO_INIT_QUEUE_REQ_INITIAL_PIDX_LEN 4 -/* The initial consumer index for this queue's available ring. If this queue is - * being created to be migrated into, this should be the FINAL_CIDX value - * returned by MC_CMD_VIRTIO_FINI_QUEUE of the queue being migrated from. - * Otherwise, it should be zero. - */ +/* The initial used index for this virtqueue. If this queue is being created to + * be migrated into, this should be the FINAL_USED_IDX value returned by + * MC_CMD_VIRTIO_FINI_QUEUE of the queue being migrated from (or equivalent if + * the original queue was on a thirdparty device). Otherwise, it should be + * zero. + */ +#define MC_CMD_VIRTIO_INIT_QUEUE_REQ_INITIAL_USED_IDX_OFST 60 +#define MC_CMD_VIRTIO_INIT_QUEUE_REQ_INITIAL_USED_IDX_LEN 4 +/* Alias of INITIAL_USED_IDX, kept for compatibility. */ #define MC_CMD_VIRTIO_INIT_QUEUE_REQ_INITIAL_CIDX_OFST 60 #define MC_CMD_VIRTIO_INIT_QUEUE_REQ_INITIAL_CIDX_LEN 4 /* A MAE_MPORT_SELECTOR defining which mport this queue should be associated @@ -28128,10 +28136,16 @@ /* MC_CMD_VIRTIO_FINI_QUEUE_RESP msgresponse */ #define MC_CMD_VIRTIO_FINI_QUEUE_RESP_LEN 8 -/* The producer index of the used ring when the queue was stopped. */ +/* The available index of the virtqueue when the queue was stopped. */ +#define MC_CMD_VIRTIO_FINI_QUEUE_RESP_FINAL_AVAIL_IDX_OFST 0 +#define MC_CMD_VIRTIO_FINI_QUEUE_RESP_FINAL_AVAIL_IDX_LEN 4 +/* Alias of FINAL_AVAIL_IDX, kept for compatibility. */ #define MC_CMD_VIRTIO_FINI_QUEUE_RESP_FINAL_PIDX_OFST 0 #define MC_CMD_VIRTIO_FINI_QUEUE_RESP_FINAL_PIDX_LEN 4 -/* The consumer index of the available ring when the queue was stopped. */ +/* The used index of the virtqueue when the queue was stopped. */ +#define MC_CMD_VIRTIO_FINI_QUEUE_RESP_FINAL_USED_IDX_OFST 4 +#define MC_CMD_VIRTIO_FINI_QUEUE_RESP_FINAL_USED_IDX_LEN 4 +/* Alias of FINAL_USED_IDX, kept for compatibility. */ #define MC_CMD_VIRTIO_FINI_QUEUE_RESP_FINAL_CIDX_OFST 4 #define MC_CMD_VIRTIO_FINI_QUEUE_RESP_FINAL_CIDX_LEN 4 From patchwork Thu Jul 14 13:48:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: abhimanyu.saini@xilinx.com X-Patchwork-Id: 113977 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 432D9A0032; Thu, 14 Jul 2022 15:48:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 85DB042BB4; Thu, 14 Jul 2022 15:48:30 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2072.outbound.protection.outlook.com [40.107.220.72]) by mails.dpdk.org (Postfix) with ESMTP id 2D75242BAF for ; Thu, 14 Jul 2022 15:48:29 +0200 (CEST) ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=lyPjdw4leperwMST7QuwwH8szj4cGsCuhCyl+whz/2nQXFAbXM0f8m0sZGXLtZbjFkHzKWgZ4t0fUW95o+BTs4JpNMTaXqAWMz04s0Aph4apS0GmrxD1wyMy5uz2+YZxZy6NIG1iF2mV97FAEzA3PvtCQY1hSDTzpAQK4LQZMwh55nVM+p66oj+zuvNosnhcWrsU/KXGipbjePU/8TcL3ooxSl0rpxYyB1J4pZPWc47cs39maybappZrr0vkvEoQzNms1aXvqP4MijKakcWR/cPW6D0F466+XsZ4aQBRFjf6yDcjxVTEk9cDZXfkGovKeGbzhvlH0cN7Oh2LLD6Oag== ARC-Message-Signature: i=2; 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=bilZLXL3Vf8UTKpgdT+Yiu49wqGAaWaJfyAEJedu4aY=; b=eUstUse0sBcKd+cM68WhW06Xm4cnAmd4I5ejUjGmwDjb5SRx160+IJq9W5wB/oGYzdszGc5NWjL3Neup4uNoVIm4vr5mChVGm/e6Lj4Judw/HQxF0TmNpSszpIBAb7315lXlFV3gmJ0hHlSWSUB4HGxRJQMb1jTYiTUrmqbXwJi8Yd6EY62146iE2ysQJw4arbe0+6gIPoRvfyJC4+w1eo4LyDt1X/cMD3Sa7LNLcYIPfm/WB2xZOEF/uZSIYrxDnfRe2LL1SNrgbGuw88WK8MHOpnUGEYlEKFHEc9Y2yK/znfP7HKceQ1sAMFe1DZFC/Jn4UO5kiC3iq6H2+8cyfA== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 20.83.241.18) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=fail (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=xilinx.com] dmarc=[1,1,header.from=xilinx.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bilZLXL3Vf8UTKpgdT+Yiu49wqGAaWaJfyAEJedu4aY=; b=GPpwCvxfRBYsGr5mpQjWnDlt+Qy1EzujXT1JGvTx5S3bc89tMcPsYvmVH0fFtAL3n25qFg0EpryYqM1w+G52hmMuSgQZpMlCxtgyvuTaaw1dVn2nAuuSda/9khmRuw96kIKXqMYqgYN3IX2Ngx4bqzC+37vSgzoBhH3lad2jY19j2OFOq3ZShz3S4OOwTJlA8FdzOLMVhCJCnoiAg+4myR+7ByaZ5L3GbA8scVRWnogmiko3olrU1roj2vvMmh9QZS8eWKuhwaPACRw9zIthLay6m2Eq4ojCHdnM7vq7Z8sGZx+9S1eM03JK/7Tr5m/UmFg+ooCGdR5cRY6UpX16xg== Received: from MW4P220CA0005.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::10) by CY4PR12MB1205.namprd12.prod.outlook.com (2603:10b6:903:38::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.23; Thu, 14 Jul 2022 13:48:26 +0000 Received: from CO1NAM11FT026.eop-nam11.prod.protection.outlook.com (2603:10b6:303:115:cafe::49) by MW4P220CA0005.outlook.office365.com (2603:10b6:303:115::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26 via Frontend Transport; Thu, 14 Jul 2022 13:48:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.83.241.18) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 20.83.241.18 as permitted sender) receiver=protection.outlook.com; client-ip=20.83.241.18; helo=mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net; pr=C Received: from mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net (20.83.241.18) by CO1NAM11FT026.mail.protection.outlook.com (10.13.175.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 13:48:26 +0000 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2042.outbound.protection.outlook.com [104.47.51.42]) by mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net (Postfix) with ESMTPS id 6CC1041F5D; Thu, 14 Jul 2022 13:48:26 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PuSjUnrpPpnN1OMV14HqA1sQG6AjiKQKyvUp/NIQfnODV2Vlia9w4rIifUQpALLCcSbtkJzO264AqaQQQz0qxFdeH7NNBj8nVRDGAOBBlLnfSRzcw2kxZMCAEZQ6T3S8erFJE4Ew8VVVF/Jnu3oDTOU2AwrMYxS0qN/+QoE0pGF1cx4Ju6vpa4qv+MRRYAHri4QPbpaX+CWKA157cyrTkvwram2RH1anQ7z/STnO2NYcayL5p7ynNcgWHqF9a/CI15gw0vlAyTbOMIvev6CxBC+SM7pHbwPGrpwMwi4XVequJaEhg77JXkK9kNiXy4kmvLw82TdVjLLw+4o17jWvrQ== 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=bilZLXL3Vf8UTKpgdT+Yiu49wqGAaWaJfyAEJedu4aY=; b=WYgaikzL+4q8TlkGArNuc4/T5+SpSzRTLU09RMkX+kYGC28d99GY3kDXwElhtN9O6LKFEzD6mEpihMJRt1NNB5kzr4yNHFRqxyEA8CtMJiGMEXg+Cg2DbSnDlt3Kbep42Mm8iRc63Bfy3NLoWVyRKb/VTSHwG6ngtOau2UursmZEf0AvGS+PHFzl+w6Ey1KlqLhk2tXKbg+KUDa53q5uUNUi9no9YV35wGq8552iLCIDz5gfpR/o8ot3LWhBNFGz9YsaTEJfHWeMzezEFyBJZEu06Nhib5RJMiRuyfXCsr6hzJeuvEhfZFMUOJJ8oUY7YwibWZ5ERcSXxfhe+QdoJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.62.198) smtp.rcpttodomain=dpdk.org smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=none Received: from BN9PR03CA0127.namprd03.prod.outlook.com (2603:10b6:408:fe::12) by DM6PR02MB5052.namprd02.prod.outlook.com (2603:10b6:5:52::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.13; Thu, 14 Jul 2022 13:48:22 +0000 Received: from BN1NAM02FT006.eop-nam02.prod.protection.outlook.com (2603:10b6:408:fe:cafe::f7) by BN9PR03CA0127.outlook.office365.com (2603:10b6:408:fe::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.22 via Frontend Transport; Thu, 14 Jul 2022 13:48:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.62.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received: from xsj-pvapexch01.xlnx.xilinx.com (149.199.62.198) by BN1NAM02FT006.mail.protection.outlook.com (10.13.2.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 13:48:21 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) by xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 14 Jul 2022 06:48:15 -0700 Received: from smtp.xilinx.com (172.19.127.96) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Thu, 14 Jul 2022 06:48:15 -0700 Envelope-to: dev@dpdk.org, chenbo.xia@intel.com, maxime.coquelin@redhat.com, andrew.rybchenko@oktetlabs.ru, absaini@amd.com Received: from [10.170.66.118] (port=50892 helo=xndengvm004118.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1oBzCR-0003Fq-3P; Thu, 14 Jul 2022 06:48:15 -0700 From: To: CC: , , , Abhimanyu Saini Subject: [PATCH v3 3/5] common/sfc_efx/base: use the updated definitions of cidx/pidx Date: Thu, 14 Jul 2022 19:18:02 +0530 Message-ID: <20220714134804.60495-4-asaini@xilinx.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20220714134804.60495-1-asaini@xilinx.com> References: <20220714084451.38375-1-asaini@xilinx.com> <20220714134804.60495-1-asaini@xilinx.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: f73ce39f-7802-4be5-56f7-08da659f8717 X-MS-TrafficTypeDiagnostic: DM6PR02MB5052:EE_|CO1NAM11FT026:EE_|CY4PR12MB1205:EE_ X-MS-Exchange-SenderADCheck: 0 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Tisx154uIeWq6U3ZyQjO45RhpWIxQaYnEZltJSKwd6/jnOGdNwG2+xLlW7PzpxbD74rUjtVacr7Rc1CIsrVVGETdQQdo7YYpJHcK31L7upkBK3xgj01bgpX/IWa82S9u5pL7boOqscBpEomk4wASG5cy/YiHhHzmDupE2bfycKb3M8SS+2iL9+J3D87twuS9MdD6KlwPNhLVDrYLjyeH033FtvBGoq6HUqyEuiwNdV3IY/X5jeZte1gxtyPXA4lwp1ur7O26ZOAXc/u6XhyQXcM66cd4ubekK5z5nyDEXxlchCO842XcYMbzfXUtYN7OG7TlZSRlDbxtQmE2sDQBbWn8leJLnbJynRmv7OZrcSmwT70pbRjzE8V8VrsZ20cxut+PTkN0R3ppUKJUKgngSe6pGVIKsH+34pOJse+lclFpAAZRg4Obb7c6lcm3QApboO8kZmq6k3aoUxmVkCS5fzkjQaie4ShQj3fFXtZ10TXlEX1ieKWqYgiZsjooO7bvWe6LD4xrQCfzL7AbS4G0zfTgRIxq0nyZChApOBQOgWoeIIkCAtOJZJNKt755CqqtUGwy6cV+TEo7t02nd8bk/K2Kjb385DWZMxkcEL5vCc3j4N6qxMoHq0oMfKUCPSQiL/RJ2a8IJyrPADN+K7JiMRxyLGkPI8rxwoiASJfPbpJPTQfxMrEy2yLcakh7l+58E/iaV+WEl/NMwmFM8V3wS0oOXaPCGJ4A2nQkKC7XcW04+h+AEpgo69N0zsOLrUaYqse3t8G5754La4vy11v6pHabHZ2dl3iwXCvsKAspz1x4agLicd0YKpis+9NgNLjVV3SxwMUNRp64HWqPRTbft58AYdsMEQYpDp0iWVAR3pA= X-Forefront-Antispam-Report-Untrusted: CIP:149.199.62.198; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapexch01.xlnx.xilinx.com; PTR:unknown-62-198.xilinx.com; CAT:NONE; SFS:(13230016)(4636009)(136003)(39860400002)(346002)(396003)(376002)(46966006)(40470700004)(36840700001)(6916009)(83380400001)(2616005)(316002)(54906003)(336012)(1076003)(47076005)(426003)(186003)(41300700001)(478600001)(40480700001)(7696005)(6666004)(82310400005)(40460700003)(4326008)(5660300002)(8676002)(36860700001)(26005)(7636003)(2876002)(36756003)(70206006)(8936002)(9786002)(2906002)(356005)(82740400003)(70586007)(102446001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR02MB5052 X-MS-Exchange-Transport-CrossTenantHeadersStripped: CO1NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 1ab0ee14-ab20-4086-c472-08da659f843e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oM3yCt2T5VV/mYWm7M9VUq0phUypVmmVKLJ/vUgrDxJZ398bkbaxXoA9x1m2dRsO9fGgBWRttdCnvmZkofmbZbFcZbSmlqI4tvHRIbaDKcpicdISg+9ztAhhnp7uydsE+RPJUgjpr4hNI6YqbQ1r4FoHBlESOSCZhLIWlep2SrIDJ+C5vcnrTB7e/FPkvMcsjRP3T8SgM9kzc6J5l2xszXzS2KxXDbne2rSOTqMY4PXFlavEiTY8h+jRKyJAeSxuH26E7hYzHBZyxQ5+3MmeS10cwCbdsrSIptyfTcYusw/CHjuy2Gxm3Gf9uRs+eu7JJDMWB6naGWv/qSaW1/0j/dV0T0nsIk8AKUaw7FOMCaA5XdjrfPI+9lRyMrfyDjSsYYwOJFR2KhydDF/S2h/BxAi3XkYj2gzMCV6atyRiOA1xjGNsStTFWcz9nkLHwFx9RLlaTlhCXaNSQE1acUI2i5rinhFJGdQ/jKiAhNjJ/Kv1HAoWJIzp4k+DgTm4jam1O4/V0yWUBdXgWLBPn33BvcVulljI7niLVBkOMtawgNHyPjNRcyM8YQZb9BAoQQNRKdG7e3OhL7EydYXrSHV2dBo1mYGXDe1kQsNIJktEFO4mtbqqteca2K7C8hEOl86RkpaXBEFeklI0sC+hI7wIgtToHn0MZVGUNBZi9cNf0r/JXjcFPIYpVDe5qSAuq5NynU8XAQm9ixx5q2W0RFZPG0S+tJwpQFVytOym/cMM+GuDpMOu410gnnLIcgL1OZmD5i/8TSD4ovQ8C8hTbGuSBzMN0fbZf8U1LB8B9nmpyUNWfjunVhzRetLevasQTL2qDhdZGYJ7gV0ilI1kQQ3goWwJHLdlFK0zn77rgkzeVeA= X-Forefront-Antispam-Report: CIP:20.83.241.18; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(376002)(396003)(346002)(136003)(36840700001)(46966006)(83170400001)(81166007)(336012)(8936002)(8676002)(42882007)(9786002)(1076003)(4326008)(54906003)(6916009)(70206006)(316002)(41300700001)(26005)(2616005)(7696005)(5660300002)(6666004)(82740400003)(2876002)(36756003)(83380400001)(478600001)(82310400005)(40480700001)(2906002)(426003)(186003)(36860700001)(47076005)(102446001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2022 13:48:26.6536 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f73ce39f-7802-4be5-56f7-08da659f8717 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[20.83.241.18]; Helo=[mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-CO1NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1205 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: Abhimanyu Saini Change cidx and pidx definition to mean used queue and avail queue index respectively. Signed-off-by: Abhimanyu Saini Acked-by: Andrew Rybchenko --- v2: * Fix checkpatch warnings * Add a cover letter v3: * Restructure patchset drivers/common/sfc_efx/base/efx.h | 12 ++++++------ drivers/common/sfc_efx/base/rhead_virtio.c | 16 ++++++++-------- drivers/vdpa/sfc/sfc_vdpa_ops.c | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/common/sfc_efx/base/efx.h b/drivers/common/sfc_efx/base/efx.h index 95f5fb6..c19205c 100644 --- a/drivers/common/sfc_efx/base/efx.h +++ b/drivers/common/sfc_efx/base/efx.h @@ -4886,17 +4886,17 @@ extern __checkReturn __success(return != B_FALSE) boolean_t typedef struct efx_virtio_vq_dyncfg_s { /* - * If queue is being created to be migrated then this - * should be the FINAL_PIDX value returned by MC_CMD_VIRTIO_FINI_QUEUE + * If queue is being created to be migrated then this should be + * the FINAL_AVAIL_IDX value returned by MC_CMD_VIRTIO_FINI_QUEUE * of the queue being migrated from. Otherwise, it should be zero. */ - uint32_t evvd_vq_pidx; + uint32_t evvd_vq_avail_idx; /* - * If this queue is being created to be migrated then this - * should be the FINAL_CIDX value returned by MC_CMD_VIRTIO_FINI_QUEUE + * If queue is being created to be migrated then this should be + * the FINAL_USED_IDX value returned by MC_CMD_VIRTIO_FINI_QUEUE * of the queue being migrated from. Otherwise, it should be zero. */ - uint32_t evvd_vq_cidx; + uint32_t evvd_vq_used_idx; } efx_virtio_vq_dyncfg_t; /* diff --git a/drivers/common/sfc_efx/base/rhead_virtio.c b/drivers/common/sfc_efx/base/rhead_virtio.c index 7f08717..5a2ebe8 100644 --- a/drivers/common/sfc_efx/base/rhead_virtio.c +++ b/drivers/common/sfc_efx/base/rhead_virtio.c @@ -95,10 +95,10 @@ evvcp->evcc_features >> 32); if (evvdp != NULL) { - MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_INITIAL_PIDX, - evvdp->evvd_vq_pidx); - MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_INITIAL_CIDX, - evvdp->evvd_vq_cidx); + MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_INITIAL_AVAIL_IDX, + evvdp->evvd_vq_avail_idx); + MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_INITIAL_USED_IDX, + evvdp->evvd_vq_used_idx); } MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_MPORT_SELECTOR, @@ -161,10 +161,10 @@ } if (evvdp != NULL) { - evvdp->evvd_vq_pidx = - MCDI_OUT_DWORD(req, VIRTIO_FINI_QUEUE_RESP_FINAL_PIDX); - evvdp->evvd_vq_cidx = - MCDI_OUT_DWORD(req, VIRTIO_FINI_QUEUE_RESP_FINAL_CIDX); + evvdp->evvd_vq_avail_idx = + MCDI_OUT_DWORD(req, VIRTIO_FINI_QUEUE_RESP_FINAL_AVAIL_IDX); + evvdp->evvd_vq_used_idx = + MCDI_OUT_DWORD(req, VIRTIO_FINI_QUEUE_RESP_FINAL_USED_IDX); } return (0); diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c index b84699d..e2f119b 100644 --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c @@ -258,8 +258,8 @@ vq_cfg.evvc_used_ring_addr = vring.used; vq_cfg.evvc_vq_size = vring.size; - vq_dyncfg.evvd_vq_pidx = vring.last_used_idx; - vq_dyncfg.evvd_vq_cidx = vring.last_avail_idx; + vq_dyncfg.evvd_vq_used_idx = vring.last_used_idx; + vq_dyncfg.evvd_vq_avail_idx = vring.last_avail_idx; /* MSI-X vector is function-relative */ vq_cfg.evvc_msix_vector = RTE_INTR_VEC_RXTX_OFFSET + vq_num; @@ -321,8 +321,8 @@ /* stop the vq */ rc = efx_virtio_qstop(vq, &vq_idx); if (rc == 0) { - ops_data->vq_cxt[vq_num].cidx = vq_idx.evvd_vq_cidx; - ops_data->vq_cxt[vq_num].pidx = vq_idx.evvd_vq_pidx; + ops_data->vq_cxt[vq_num].cidx = vq_idx.evvd_vq_used_idx; + ops_data->vq_cxt[vq_num].pidx = vq_idx.evvd_vq_avail_idx; } ops_data->vq_cxt[vq_num].enable = B_FALSE; From patchwork Thu Jul 14 13:48:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: abhimanyu.saini@xilinx.com X-Patchwork-Id: 113975 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 361E7A0032; Thu, 14 Jul 2022 15:48:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 44ACA42BAD; Thu, 14 Jul 2022 15:48:28 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2072.outbound.protection.outlook.com [40.107.243.72]) by mails.dpdk.org (Postfix) with ESMTP id 4B08B42B73 for ; Thu, 14 Jul 2022 15:48:25 +0200 (CEST) ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=C2J9cakoYkc+eRvtOD/zx6NesfJQ0ryL4MvTkyLRRK2W+ZyggQDg86NpMVnSoNsExm5jUeuOjZtUUayXkhqqo1TW/cQELwylvVETXSTcbuh5DLNOlCh4gfRzM2A4bWyNW1g2M8Ubg0/Y28NnDOlGIfu3avjZB/yxqQhlUg74I3/hlX9GtbD49x1amGDVl556mMr3UC2oXMcNPi/gL4WpnnnIUFzZx9OezOMw7A2iL1K59quNZY8a6CtJrKjR8ThmTYQdiFhubpBlgyjGvFGnd2ExSSoK+WEj3PlXXGQOGp+1beuGHsfVZHZ/jLUCKaD+i6KgorSAg0LIYmc978/Tmw== ARC-Message-Signature: i=2; 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=gFCRxErBumuF2r5IX/SG15h9BzwwkbrypSwGs21r7AQ=; b=Nr82PxVa/LrL5kSyhah/9a9ytyNdTAUWNeY9NlbKL0eRGikyCKlfJJMNdQ6KfNBo6LQ5JcDXIPWS0rhBbzN+31FwRTd4RxW23MlXxA7LidE0i40Nz9nRiUw7a5JwH1ScVlFgtOPECfGVwDx7SNyyVJ+7Y6SaxakXE6SOJ3jz0TbbGXQjf6R3MxdvrubXMo/AgDep78Y8tUjklOzd4u3C1blA51j8NbsCvT2iaA66SrhiCuHpBFNbb4H70Nc5AGOLuD8cxVjyXvVANGbvDp9Ed1g/9oDcP9BVImiN30Qc53wGpVdrtx56ehwUrogZr6k7L62qdEN2vgwjty3VeY3pzQ== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 20.83.241.18) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=fail (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=xilinx.com] dmarc=[1,1,header.from=xilinx.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gFCRxErBumuF2r5IX/SG15h9BzwwkbrypSwGs21r7AQ=; b=4T785J4JemhkJlKLN+A/Hkk/d/pgQRAG0ZZWDUsGn5S9yot08D3iU41E9tbnOIRcxP+U60vC7N6Dr8qv6o7hE9MOUhKay00h8/Mqn7tpigaSpzkAoDkr0dnIcLf0RYqBQIyJjHzKMu06dDd5tuDvmLcMBhPUIkqg/fbAbAbAQUyqolMB07TEV2BCC0roBIuf3aaHW06bOeNtOJ6cNM1K/CLo9/eHFOTsH5fGnNRQyDrK0mnyBLLPSqFrG+e1U3Uj5EMdibyn/Uj0/atAdZSGx6IoUC0STUlLNQVavuhVB7Jqv80MHe7upribzog56453ZMdH8pFwKeCIMrRvdeOE8w== Received: from DS7PR06CA0015.namprd06.prod.outlook.com (2603:10b6:8:2a::26) by DM5PR1201MB0266.namprd12.prod.outlook.com (2603:10b6:4:57::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14; Thu, 14 Jul 2022 13:48:23 +0000 Received: from DM6NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2a:cafe::49) by DS7PR06CA0015.outlook.office365.com (2603:10b6:8:2a::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.13 via Frontend Transport; Thu, 14 Jul 2022 13:48:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.83.241.18) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 20.83.241.18 as permitted sender) receiver=protection.outlook.com; client-ip=20.83.241.18; helo=mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net; pr=C Received: from mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net (20.83.241.18) by DM6NAM11FT050.mail.protection.outlook.com (10.13.173.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 13:48:23 +0000 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2175.outbound.protection.outlook.com [104.47.57.175]) by mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net (Postfix) with ESMTPS id DF3724264A; Thu, 14 Jul 2022 13:48:22 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lb7pvfNp3d0gGKZ3DerFMe6dcZL+iwGOzvRVqufQAn0Hv3k7G2kK+VjU/tof/NuPkw/ET0X75F6nIuOrSOCw60HQov8C1XvA/w9AonEEEcUYJxHdGVabb4oCFKdyoRZFcyUT027r0XMnLhDe46wygUJFl2mk+NOApM9uvLX+cNV6l9c49QAOPnpa7xGvOacjLGsCxUDaPqDRd5E7oScSmzTQyNtUKN1gVRz4nti/kf4poyI2Tu0eMY5Q22fmbGwrvZJusQkhfrITHptyRbxnXSw289rjzjtqq3Web1KcCy/JHFA6hvv82vxSQ74lbrILnj9Qml1wjs3mPeyB4tZwiA== 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=gFCRxErBumuF2r5IX/SG15h9BzwwkbrypSwGs21r7AQ=; b=gydfACx3s3B2BLJb31DwV/k5H5/PqVqtMvmff6ArDEANr/UWqRe+6+Z71CL8oZUfN5cicqiBLIhr3GIFjRioqm2yBK8QjAGfghhmSrWHbbl1XIPJ+AzP93M+QPxdrRq6oTQzBdFKYP/DOJG8vJj7QkNblYxfPvM9rpSk6/Xyvgb1qBbHreOTt/wrXf+J/W/ZnqMYqwtZa6Wjr7/860eIPSiQ/QkL6hXhtTULUYm8bcpVeL1QDwF2u4m7rZ3s5aAbMr7tGYZxKrEAoNqRpbyoAI92rAjA9KnHLYOcY4DK1XUtF3GgPZ3wUknzsOkyCRN76dwSX+7Of02lBZ1KT5xGSw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.62.198) smtp.rcpttodomain=dpdk.org smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=none Received: from BN9PR03CA0435.namprd03.prod.outlook.com (2603:10b6:408:113::20) by DM6PR02MB5547.namprd02.prod.outlook.com (2603:10b6:5:34::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26; Thu, 14 Jul 2022 13:48:20 +0000 Received: from BN1NAM02FT050.eop-nam02.prod.protection.outlook.com (2603:10b6:408:113:cafe::25) by BN9PR03CA0435.outlook.office365.com (2603:10b6:408:113::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.20 via Frontend Transport; Thu, 14 Jul 2022 13:48:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.62.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received: from xsj-pvapexch02.xlnx.xilinx.com (149.199.62.198) by BN1NAM02FT050.mail.protection.outlook.com (10.13.2.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 13:48:20 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 14 Jul 2022 06:48:18 -0700 Received: from smtp.xilinx.com (172.19.127.96) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Thu, 14 Jul 2022 06:48:18 -0700 Envelope-to: dev@dpdk.org, chenbo.xia@intel.com, maxime.coquelin@redhat.com, andrew.rybchenko@oktetlabs.ru, absaini@amd.com Received: from [10.170.66.118] (port=50892 helo=xndengvm004118.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1oBzCT-0003Fq-I5; Thu, 14 Jul 2022 06:48:18 -0700 From: To: CC: , , , Abhimanyu Saini Subject: [PATCH v3 4/5] vdpa/sfc: enable support for multi-queue Date: Thu, 14 Jul 2022 19:18:03 +0530 Message-ID: <20220714134804.60495-5-asaini@xilinx.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20220714134804.60495-1-asaini@xilinx.com> References: <20220714084451.38375-1-asaini@xilinx.com> <20220714134804.60495-1-asaini@xilinx.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: bf2ee1ce-1c1c-40aa-7885-08da659f8520 X-MS-TrafficTypeDiagnostic: DM6PR02MB5547:EE_|DM6NAM11FT050:EE_|DM5PR1201MB0266:EE_ X-MS-Exchange-SenderADCheck: 0 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: VzIwFbQHnucpnJkyp+pryoH3w0vyvBoS2qGrtZaXtK5kxTwvReZloODRN8CKpzOBfhim6OM8UmC6exZDeVaVxwuhr6qc533+Bq9dv/Gox5w2/BK/dpS8DCKk46+lqClGsgaHgwllOzrzX36jspDO0l/m4JsktkkyqBfllUGPM8rYEYp87nOIAkd4lpjfnsGIGKhzK4/yRhpIKmKQTB4VXdSQT9SDc5IM8omLX0Cxhx8VBK51BpxitjwA6REzqv6hpPTb3rcLmEVhm5c+d46joC6GV3KBW/Z92hIAqiYI9+RA3jinL6q4du94UjAyd6aEjvAlrng+JWv6Bk9toMtcuzbNEkBIOW66K2i/Bvj2edkHGW85oD5cHbUEjnKZWDMamXWu25/t4+swP7Z7MLJs1efqTckCYtXbLUfx8t2fcWzCOUo+49G3g7HYz3zex8Ldm/JaYz8EYe0wpRUM7Twd4Zz/w5IDN6jCzGIxmTmM9pZ29XtA7b1+PtO3aUXqdMBb0ymVUrNEIp05/XEAxofJ36oBkQ9mxRZQzMoUXEbGy9vKi2Z1mylS0ByrELftZ6t/hDVsmGiFHmd+bMScXDnzKbS05rb5hrofrINaDN5LOi/SiVUZw5pYFOH5JFHG2bFss6k4NtP2ZTmxR8Fa1qnBGpsLridfQoBukQWa8v6MhyIcN1Neu41ZrWGmyBSkChCpqXXoRyRq63nKegl+cSBYtCrt84EhXW0SeEa/F9MBuaAcfcG8JSW+a3yoM84Zym26fmE7jnpqrskSY9wN9EJ6kmqlSs/lVUWndE4Im2vZb4xKVkrhbHNVu1nF2aRTt7bXBxMuk3Si7Gvnwcq5zbDTSljvhqGtUwA0ZnErMkUi/Ew= X-Forefront-Antispam-Report-Untrusted: CIP:149.199.62.198; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapexch02.xlnx.xilinx.com; PTR:unknown-62-198.xilinx.com; CAT:NONE; SFS:(13230016)(4636009)(396003)(346002)(39860400002)(376002)(136003)(36840700001)(40470700004)(46966006)(316002)(9786002)(5660300002)(41300700001)(8936002)(6666004)(83380400001)(70586007)(54906003)(4326008)(6916009)(478600001)(82310400005)(7636003)(426003)(186003)(336012)(70206006)(356005)(82740400003)(36860700001)(2616005)(1076003)(36756003)(40480700001)(2906002)(40460700003)(26005)(8676002)(2876002)(47076005)(7696005)(102446001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR02MB5547 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DM6NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: ea94b948-1820-4e87-3ee8-08da659f8399 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4CrlZG2b1kRAS2jBx+DXzBQQqrlbmlPnjyVEavJI1y7V/B0sCUh9tCbQBJDj3QpHinic3KLfV/xn2VE55PBqPLp36gudzoGbkc8rpwjwmAxYGipIKCVaOVKm6LuDaW/ywsvjs/q+2z2iJFPCFIwAmHn35pJDSW0ayvlgQ7vlxLcv4pGzUu6Q5dZN/mWJTtBTf3QWeYXAJm7NUBtnsw+NVwZJ46tY+qXWv+8xHUM2YeP1P6l/v0NYorw0vq3W5dOpuMSRr1zAsVOJBVMFa2iWg2ll8y+fVFC1ARqVIhloM/ym4KvDTCAvW0qbFQ7E/i4JDIC/JPJoO4ANZowrwC+WgBOfFv5+xhfPcqFQg0yTos0sZAiZNin0MpLaX5hAik+r5DS/KQGX+KJ4+Xku1WrbcdNPuLzRGv4JDewVzsAFCle5ul7JEii7aAEj8YzaqD+NIgAR4bOpWwyFpTsi/VoSZQYca3kULlP6dqYxQmZKxTBjzqUrRR7LFpluIk8f0kclG5zXziyMPf2qGRwYxJLNVeeYn/2UUf/CWx6pyqNz2ay9AuFD0jL9FDxpWAK5TmUHYxImMkoE3ld1kVK8gb5r/+lBLGlS1HNoM8mARsAYx+qITk169Lwp1EMNWJphv7nUPWovK9bc5np8JLgQUQZzGIiF3pXA8zYqPtqWtmplk7QPh480HrvtmtyW1ktPt+t7ogbQ5015Z62SgNmkmZZ7GiMdmj+oq5bZHED7lr/EG7OfQnjPfjTObU1mGIBC0I04rL0uEWAyiwTu9cgF9gp2hc8B9/FtpFD088koK13+2zoPV/U/9XvDsgLnA1UIsz4mTASw0ouXmQk17EyWz916ZAP7hgu/uZLgKVOzWXLrBsQ= X-Forefront-Antispam-Report: CIP:20.83.241.18; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(136003)(396003)(346002)(376002)(36840700001)(46966006)(336012)(1076003)(426003)(81166007)(83380400001)(186003)(36860700001)(47076005)(40480700001)(42882007)(54906003)(6916009)(316002)(36756003)(70206006)(4326008)(8676002)(478600001)(26005)(7696005)(9786002)(82740400003)(8936002)(2616005)(82310400005)(83170400001)(41300700001)(5660300002)(2906002)(2876002)(6666004)(102446001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2022 13:48:23.2799 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bf2ee1ce-1c1c-40aa-7885-08da659f8520 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[20.83.241.18]; Helo=[mailrelay000000.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-DM6NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0266 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: Abhimanyu Saini Increase the number to default RX/TX queue pairs to 8, and add MQ feature flag to vDPA protocol features. Signed-off-by: Abhimanyu Saini Acked-by: Andrew Rybchenko --- v2: * Fix checkpatch warnings * Add a cover letter v3: * Restructure patchset drivers/vdpa/sfc/sfc_vdpa_hw.c | 2 ++ drivers/vdpa/sfc/sfc_vdpa_ops.c | 6 ++++-- drivers/vdpa/sfc/sfc_vdpa_ops.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c index a7018b1..edb7e35 100644 --- a/drivers/vdpa/sfc/sfc_vdpa_hw.c +++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c @@ -286,6 +286,8 @@ SFC_VDPA_ASSERT(max_queue_cnt > 0); sva->max_queue_count = max_queue_cnt; + sfc_vdpa_log_init(sva, "NIC init done with %u pair(s) of queues", + max_queue_cnt); return 0; diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c index e2f119b..6401d4e 100644 --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c @@ -24,14 +24,16 @@ (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \ (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \ (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \ - (1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD)) + (1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD) | \ + (1ULL << VHOST_USER_PROTOCOL_F_MQ)) /* * Set of features which are enabled by default. * Protocol feature bit is needed to enable notification notifier ctrl. */ #define SFC_VDPA_DEFAULT_FEATURES \ - (1ULL << VHOST_USER_F_PROTOCOL_FEATURES) + ((1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | \ + (1ULL << VIRTIO_NET_F_MQ)) #define SFC_VDPA_MSIX_IRQ_SET_BUF_LEN \ (sizeof(struct vfio_irq_set) + \ diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h index 9dbd5b8..5c8e352 100644 --- a/drivers/vdpa/sfc/sfc_vdpa_ops.h +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h @@ -7,7 +7,7 @@ #include -#define SFC_VDPA_MAX_QUEUE_PAIRS 1 +#define SFC_VDPA_MAX_QUEUE_PAIRS 8 enum sfc_vdpa_context { SFC_VDPA_AS_VF From patchwork Thu Jul 14 13:48:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: abhimanyu.saini@xilinx.com X-Patchwork-Id: 113978 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 C8DB9A0032; Thu, 14 Jul 2022 15:49:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 521FD42BBA; Thu, 14 Jul 2022 15:48:34 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2044.outbound.protection.outlook.com [40.107.101.44]) by mails.dpdk.org (Postfix) with ESMTP id 5A77C42BC6 for ; Thu, 14 Jul 2022 15:48:33 +0200 (CEST) ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=df8RMAAyl2WXfoIsHroJsAnr+o1iPpvFowcn7WpO5T+6Ax+Z4I22jPu2pUD+CB6TWnc6AOgBk6TK+Rwb+tkqgDHVU3iUNsUrjkUzJjC3dpFTk20fpMvIpQvju9eFBdraknw75s+f/Iuv2WaY0rU4SGX8ueP/VymtwQNFd+08/JpEZa+O22F6amnnr+WU+2qb2QpDcZgRvxKBVW1rxkxrNtrd8GkmDUZ5iEKEwgvAYdeCpe5jlIKx4a/e0k6Ht8gMeB62dHLSQqjfOcBJ3qmXb6KUBH5JKTH+J5gfyS8lh0olx0GHFoJ/ek82238G0u7GBfhSjBrrT626Pfpwmy8kCA== ARC-Message-Signature: i=2; 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=NPcmLKenUGHdq8eCWjbTC7u8GNWcFiACYBjrMbd90mI=; b=WHZVAVdGO54msh8KSCrvM2P0e1WvAqHLLdB9Awf8+jOW3L31Zqql5bJVE3Cp2hMpJfEpiwOfjcwvTENJiC1CTfqWuuzRYk7649wEkcwzWX1ZAPkfFlNzdXORK5QyaiOsyDTQ8Wae+whgmWlVTPjrnHSORcaYt4LeQuyaVjEgt1F30XAKODts0+GGRNpjUZqxSUAu4do5olimmKqsYA3qfppvdF+HXtGf7UqnwRV+agivmBJTheYjnn2OFcr1LCnYidItlHU7iwlczPky7kIVHhW8cLWHTOZ6X7RN8aVqe4Xma6oUm2KN0aoL8I8Ubw/vUCLiny1b+Pfom5wqQyX1rQ== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 20.83.241.18) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=fail (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=xilinx.com] dmarc=[1,1,header.from=xilinx.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NPcmLKenUGHdq8eCWjbTC7u8GNWcFiACYBjrMbd90mI=; b=ngzO6LV9itsyUctiHfEaX4SQBFWESpUzkQsCTMQ5vrIB8Nvz6nFKWSAHqkxDUZRG/cWRfrI+TXMuIQ5AqFhl/5laUl8g4BHCRwypfYrf0p34oZOSmSXrtOOOue6tinvL6XNNe/ftYsZDj4mBlVhK93g79a40EvwOkoGDMc8kDlIEOSKxw9WVpn+fdqIFqUZTjx/NjJSxYbt1LlmPjgMe6LHV5+J58yxgTJrng2JnmWeJem5twrF9IviHe0uxPq90s6fdQaT5cMQ5RtcMZZMfnjtyq3e4XWE487hVPxj3/PPoBR7I3nqkpTEvkcKR2FT5G8ELWVnoVRonwg7or6om/g== Received: from MW4P220CA0029.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::34) by MN2PR12MB3103.namprd12.prod.outlook.com (2603:10b6:208:c5::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.20; Thu, 14 Jul 2022 13:48:25 +0000 Received: from CO1NAM11FT026.eop-nam11.prod.protection.outlook.com (2603:10b6:303:115:cafe::20) by MW4P220CA0029.outlook.office365.com (2603:10b6:303:115::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 13:48:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.83.241.18) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 20.83.241.18 as permitted sender) receiver=protection.outlook.com; client-ip=20.83.241.18; helo=mailrelay000001.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net; pr=C Received: from mailrelay000001.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net (20.83.241.18) by CO1NAM11FT026.mail.protection.outlook.com (10.13.175.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 13:48:25 +0000 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11lp2170.outbound.protection.outlook.com [104.47.56.170]) by mailrelay000001.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net (Postfix) with ESMTPS id 696E041D7A; Thu, 14 Jul 2022 13:48:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hVm4QWXK6PEuEtnWvNa1j5aO3BtolObydzADr8BWGjj0GSMR+Zg+J3WiBv5+c19qSQDairA7f+SZxELipwTcRe/xQPBnl4gjzzLM/QZsOfWQFS+5D1AQ/TT3pehXoSPhfL1wyt9u9BXOqBv0B+HddFH0Zlk1Vsq63H3n/ikf2MqFXXOi4NDLd+8ieQlYzhcKdsF0gZJsbvf9cRQPvzPVFABDe3tU6CDJHAMLjIcW6ab0IjMJfoe/L7Iybea9avykBKvH/4BOVNT5XmE1ncTX4qlUyos54RGPCXvbuf7fIDqTcpVeoIyP6e6u0YEMNX39mqXM19SuyK9baHe5zrErLQ== 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=NPcmLKenUGHdq8eCWjbTC7u8GNWcFiACYBjrMbd90mI=; b=Y2Psifk/QPADMTA2jN2/frdKCCNJvgtrbnTtMxeR6Z+syywAjOExIom9bJsAj2+zyrhGQIIOMLDTOxy2H7deYzp5hNxsILbUEj134d6MAsxh3qDY8gF4XfgfBMvMZbfHzms7Ewpl1E5/m4AnRCLOCBrabTaLiXJ3vxHlsqErU0OCWmUac8AO6DnEvftDCKh6mSVuUF3zP3jpNLwfidJ6fMznT//dStVbw3rUnCyUT4+v9F2cF9z1ojpJyIoav49SLsfae7CbxdYpmOf2iq4Lz4Kv42RoLvNK3fZBiArQJIKGKyioIntplJShp5WAFKvH/1tptqH4xAqtwIHlo29IHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.62.198) smtp.rcpttodomain=dpdk.org smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=none Received: from BN9PR03CA0150.namprd03.prod.outlook.com (2603:10b6:408:fe::35) by SN6PR02MB3920.namprd02.prod.outlook.com (2603:10b6:805:2b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.16; Thu, 14 Jul 2022 13:48:23 +0000 Received: from BN1NAM02FT006.eop-nam02.prod.protection.outlook.com (2603:10b6:408:fe:cafe::18) by BN9PR03CA0150.outlook.office365.com (2603:10b6:408:fe::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14 via Frontend Transport; Thu, 14 Jul 2022 13:48:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.62.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received: from xsj-pvapexch01.xlnx.xilinx.com (149.199.62.198) by BN1NAM02FT006.mail.protection.outlook.com (10.13.2.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 13:48:22 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) by xsj-pvapexch01.xlnx.xilinx.com (172.19.86.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Thu, 14 Jul 2022 06:48:20 -0700 Received: from smtp.xilinx.com (172.19.127.96) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Thu, 14 Jul 2022 06:48:20 -0700 Envelope-to: dev@dpdk.org, chenbo.xia@intel.com, maxime.coquelin@redhat.com, andrew.rybchenko@oktetlabs.ru, absaini@amd.com Received: from [10.170.66.118] (port=50892 helo=xndengvm004118.xilinx.com) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1oBzCW-0003Fq-0X; Thu, 14 Jul 2022 06:48:20 -0700 From: To: CC: , , , Abhimanyu Saini Subject: [PATCH v3 5/5] vdpa/sfc: Add support for SW assisted live migration Date: Thu, 14 Jul 2022 19:18:04 +0530 Message-ID: <20220714134804.60495-6-asaini@xilinx.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20220714134804.60495-1-asaini@xilinx.com> References: <20220714084451.38375-1-asaini@xilinx.com> <20220714134804.60495-1-asaini@xilinx.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 93edd61c-1a23-4d89-757f-08da659f8670 X-MS-TrafficTypeDiagnostic: SN6PR02MB3920:EE_|CO1NAM11FT026:EE_|MN2PR12MB3103:EE_ X-MS-Exchange-SenderADCheck: 0 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: hDj5bwl/LUBBGutyKRRaDDiwgMS5R2vuQ5lVUlZ9PND1xSkCA/EMfZuyB53R61a/dDAAvLXmcRk7OGDl/dSioWZDHLL6H/YCM8V0k+0GkI1lZIC8X7VFhdCSGfBbuPT0XF1hHkc9WI7w5FrK0k28v34Mk2P1nlxVn7LpU3I750NxnE80fez3mF1MzJKKRbHxgBOiZeyLqHWOy8U3iKuiDsGztosjqpY/I/ql/9RtD/piZVipS4eqCtbrXQ/RvBWqM2qLAc3O4Rsa+v2k7lh4d+YJXNwfTTwzm0BLCE825EImtHv8op/EVQQgqhNlH6hWEblnYsWef/O8wB448BwVAhvUsAi81fiAzH2eev//3iqK94xEWS/igzeFIhxJsiXvYMKGz1091MGeA7apDZeR+oquULAddXkPIHAl5FcQwxGmJF6cf88BmueNfvPg5SkTS7ZW5I5z7d4T/g/NkZcTniwYpu7nKkGzgphVDQb6C1qJHs8NKWpgZN8IRno73bosjBKy9XObwlCSU8FRMAdQfgi4PdinwDvM96ICduOUTVigd++15AVrXcnJ+fKDNtmFWs0A7us3PpbLOWtqz8p+vmGu73Tb4iSgnXmlL6J/wgMGP4LipEuSiyfSRxkaYuD53tGy2TFMskDwHQlRl59/vwfli3yXipdtpAi9DXY7U2U5BjR2Ybd7O5gfcSujZwncl2hoVB5++iPoDFyOI5fbkpxutrEgBAU3p1zBWDX62uLtXVAw959bm54x5x6/ql9tqhfaqUepoRAoaJz+gAQvaTv7yDJbhxgfCnvlVnITJUcSI1TCEnIIdXIeaTXAvENwSJ/zLGjyLrpAxQNr2d4epKX0w2LPEaJogwDgsLvw2xo= X-Forefront-Antispam-Report-Untrusted: CIP:149.199.62.198; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapexch01.xlnx.xilinx.com; PTR:unknown-62-198.xilinx.com; CAT:NONE; SFS:(13230016)(4636009)(376002)(136003)(396003)(346002)(39860400002)(46966006)(40470700004)(36840700001)(36860700001)(478600001)(36756003)(82310400005)(356005)(9786002)(54906003)(30864003)(316002)(83380400001)(70586007)(8936002)(5660300002)(6666004)(4326008)(41300700001)(8676002)(6916009)(2616005)(1076003)(70206006)(26005)(336012)(82740400003)(2876002)(47076005)(7636003)(40460700003)(186003)(40480700001)(2906002)(7696005)(426003)(102446001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR02MB3920 X-MS-Exchange-Transport-CrossTenantHeadersStripped: CO1NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: f719862c-0711-4e80-a723-08da659f84e5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S+lqsMY9ynX4YuUGJSbxDF5cXL+DLrixuvI3xYhbCjga0af9zpv03fIda3Ra5ror6Hd+FiCtYOeCYAwnc28WO5IOpUrkOBBsh92+aLy8w8QkfZqWfU7wdrO0JAkzTo7yfQlSwIrOIiv1nR4fHfz3w5dusrLU3MI8e410ypPU+hKZZwoxta722nV1mB3wwuoqytx8FkKKpKp+CZS8XwtRmnPpcUbDBRm7LU7g5rEQQG2lOopwF+hst2NxfS+3em2CuURA58jlBYs5hrQQ0EmHksWbI7j/aEZPooMLZ3otYotv1d7YdWIyJwH5LOzfs5dxUjhrED1rQq08BBwCyGA0r1c93XkdTyAUO79ES6ZOwVYRBafG9k57Wia9j4ri+P5zit5jly9abpSnbYrB4jsF0KZFqzzDRFNiPmIDudDvGuDgFMoHg53t2p8/OhQYfx3p/RF1vF6A64agjGclVE8ZuYHyq0nJ6gIyi64KT6ItkX46b9z7r7yhQ1JZOrAIeoxZJBXC3Ui/W3/a3Xy5T1I4GBfCs95z2X0EEyaOnW0kL/NHxCE1OcfXrG7eWY9hI1I133vJVFY3XHoHKwaVPT8pDwY4Q+EMkhLsiV/y4O4lkXG9A0d47pfxwAASY5mobndvg0dImzTfe7D8cxvRngUa//FMNBTwFUGpmj7s7C/ixRu7Vvlqz2Wg6P1B/IR/Hj15yl6dZmHGaNtM+8WkzoYOJGkBJR6olc/zqIEesxnzwbtSYVYtB6Zc7ORDHEbE2eV7KUX2x1N8AsAb/ITCMdlwjEU4URJSB4+6VFanb00E/zF4J8uTZgrjlixpSwZUR/D9UPVvajp0NskCl9Eh+BSOhn0d7BpXffxGR8Kq5x/MVsM= X-Forefront-Antispam-Report: CIP:20.83.241.18; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mailrelay000001.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(136003)(376002)(346002)(396003)(36840700001)(46966006)(8936002)(316002)(82310400005)(70206006)(6916009)(8676002)(41300700001)(83170400001)(36860700001)(40480700001)(478600001)(5660300002)(30864003)(54906003)(4326008)(7696005)(2906002)(2876002)(6666004)(36756003)(9786002)(81166007)(1076003)(82740400003)(83380400001)(26005)(336012)(47076005)(42882007)(426003)(186003)(2616005)(102446001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2022 13:48:25.5600 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 93edd61c-1a23-4d89-757f-08da659f8670 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[20.83.241.18]; Helo=[mailrelay000001.14r1f435wfvunndds3vy4cdalc.xx.internal.cloudapp.net] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-CO1NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3103 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: Abhimanyu Saini In SW assisted live migration, vDPA driver will stop all virtqueues and setup up SW vrings to relay the communication between the virtio driver and the vDPA device using an event driven relay thread This will allow vDPA driver to help on guest dirty page logging for live migration. Signed-off-by: Abhimanyu Saini --- v2: * Fix checkpatch warnings * Add a cover letter v3: * Restructure patchset drivers/vdpa/sfc/sfc_vdpa.h | 1 + drivers/vdpa/sfc/sfc_vdpa_ops.c | 337 +++++++++++++++++++++++++++++++++++++--- drivers/vdpa/sfc/sfc_vdpa_ops.h | 15 +- 3 files changed, 330 insertions(+), 23 deletions(-) diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h index daeb27d..ae522ca 100644 --- a/drivers/vdpa/sfc/sfc_vdpa.h +++ b/drivers/vdpa/sfc/sfc_vdpa.h @@ -18,6 +18,7 @@ #define SFC_VDPA_MAC_ADDR "mac" #define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000 +#define SFC_SW_VRING_IOVA 0x300000000000 /* Broadcast & Unicast MAC filters are supported */ #define SFC_MAX_SUPPORTED_FILTERS 3 diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c index 6401d4e..1d29ee7 100644 --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c @@ -4,10 +4,13 @@ #include #include +#include #include +#include #include #include +#include #include #include #include @@ -33,7 +36,9 @@ */ #define SFC_VDPA_DEFAULT_FEATURES \ ((1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | \ - (1ULL << VIRTIO_NET_F_MQ)) + (1ULL << VIRTIO_NET_F_MQ) | \ + (1ULL << VHOST_F_LOG_ALL) | \ + (1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE)) #define SFC_VDPA_MSIX_IRQ_SET_BUF_LEN \ (sizeof(struct vfio_irq_set) + \ @@ -42,6 +47,142 @@ /* It will be used for target VF when calling function is not PF */ #define SFC_VDPA_VF_NULL 0xFFFF +#define SFC_VDPA_DECODE_FD(data) (data.u64 >> 32) +#define SFC_VDPA_DECODE_QID(data) (data.u32 >> 1) +#define SFC_VDPA_DECODE_EV_TYPE(data) (data.u32 & 1) + +/* + * Create q_num number of epoll events for kickfd interrupts + * and q_num/2 events for callfd interrupts. Round up the + * total to (q_num * 2) number of events. + */ +#define SFC_VDPA_SW_RELAY_EVENT_NUM(q_num) (q_num * 2) + +static inline uint64_t +sfc_vdpa_encode_ev_data(int type, uint32_t qid, int fd) +{ + SFC_VDPA_ASSERT(fd > UINT32_MAX || qid > UINT32_MAX / 2); + return type | (qid << 1) | (uint64_t)fd << 32; +} + +static inline void +sfc_vdpa_queue_relay(struct sfc_vdpa_ops_data *ops_data, uint32_t qid) +{ + rte_vdpa_relay_vring_used(ops_data->vid, qid, &ops_data->sw_vq[qid]); + rte_vhost_vring_call(ops_data->vid, qid); +} + +static void* +sfc_vdpa_sw_relay(void *data) +{ + uint64_t buf; + uint32_t qid, q_num; + struct epoll_event ev; + struct rte_vhost_vring vring; + int nbytes, i, ret, fd, epfd, nfds = 0; + struct epoll_event events[SFC_VDPA_MAX_QUEUE_PAIRS * 2]; + struct sfc_vdpa_ops_data *ops_data = (struct sfc_vdpa_ops_data *)data; + + q_num = rte_vhost_get_vring_num(ops_data->vid); + epfd = epoll_create(SFC_VDPA_SW_RELAY_EVENT_NUM(q_num)); + if (epfd < 0) { + sfc_vdpa_log_init(ops_data->dev_handle, + "failed to create epoll instance"); + goto fail_epoll; + } + ops_data->epfd = epfd; + + vring.kickfd = -1; + for (qid = 0; qid < q_num; qid++) { + ev.events = EPOLLIN | EPOLLPRI; + ret = rte_vhost_get_vhost_vring(ops_data->vid, qid, &vring); + if (ret != 0) { + sfc_vdpa_log_init(ops_data->dev_handle, + "rte_vhost_get_vhost_vring error %s", + strerror(errno)); + goto fail_vring; + } + + ev.data.u64 = sfc_vdpa_encode_ev_data(0, qid, vring.kickfd); + if (epoll_ctl(epfd, EPOLL_CTL_ADD, vring.kickfd, &ev) < 0) { + sfc_vdpa_log_init(ops_data->dev_handle, + "epoll add error: %s", + strerror(errno)); + goto fail_epoll_add; + } + } + + /* + * Register intr_fd created by vDPA driver in lieu of qemu's callfd + * to intercept rx queue notification. So that we can monitor rx + * notifications and issue rte_vdpa_relay_vring_used() + */ + for (qid = 0; qid < q_num; qid += 2) { + fd = ops_data->intr_fd[qid]; + ev.events = EPOLLIN | EPOLLPRI; + ev.data.u64 = sfc_vdpa_encode_ev_data(1, qid, fd); + if (epoll_ctl(epfd, EPOLL_CTL_ADD, fd, &ev) < 0) { + sfc_vdpa_log_init(ops_data->dev_handle, + "epoll add error: %s", + strerror(errno)); + goto fail_epoll_add; + } + sfc_vdpa_queue_relay(ops_data, qid); + } + + /* + * virtio driver in VM was continuously sending queue notifications + * while were setting up software vrings and hence the HW misses + * these doorbell notifications. Since, it is safe to send duplicate + * doorbell, send another doorbell from vDPA driver. + */ + for (qid = 0; qid < q_num; qid++) + rte_write16(qid, ops_data->vq_cxt[qid].doorbell); + + for (;;) { + nfds = epoll_wait(epfd, events, + SFC_VDPA_SW_RELAY_EVENT_NUM(q_num), -1); + if (nfds < 0) { + if (errno == EINTR) + continue; + sfc_vdpa_log_init(ops_data->dev_handle, + "epoll_wait return fail\n"); + goto fail_epoll_wait; + } + + for (i = 0; i < nfds; i++) { + fd = SFC_VDPA_DECODE_FD(events[i].data); + /* Ensure kickfd is not busy before proceeding */ + for (;;) { + nbytes = read(fd, &buf, 8); + if (nbytes < 0) { + if (errno == EINTR || + errno == EWOULDBLOCK || + errno == EAGAIN) + continue; + } + break; + } + + qid = SFC_VDPA_DECODE_QID(events[i].data); + if (SFC_VDPA_DECODE_EV_TYPE(events[i].data)) + sfc_vdpa_queue_relay(ops_data, qid); + else + rte_write16(qid, ops_data->vq_cxt[qid].doorbell); + } + } + + return NULL; + +fail_epoll: +fail_vring: +fail_epoll_add: +fail_epoll_wait: + close(epfd); + ops_data->epfd = -1; + return NULL; +} + static int sfc_vdpa_get_device_features(struct sfc_vdpa_ops_data *ops_data) { @@ -99,7 +240,7 @@ static int sfc_vdpa_enable_vfio_intr(struct sfc_vdpa_ops_data *ops_data) { - int rc; + int rc, fd; int *irq_fd_ptr; int vfio_dev_fd; uint32_t i, num_vring; @@ -131,6 +272,17 @@ return -1; irq_fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = vring.callfd; + if (ops_data->sw_fallback_mode && !(i & 1)) { + fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); + if (fd < 0) { + sfc_vdpa_err(ops_data->dev_handle, + "failed to create eventfd"); + goto fail_eventfd; + } + ops_data->intr_fd[i] = fd; + irq_fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = fd; + } else + ops_data->intr_fd[i] = -1; } rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set); @@ -138,16 +290,26 @@ sfc_vdpa_err(ops_data->dev_handle, "error enabling MSI-X interrupts: %s", strerror(errno)); - return -1; + goto fail_ioctl; } return 0; + +fail_ioctl: +fail_eventfd: + for (i = 0; i < num_vring; i++) { + if (ops_data->intr_fd[i] != -1) { + close(ops_data->intr_fd[i]); + ops_data->intr_fd[i] = -1; + } + } + return -1; } static int sfc_vdpa_disable_vfio_intr(struct sfc_vdpa_ops_data *ops_data) { - int rc; + int rc, i; int vfio_dev_fd; struct vfio_irq_set irq_set; void *dev; @@ -161,6 +323,12 @@ irq_set.index = VFIO_PCI_MSIX_IRQ_INDEX; irq_set.start = 0; + for (i = 0; i < ops_data->vq_count; i++) { + if (ops_data->intr_fd[i] >= 0) + close(ops_data->intr_fd[i]); + ops_data->intr_fd[i] = -1; + } + rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, &irq_set); if (rc) { sfc_vdpa_err(ops_data->dev_handle, @@ -223,12 +391,15 @@ static int sfc_vdpa_virtq_start(struct sfc_vdpa_ops_data *ops_data, int vq_num) { - int rc; + int rc, fd; + uint64_t size; uint32_t doorbell; efx_virtio_vq_t *vq; + void *vring_buf, *dev; struct sfc_vdpa_vring_info vring; efx_virtio_vq_cfg_t vq_cfg; efx_virtio_vq_dyncfg_t vq_dyncfg; + uint64_t sw_vq_iova = ops_data->sw_vq_iova; vq = ops_data->vq_cxt[vq_num].vq; if (vq == NULL) @@ -241,6 +412,33 @@ goto fail_vring_info; } + if (ops_data->sw_fallback_mode) { + size = vring_size(vring.size, rte_mem_page_size()); + size = RTE_ALIGN_CEIL(size, rte_mem_page_size()); + vring_buf = rte_zmalloc("vdpa", size, rte_mem_page_size()); + vring_init(&ops_data->sw_vq[vq_num], vring.size, vring_buf, + rte_mem_page_size()); + + dev = ops_data->dev_handle; + fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_container_fd; + rc = rte_vfio_container_dma_map(fd, + (uint64_t)(uintptr_t)vring_buf, + sw_vq_iova, size); + + /* Direct I/O for Tx queue, relay for Rx queue */ + if (!(vq_num & 1)) + vring.used = sw_vq_iova + + (char *)ops_data->sw_vq[vq_num].used - + (char *)ops_data->sw_vq[vq_num].desc; + + ops_data->sw_vq[vq_num].used->idx = vring.last_used_idx; + ops_data->sw_vq[vq_num].avail->idx = vring.last_avail_idx; + + ops_data->vq_cxt[vq_num].sw_vq_iova = sw_vq_iova; + ops_data->vq_cxt[vq_num].sw_vq_size = size; + ops_data->sw_vq_iova += size; + } + vq_cfg.evvc_target_vf = SFC_VDPA_VF_NULL; /* even virtqueue for RX and odd for TX */ @@ -309,9 +507,12 @@ static int sfc_vdpa_virtq_stop(struct sfc_vdpa_ops_data *ops_data, int vq_num) { - int rc; + int rc, fd; + void *dev, *buf; + uint64_t size, len, iova; efx_virtio_vq_dyncfg_t vq_idx; efx_virtio_vq_t *vq; + struct rte_vhost_vring vring; if (ops_data->vq_cxt[vq_num].enable != B_TRUE) return -1; @@ -320,12 +521,34 @@ if (vq == NULL) return -1; + if (ops_data->sw_fallback_mode) { + dev = ops_data->dev_handle; + fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_container_fd; + /* synchronize remaining new used entries if any */ + if (!(vq_num & 1)) + sfc_vdpa_queue_relay(ops_data, vq_num); + + rte_vhost_get_vhost_vring(ops_data->vid, vq_num, &vring); + len = SFC_VDPA_USED_RING_LEN(vring.size); + rte_vhost_log_used_vring(ops_data->vid, vq_num, 0, len); + + buf = ops_data->sw_vq[vq_num].desc; + size = ops_data->vq_cxt[vq_num].sw_vq_size; + iova = ops_data->vq_cxt[vq_num].sw_vq_iova; + rte_vfio_container_dma_unmap(fd, (uint64_t)(uintptr_t)buf, + iova, size); + } + /* stop the vq */ rc = efx_virtio_qstop(vq, &vq_idx); if (rc == 0) { - ops_data->vq_cxt[vq_num].cidx = vq_idx.evvd_vq_used_idx; - ops_data->vq_cxt[vq_num].pidx = vq_idx.evvd_vq_avail_idx; + if (ops_data->sw_fallback_mode) + vq_idx.evvd_vq_avail_idx = vq_idx.evvd_vq_used_idx; + rte_vhost_set_vring_base(ops_data->vid, vq_num, + vq_idx.evvd_vq_avail_idx, + vq_idx.evvd_vq_used_idx); } + ops_data->vq_cxt[vq_num].enable = B_FALSE; return rc; @@ -450,7 +673,11 @@ SFC_EFX_ASSERT(ops_data->state == SFC_VDPA_STATE_CONFIGURED); - sfc_vdpa_log_init(ops_data->dev_handle, "entry"); + if (ops_data->sw_fallback_mode) { + sfc_vdpa_log_init(ops_data->dev_handle, + "Trying to start VDPA with SW I/O relay"); + ops_data->sw_vq_iova = SFC_SW_VRING_IOVA; + } ops_data->state = SFC_VDPA_STATE_STARTING; @@ -675,6 +902,7 @@ sfc_vdpa_dev_close(int vid) { int ret; + void *status; struct rte_vdpa_device *vdpa_dev; struct sfc_vdpa_ops_data *ops_data; @@ -707,7 +935,23 @@ } ops_data->is_notify_thread_started = false; + if (ops_data->sw_fallback_mode) { + ret = pthread_cancel(ops_data->sw_relay_thread_id); + if (ret != 0) + sfc_vdpa_err(ops_data->dev_handle, + "failed to cancel LM relay thread: %s", + rte_strerror(ret)); + + ret = pthread_join(ops_data->sw_relay_thread_id, &status); + if (ret != 0) + sfc_vdpa_err(ops_data->dev_handle, + "failed to join LM relay thread: %s", + rte_strerror(ret)); + } + sfc_vdpa_stop(ops_data); + ops_data->sw_fallback_mode = false; + sfc_vdpa_close(ops_data); sfc_vdpa_adapter_unlock(ops_data->dev_handle); @@ -774,9 +1018,49 @@ static int sfc_vdpa_set_features(int vid) { - RTE_SET_USED(vid); + int ret; + uint64_t features = 0; + struct rte_vdpa_device *vdpa_dev; + struct sfc_vdpa_ops_data *ops_data; - return -1; + vdpa_dev = rte_vhost_get_vdpa_device(vid); + ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev); + if (ops_data == NULL) + return -1; + + rte_vhost_get_negotiated_features(vid, &features); + + if (!RTE_VHOST_NEED_LOG(features)) + return -1; + + sfc_vdpa_info(ops_data->dev_handle, "live-migration triggered"); + + sfc_vdpa_adapter_lock(ops_data->dev_handle); + + /* Stop HW Offload and unset host notifier */ + sfc_vdpa_stop(ops_data); + if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, false) != 0) + sfc_vdpa_info(ops_data->dev_handle, + "vDPA (%s): Failed to clear host notifier", + ops_data->vdpa_dev->device->name); + + /* Restart vDPA with SW relay on RX queue */ + ops_data->sw_fallback_mode = true; + sfc_vdpa_start(ops_data); + ret = pthread_create(&ops_data->sw_relay_thread_id, NULL, + sfc_vdpa_sw_relay, (void *)ops_data); + if (ret != 0) + sfc_vdpa_err(ops_data->dev_handle, + "failed to create rx_relay thread: %s", + rte_strerror(ret)); + + if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0) + sfc_vdpa_info(ops_data->dev_handle, "notifier setup failed!"); + + sfc_vdpa_adapter_unlock(ops_data->dev_handle); + sfc_vdpa_info(ops_data->dev_handle, "SW fallback setup done!"); + + return 0; } static int @@ -860,17 +1144,28 @@ sfc_vdpa_info(dev, "vDPA ops get_notify_area :: offset : 0x%" PRIx64, *offset); - pci_dev = sfc_vdpa_adapter_by_dev_handle(dev)->pdev; - doorbell = (uint8_t *)pci_dev->mem_resource[reg.index].addr + *offset; + if (!ops_data->sw_fallback_mode) { + pci_dev = sfc_vdpa_adapter_by_dev_handle(dev)->pdev; + doorbell = (uint8_t *)pci_dev->mem_resource[reg.index].addr + + *offset; + /* + * virtio-net driver in VM sends queue notifications before + * vDPA has a chance to setup the queues and notification area, + * and hence the HW misses these doorbell notifications. + * Since, it is safe to send duplicate doorbell, send another + * doorbell from vDPA driver as workaround for this timing issue + */ + rte_write16(qid, doorbell); + + /* + * Update doorbell address, it will come in handy during + * live-migration. + */ + ops_data->vq_cxt[qid].doorbell = doorbell; + } - /* - * virtio-net driver in VM sends queue notifications before - * vDPA has a chance to setup the queues and notification area, - * and hence the HW misses these doorbell notifications. - * Since, it is safe to send duplicate doorbell, send another - * doorbell from vDPA driver as workaround for this timing issue. - */ - rte_write16(qid, doorbell); + sfc_vdpa_info(dev, "vDPA ops get_notify_area :: offset : 0x%" PRIx64, + *offset); return 0; } diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h index 5c8e352..dd301ba 100644 --- a/drivers/vdpa/sfc/sfc_vdpa_ops.h +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h @@ -6,8 +6,11 @@ #define _SFC_VDPA_OPS_H #include +#include #define SFC_VDPA_MAX_QUEUE_PAIRS 8 +#define SFC_VDPA_USED_RING_LEN(size) \ + ((size) * sizeof(struct vring_used_elem) + sizeof(uint16_t) * 3) enum sfc_vdpa_context { SFC_VDPA_AS_VF @@ -37,9 +40,10 @@ struct sfc_vdpa_vring_info { typedef struct sfc_vdpa_vq_context_s { volatile void *doorbell; uint8_t enable; - uint32_t pidx; - uint32_t cidx; efx_virtio_vq_t *vq; + + uint64_t sw_vq_iova; + uint64_t sw_vq_size; } sfc_vdpa_vq_context_t; struct sfc_vdpa_ops_data { @@ -57,6 +61,13 @@ struct sfc_vdpa_ops_data { uint16_t vq_count; struct sfc_vdpa_vq_context_s vq_cxt[SFC_VDPA_MAX_QUEUE_PAIRS * 2]; + + int epfd; + uint64_t sw_vq_iova; + bool sw_fallback_mode; + pthread_t sw_relay_thread_id; + struct vring sw_vq[SFC_VDPA_MAX_QUEUE_PAIRS * 2]; + int intr_fd[SFC_VDPA_MAX_QUEUE_PAIRS * 2]; }; struct sfc_vdpa_ops_data *