From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 88046A0544 for ; Tue, 28 Jun 2022 05:47:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82792400D6; Tue, 28 Jun 2022 05:47:29 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2081.outbound.protection.outlook.com [40.107.243.81]) by mails.dpdk.org (Postfix) with ESMTP id D3A3F400D6 for ; Tue, 28 Jun 2022 05:47:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IP5Qco95GMiNQZskGWIhjP+00pCeHe7S6AcCgJnM58U9sFW6JFIZb3qQWWdMSv/Rkq+ylz8RH6RZYC2kKe67ao+YoUN9FWjdu3/ZJwIOOAAUuUnHskrEpjbW1kiFBC1n5jggYqvHyQfpJjJXYJNVM1p8b6yuCuEYrwZRNWG1I2Gc/FQ4UYa7Bx9QzO4JKBFDJVNoDxq6x2D1KHdEQ5yDTKFZ3PPZ8O7eQsXFyGWgEb9ZC+VQHXFXSYBEUp37HMV9FSZPn+0hR70rflOsopRI6u9T2InM73VhVArHfl14Kop1uluXGiseiX+qqA4hP4+eZD1/0zmY+Zc++9KLveNSag== 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=owuYCyeE0a1nRdaL7FuM0DmszqAdnv66fYYlFAOkP6E=; b=EGcoIu6wedwf49bMsgfOd9eVj3tI7b2gRiIXcawvmDfnSYbI46f8BHalmTLiAEzHbM23a+NQ3fi6EWhxIje+MzHR4xUv96bcKAM/8ofogVFaioxn2hInXe6UnTfYSYNjwK5ZpJGyrtzuimpRbY8RdfiNPCwfqMvNC8iBfXePxAlYhsGgVvss9ceSJwx+umc3sJSRBcnJP3aSZh7l4ao9iYzJ0rXLgp2IowYQGVgOu3L6rBsxfDjXBg4xXTN6DNYIXuefM1SEidriTvzLVQwNKGhZyaeI0QzY1GUONnfr45B3vd9NnrcfLYzYym4RmFDm+W06NoehKJXh3w1NwTBNkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=owuYCyeE0a1nRdaL7FuM0DmszqAdnv66fYYlFAOkP6E=; b=t2yvIlROWSkpxez4G3ANdXGOCCsD3r/iXjXP03z2EoeO9TzW+8qpw8tHij3mVgB7VV3r4lPswCTJ9tEWj+c2pBCzs034jqEVbev+kR4Wsg/kA1iH/N1GzVgSsOuXNDCukPiM+/PhRoQf508tIuoHepf9qlYmx7vgHq5qA6IGdTYTn4taowBYiAEeirWEi2hegX/fpPSWSKJHzqC4Izl/v4GvR3qaXvkJPO5N97NrMKy6R3bMdkRuokl1NSgkmT7mBc9vE1crT5dEU2N+dSNzztdeL6/mwZecqdC3x4x3/atbcA7wBJNVWy3Ae7bsCSe71Ti9pAEF1wom/32qbAQJlg== Received: from BN9PR03CA0657.namprd03.prod.outlook.com (2603:10b6:408:13b::32) by DM6PR12MB3658.namprd12.prod.outlook.com (2603:10b6:5:1c8::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.17; Tue, 28 Jun 2022 03:47:27 +0000 Received: from BN8NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13b:cafe::14) by BN9PR03CA0657.outlook.office365.com (2603:10b6:408:13b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15 via Frontend Transport; Tue, 28 Jun 2022 03:47:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.236) by BN8NAM11FT011.mail.protection.outlook.com (10.13.176.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5373.15 via Frontend Transport; Tue, 28 Jun 2022 03:47:26 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 28 Jun 2022 03:47:25 +0000 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Mon, 27 Jun 2022 20:47:23 -0700 From: Li Zhang To: , , , Viacheslav Ovsiienko CC: , , , Subject: [PATCH 21.11] vdpa/mlx5: fix maximum number of virtqs Date: Tue, 28 Jun 2022 06:47:05 +0300 Message-ID: <20220628034705.81181-1-lizh@nvidia.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220408075606.33056-1-lizh@nvidia.com> References: <20220408075606.33056-1-lizh@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3346c3d4-0a88-4a33-5244-08da58b8eb33 X-MS-TrafficTypeDiagnostic: DM6PR12MB3658:EE_ X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rXOLqydP6yVyX+DMfx7lrAJK0pzw8LD3uOqgmdTeFZsSy50qiNMOiAGEV4QT/lTg72UB9B70JgyJwurIN3Tw8qjOV+2x1XYzfH/JKXM9mnfm0kBHoCUfZ4tzaXZXQgc+09kWL0TGkn94LudK/gQV9w3w6hdO/p87MYnE9yjr/Kr9KCNnBqhygXemqaqB65HFG5oihjhYqqHraB9trqPVBnG3CCTxBu5bmNTwHmQdtn4bVBRRhjYbDbKEwKZnlhrAhYJhPbfM2bNGxsFP9w/sLYyRBRYCvk3GzA+CMJlxDSCpQ0TXZoS5WsOJvJVtmbAxmIeXyTqcZ0ou6pyXLrAIiZ08s91/gLoKzk1+OA+beCfUfNUaFAF3zvbVYboLvJeQmo8IVxNOE0y0ZMoU+DkPyib1kCmaoUxHMPFat7XEuAt5aEj2CEt92CgdgJ3SwrKLkX0wF0glnVbaYqms0PkfvsmXABDMLP5o3zelu/G0d1IY3XVUtw4oFQpfyFJ1zTIUcgCaTzG1rzAnY+0Iw/4zu/RICj/SZjuaX4g5YIjeojglvmW6kzOAM5ddi4FUTWmCFXYXy7wCwCvF3JCM9qcOZwtckrcGw3XxygHyD2arP6YCEgkbq15rlr/F5gAZzjFA+kOWvXJ9/A58X7JlrectZ0kMZFsquPzXp5jryXOu4jVkNVQ6kpUvH8y3vKKSeLPbDBmsyCPDirl/I9DohlDxJieYDKdMbb0okJtgVnEr48TLcGRoURccO1eM6N9ZJw5JznWmg4h1dqxs0q418MlChHljysAaPDUaLQaUv+SUyZUr0DRqsHERhUrQS3rJw4rDr5WZoaP78YGT91KdbS5fbYJbe31PZBiryqCnAHMHh4c= X-Forefront-Antispam-Report: CIP:12.22.5.236; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(136003)(376002)(346002)(396003)(46966006)(40470700004)(36840700001)(55016003)(110136005)(316002)(70206006)(40480700001)(426003)(54906003)(336012)(6636002)(1076003)(107886003)(47076005)(2616005)(2906002)(186003)(41300700001)(36756003)(7696005)(8676002)(16526019)(6286002)(6666004)(82740400003)(81166007)(356005)(5660300002)(82310400005)(26005)(8936002)(4326008)(86362001)(83380400001)(70586007)(40460700003)(478600001)(36860700001)(2101003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 03:47:26.7863 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3346c3d4-0a88-4a33-5244-08da58b8eb33 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.236]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3658 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org [ upstream commit 6f065d1539bed56602e3c6159c99cccb3bca38e4 ] The driver wrongly takes the capability value for the number of virtq pairs instead of just the number of virtqs. Adjust all the usages of it to be the number of virtqs. Fixes: c2eb33aaf967 ("vdpa/mlx5: manage virtqs by array") Cc: stable@dpdk.org Signed-off-by: Li Zhang Acked-by: Matan Azrad Reviewed-by: Maxime Coquelin --- drivers/vdpa/mlx5/mlx5_vdpa.c | 6 +++--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c index 8dfaba791d..9c1c70037c 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa.c @@ -81,7 +81,7 @@ mlx5_vdpa_get_queue_num(struct rte_vdpa_device *vdev, uint32_t *queue_num) DRV_LOG(ERR, "Invalid vDPA device: %s.", vdev->device->name); return -1; } - *queue_num = priv->caps.max_num_virtio_queues; + *queue_num = priv->caps.max_num_virtio_queues / 2; return 0; } @@ -138,7 +138,7 @@ mlx5_vdpa_set_vring_state(int vid, int vring, int state) DRV_LOG(ERR, "Invalid vDPA device: %s.", vdev->device->name); return -EINVAL; } - if (vring >= (int)priv->caps.max_num_virtio_queues * 2) { + if (vring >= (int)priv->caps.max_num_virtio_queues) { DRV_LOG(ERR, "Too big vring id: %d.", vring); return -E2BIG; } @@ -518,7 +518,7 @@ mlx5_vdpa_dev_probe(struct mlx5_common_device *cdev) DRV_LOG(DEBUG, "No capability to support virtq statistics."); priv = rte_zmalloc("mlx5 vDPA device private", sizeof(*priv) + sizeof(struct mlx5_vdpa_virtq) * - attr->vdpa.max_num_virtio_queues * 2, + attr->vdpa.max_num_virtio_queues, RTE_CACHE_LINE_SIZE); if (!priv) { DRV_LOG(ERR, "Failed to allocate private memory."); diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c index 0ef7ed0e4a..ea2ec83a1b 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c @@ -470,9 +470,9 @@ mlx5_vdpa_virtqs_prepare(struct mlx5_vdpa_priv *priv) DRV_LOG(INFO, "TSO is enabled without CSUM, force CSUM."); priv->features |= (1ULL << VIRTIO_NET_F_CSUM); } - if (nr_vring > priv->caps.max_num_virtio_queues * 2) { + if (nr_vring > priv->caps.max_num_virtio_queues) { DRV_LOG(ERR, "Do not support more than %d virtqs(%d).", - (int)priv->caps.max_num_virtio_queues * 2, + (int)priv->caps.max_num_virtio_queues, (int)nr_vring); return -1; } -- 2.31.1