From nobody Fri May 8 03:08:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDC51C433EF for ; Thu, 12 May 2022 07:51:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351210AbiELHvX (ORCPT ); Thu, 12 May 2022 03:51:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351179AbiELHvP (ORCPT ); Thu, 12 May 2022 03:51:15 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2076.outbound.protection.outlook.com [40.107.236.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDEA023BD7 for ; Thu, 12 May 2022 00:51:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TWx0ViBsm7Fo5OTKWhYFnzu3VVDTy48XomEB+yHj5/CNvtk3gms8s2r4cPTl8pYUUfGSJR2flQ3/ba2Tz7OrSI4xBjz6Ytjd5II+Z+UUPyhKkJr1P6XIfNPPigmgGOLDgDmkYQTh2wWQTAkLldHCobL7DRlGhVR2no/1IOZG5PtoP6hH4azwXzggiMh7/W8SFm0OpSCSqrslvMp2AJq5x+8A5ZIJ0I7ZUkJKtj3G0HZUxr2JG7C6v5Cs03M1TEiSu2foGGa6ZJwS/LSDoR7AJzZcRP0LM3kmPI9cem2PeXMWN+Xuy0ICaAODxBwoJ/W9/7THF5qzZOE6amsgjXKDIg== 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=hp2CQkeKufDpXiu33CxbPm9FCMw4CDft+U6WNmlxzc8=; b=mqMzXv153SvP5KdOOPtX25UoqzaDZtwSvKhupcF6IYHhr84uzQSBJHeMfRqX5gZutkmWxOIjbpz1cNoMKytytHgslGWwV/Ddo0ksyX1GCHvce4dibU3JyerRLzAlAy8a2kZWLbUSY28F6YiSBHF+zvN+v//ZbHMFduDmA3tI8ycunnghmbvQ6ohMrpiHU2KgVvCJEnwaYlazPWvW1aJXRLOgcCpobr0Hc2qnxBj4D2xpLUCT+RbTqy+Z5RuacdA3kBz91mKP4H5ojEGSBZ8MErdhbUniXjy1cqUYAdeUsRksXQ4fJQ/3FYG6di+3SDz1pJN5W9xm/7YelSDQRfCfTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=vger.kernel.org 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=hp2CQkeKufDpXiu33CxbPm9FCMw4CDft+U6WNmlxzc8=; b=BdtMjX0yGSPZ1XbQdeVmsAVlWxncqZbOGWjPad79VMBwNuzLXHPUeQXBKUlrnmKcW4dxb0PC5K8hf34ULSftGB1jovydEEuH/PTExZu/49b5qhTMAEOaa2gan0sJpWmETBVa8P7nJj2XYARImlSEaQVnhQUjG5tZEnZYwJZ2H8N65oc40TmBELRHFdpUIjogs2VFmdQzged4Vx9Rq8GszeTWlRAEuyCI4nLN3AyfSFGBTaoKUZJosSvhlWcc2l4Sh+bS+0IPRinUxTmicY+9N3p/FD4KOYwlsHvvbdCkG8Ppdt6pOC8uLtkwSrNtSBM6oiXvLiB6h0BLSd/e2M8sQA== Received: from MW4PR04CA0248.namprd04.prod.outlook.com (2603:10b6:303:88::13) by BY5PR12MB3906.namprd12.prod.outlook.com (2603:10b6:a03:1a9::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.22; Thu, 12 May 2022 07:51:07 +0000 Received: from CO1NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:303:88:cafe::b1) by MW4PR04CA0248.outlook.office365.com (2603:10b6:303:88::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14 via Frontend Transport; Thu, 12 May 2022 07:51:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) 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.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.235) by CO1NAM11FT011.mail.protection.outlook.com (10.13.175.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5250.13 via Frontend Transport; Thu, 12 May 2022 07:51:07 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Thu, 12 May 2022 07:51:06 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Thu, 12 May 2022 00:51:06 -0700 Received: from vdi.nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.986.22 via Frontend Transport; Thu, 12 May 2022 00:51:04 -0700 From: Eli Cohen To: , CC: , , , Eli Cohen Subject: [PATCH v6 1/4] vdpa: Fix error logic in vdpa_nl_cmd_dev_get_doit Date: Thu, 12 May 2022 10:50:57 +0300 Message-ID: <20220512075100.1715286-2-elic@nvidia.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220512075100.1715286-1-elic@nvidia.com> References: <20220512075100.1715286-1-elic@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a28aac7e-7631-41f1-c3ea-08da33ec2c22 X-MS-TrafficTypeDiagnostic: BY5PR12MB3906:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1VNnOp9VNDR7JUer9MYmWILcuOldMNSEkYYitX00rNOUsu/HpoZPlyBtc9My1TqkuDams02nS7hvLFdiB9azhZQoKMcGXP2wQeousKSbUUHISVV4tBkzouedYENjQKvqWCKKaUY4FBjC+EQ/AYLy5/WS0glbTbf4SuIkuYo1Rs5A8pNDf4+x9vqyMkZqBYlo361xkINWedGLtSVCSkptu134F84tCBzrCzxdnSqwl1ccaEG9bANjczZW+UGt/FyS+7O+Mv3ojx1GUtfnZuM62cB4JdUqtox7BccbjoXChsXNL4t2y1QBPTXMM5gYwMVyWjoKniNZp/Uf77gasSRxOkPBvEj83+iPNCOmyczpOK+V54fhg7Q0vTb1FvAe0VYcZqLhQNTHCCLNEEpOokEqEEAPUjmGZtzTc/hrZo3SpRCkM5QhgFRA99AEkVkmXkN23vggFz6Xrk3k9P3niMm38auKgd0coResNBRBxPcE0lFYMPOrrjkM6zLhBghEWhoE7NDhRtNJ1YgSzZj0lCbpr6+ppceDp1Kgddo6otlrt2XhAa+NHUhwv8y526FSkYwpT95fuPyk1Eyz4ZbcBDLWqUsJ1QAthM/RkmGtWvfEHzBT49UwORq3J/9XAE+F94aEDNs7cIDgb7fS0na0b39wHmN064b9e5LHj4zwhRxNy1exz+Ib5sq3acU724xhKv87W0Gy5eT1bK7iHgho93zPZQ== X-Forefront-Antispam-Report: CIP:12.22.5.235;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:InfoNoRecords;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(26005)(2616005)(40460700003)(107886003)(36860700001)(8676002)(36756003)(4326008)(82310400005)(47076005)(186003)(1076003)(426003)(336012)(110136005)(316002)(70586007)(54906003)(70206006)(2906002)(5660300002)(6666004)(86362001)(508600001)(8936002)(7696005)(81166007)(356005)(83380400001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 07:51:07.0870 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a28aac7e-7631-41f1-c3ea-08da33ec2c22 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.235];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3906 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In vdpa_nl_cmd_dev_get_doit(), if the call to genlmsg_reply() fails we must not call nlmsg_free() since this is done inside genlmsg_reply(). Fix it. Fixes: bc0d90ee021f ("vdpa: Enable user to query vdpa device info") Reviewed-by: Si-Wei Liu Acked-by: Jason Wang Signed-off-by: Eli Cohen --- drivers/vdpa/vdpa.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index 2b75c00b1005..fac89a0d8178 100644 --- a/drivers/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c @@ -756,14 +756,19 @@ static int vdpa_nl_cmd_dev_get_doit(struct sk_buff *s= kb, struct genl_info *info) goto mdev_err; } err =3D vdpa_dev_fill(vdev, msg, info->snd_portid, info->snd_seq, 0, info= ->extack); - if (!err) - err =3D genlmsg_reply(msg, info); + if (err) + goto mdev_err; + + err =3D genlmsg_reply(msg, info); + put_device(dev); + mutex_unlock(&vdpa_dev_mutex); + return err; + mdev_err: put_device(dev); err: mutex_unlock(&vdpa_dev_mutex); - if (err) - nlmsg_free(msg); + nlmsg_free(msg); return err; } =20 --=20 2.35.1 From nobody Fri May 8 03:08:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CDE5C433EF for ; Thu, 12 May 2022 07:51:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350193AbiELHvr (ORCPT ); Thu, 12 May 2022 03:51:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351181AbiELHvP (ORCPT ); Thu, 12 May 2022 03:51:15 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2044.outbound.protection.outlook.com [40.107.237.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDF2E252B4 for ; Thu, 12 May 2022 00:51:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oEQhy2D5IteO27hj912u1u1pAsWAMzNIzLJuK5ZCYSfLoiJ9pnxB8vBWPvC2bT0AO6qRqEZb2Xbw4zCSy9eSy4YOyQCPkrGoeEl8alACRBMfrQ3YIDBQeoHQRHFqTENTZFpBXYMURhX39DRsSvtf8Hgu3IWJmiezwzWHwm1XmYH+xOGzHYqNDDtGqY5MOztD/ELbL0ChPQCG7cFrOqbSgdFa6M/f3Abf8lX2aXHosG9ScIqFGLOOz0J0P+JvxnwUYtJVD+nzOGdrcwe3CKOyg7FRYN4Q6HlyGE+WoW2fGPs0zQKkSkkPeMa69fxHEmSXgrWPHRR1RhgDkPMeQq9IAw== 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=gboDTsKE01o1+b2sLmGkXtuDr3NFEN8qVqRx+iYtE58=; b=ZaEcu4U6xZQlXmxeXIKErlRkvKhm/lIMdmalfGJYgOX9LuSSgiO5ZINPm1conFp1nSWfqt2xP9/vCusGdUJzeM9MJ5kbnJj/JLvW9TRRsNUyogv1roSQ5KgHpcjviUv3sRi5QD82Ef6qpZMKflZPfFiQh3jqRrvDwD0SnWnmG+fT6qAEAJ0lIwnPGAZXAMX9MZFciUKNxRAIIraURJ2QKSlQMkOwvVLPdUADmQq4yUD7/NdiHnOOrATEe1+0uSaJF4myfCU9Zk+r7l9JToa0ZESy3VeXUOB5JkH+zFbjC86Ta8ALu88IN6OGTMh2GXYXOEd47HUq0FSYCJaemv4TCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) smtp.rcpttodomain=vger.kernel.org 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=gboDTsKE01o1+b2sLmGkXtuDr3NFEN8qVqRx+iYtE58=; b=pX2DT2I7WIC85+R9eoriPDyMbIYUnaS1hypL/w0TwAZClfAGhzdICKGc5ifrBt7j9L+yLDVMCJ1cuwbzakE23K1o5xcOnwfu57LGhaRNRdG61pv4oH7NcAoz3yf6XrNHunZcAc9S16z6+jokUylkvfO6vX6pvTY5J1aEp8Nd1NDKhXXRIbutbb0PP5ofYuYyCr3hRo15NFxhbmZi9e9Eftiwl/vK1RoCAzr+hrRbDh1I2OlQD3stoIL+G8rd0Op44+Uzqzqjrmjczy7AYqeV6RXMenquOy5QmMhq3WjxfuGhKdIngbIdXKKM46hVdUi7bnQFJdFPAwaE/VWXIE4PNg== Received: from BN0PR04CA0163.namprd04.prod.outlook.com (2603:10b6:408:eb::18) by BY5PR12MB3779.namprd12.prod.outlook.com (2603:10b6:a03:1a7::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.23; Thu, 12 May 2022 07:51:10 +0000 Received: from BN8NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::a5) by BN0PR04CA0163.outlook.office365.com (2603:10b6:408:eb::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Thu, 12 May 2022 07:51:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) 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.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.238) by BN8NAM11FT056.mail.protection.outlook.com (10.13.177.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5250.13 via Frontend Transport; Thu, 12 May 2022 07:51:09 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Thu, 12 May 2022 07:51:08 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Thu, 12 May 2022 00:51:08 -0700 Received: from vdi.nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.986.22 via Frontend Transport; Thu, 12 May 2022 00:51:06 -0700 From: Eli Cohen To: , CC: , , , Eli Cohen Subject: [PATCH v6 2/4] vdpa: Add support for querying vendor statistics Date: Thu, 12 May 2022 10:50:58 +0300 Message-ID: <20220512075100.1715286-3-elic@nvidia.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220512075100.1715286-1-elic@nvidia.com> References: <20220512075100.1715286-1-elic@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb790163-e69d-455d-c917-08da33ec2d8f X-MS-TrafficTypeDiagnostic: BY5PR12MB3779:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hC4h5K6WexvypT13W1rwgp2eJEBirts0GwW9l8DGg7Kb7WKWpnPF9lCRSjc80QvGWh0Rq1WsxFSKhaPH81ETUVqCxLf7Ku+K7ZGz+xohxZjFa0hcWziX5/VKC1HcN+ZbTO/EICDU7myk4VNw9MDbwomeagFa8rSgthPEqPgdJweax0CekYAigzVv+E4VpcnLzeqqDbcol8SbOe8XKmcJK7q3YKLPtqLXPjbhINIKveJgSRlLwY6rzpJCEX6Niq0vIjfgPqKmnJTvYo08XDWOJUpsRIF71y2L7mjQepFkdFcpm1VGdVeV7NgDG9LXSOCSmVXmBjrYgLLKQXd9twxQdTpx/x6ZQ0xxFSSjoYI83yBW7Gj1YTVJvbmhPZ58AkjlWV71aZXdAvcGeNV5fDevxXzZWyPKANbyvUCkkGXkBiP7BbR9Gw4/bzBxYT3EkxEjtE5GNRnNS2FdC9+maod+VZOHW3O47xdITrMPoEcG4Bzrgm7bNJx81CaJRm6QdLAuhQVeSjAqn/fitmnwmeeBaNR9QyrRi8j/vGUGJOsqohaU1gAuanbO28A0i1q6v6uF6GtI7CscmnRyKWEGX70OwjUFSyFPSp9DdQ4qDWGDmGfOUrUuXzgTyn3p5C09nRegGVAU2buPJ493ic62avzNFGh9aqw5yXDFAG/FfxLQq9KpswGcuqIwZgfPejOw8Cyecv2LxjWx598rbyFJdRf8Ig== X-Forefront-Antispam-Report: CIP:12.22.5.238;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:InfoNoRecords;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(70206006)(356005)(86362001)(6666004)(4326008)(70586007)(110136005)(8676002)(36860700001)(426003)(47076005)(54906003)(336012)(316002)(508600001)(40460700003)(186003)(1076003)(107886003)(81166007)(7696005)(2616005)(5660300002)(26005)(8936002)(83380400001)(82310400005)(2906002)(36756003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 07:51:09.4011 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cb790163-e69d-455d-c917-08da33ec2d8f 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.238];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3779 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Allows to read vendor statistics of a vdpa device. The specific statistics data are received from the upstream driver in the form of an (attribute name, attribute value) pairs. An example of statistics for mlx5_vdpa device are: received_desc - number of descriptors received by the virtqueue completed_desc - number of descriptors completed by the virtqueue A descriptor using indirect buffers is still counted as 1. In addition, N chained descriptors are counted correctly N times as one would expect. A new callback was added to vdpa_config_ops which provides the means for the vdpa driver to return statistics results. The interface allows for reading all the supported virtqueues, including the control virtqueue if it exists. Below are some examples taken from mlx5_vdpa which are introduced in the following patch: 1. Read statistics for the virtqueue at index 1 $ vdpa dev vstats show vdpa-a qidx 1 vdpa-a: queue_type tx queue_index 1 received_desc 3844836 completed_desc 3844836 2. Read statistics for the virtqueue at index 32 $ vdpa dev vstats show vdpa-a qidx 32 vdpa-a: queue_type control_vq queue_index 32 received_desc 62 completed_desc 62 3. Read statisitics for the virtqueue at index 0 with json output $ vdpa -j dev vstats show vdpa-a qidx 0 {"vstats":{"vdpa-a":{ "queue_type":"rx","queue_index":0,"name":"received_desc","value":417776,\ "name":"completed_desc","value":417548}}} 4. Read statistics for the virtqueue at index 0 with preety json output $ vdpa -jp dev vstats show vdpa-a qidx 0 { "vstats": { "vdpa-a": { "queue_type": "rx", "queue_index": 0, "name": "received_desc", "value": 417776, "name": "completed_desc", "value": 417548 } } } Signed-off-by: Eli Cohen --- drivers/vdpa/vdpa.c | 153 ++++++++++++++++++++++++++++++++++++++ include/linux/vdpa.h | 3 + include/uapi/linux/vdpa.h | 6 ++ 3 files changed, 162 insertions(+) diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index fac89a0d8178..7ce417ff0ea8 100644 --- a/drivers/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c @@ -914,6 +914,99 @@ vdpa_dev_config_fill(struct vdpa_device *vdev, struct = sk_buff *msg, u32 portid, return err; } =20 +static int vdpa_fill_stats_rec(struct vdpa_device *vdev, struct sk_buff *m= sg, + struct genl_info *info, u32 index) +{ + u64 features; + u8 status; + int err; + + status =3D vdev->config->get_status(vdev); + if (!(status & VIRTIO_CONFIG_S_FEATURES_OK)) { + NL_SET_ERR_MSG_MOD(info->extack, "feature negotiation not complete"); + return -EAGAIN; + } + + features =3D vdev->config->get_driver_features(vdev); + if (nla_put_u64_64bit(msg, VDPA_ATTR_DEV_NEGOTIATED_FEATURES, + features, VDPA_ATTR_PAD)) + return -EMSGSIZE; + + err =3D vdev->config->get_vendor_vq_stats(vdev, index, msg, info->extack); + if (err) + return err; + + if (nla_put_u32(msg, VDPA_ATTR_DEV_QUEUE_INDEX, index)) + return -EMSGSIZE; + + return 0; +} + +static int vendor_stats_fill(struct vdpa_device *vdev, struct sk_buff *msg, + struct genl_info *info, u32 index) +{ + int err; + + if (!vdev->config->get_vendor_vq_stats) + return -EOPNOTSUPP; + + err =3D vdpa_fill_stats_rec(vdev, msg, info, index); + if (err) + return err; + + return 0; +} + +static int vdpa_dev_vendor_stats_fill(struct vdpa_device *vdev, + struct sk_buff *msg, + struct genl_info *info, u32 index) +{ + u32 device_id; + void *hdr; + int err; + u32 portid =3D info->snd_portid; + u32 seq =3D info->snd_seq; + u32 flags =3D 0; + + hdr =3D genlmsg_put(msg, portid, seq, &vdpa_nl_family, flags, + VDPA_CMD_DEV_VSTATS_GET); + if (!hdr) + return -EMSGSIZE; + + if (nla_put_string(msg, VDPA_ATTR_DEV_NAME, dev_name(&vdev->dev))) { + err =3D -EMSGSIZE; + goto undo_msg; + } + + device_id =3D vdev->config->get_device_id(vdev); + if (nla_put_u32(msg, VDPA_ATTR_DEV_ID, device_id)) { + err =3D -EMSGSIZE; + goto undo_msg; + } + + switch (device_id) { + case VIRTIO_ID_NET: + if (index > VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX) { + NL_SET_ERR_MSG_MOD(info->extack, "queue index excceeds max value"); + err =3D -ERANGE; + break; + } + + err =3D vendor_stats_fill(vdev, msg, info, index); + break; + default: + err =3D -EOPNOTSUPP; + break; + } + genlmsg_end(msg, hdr); + + return err; + +undo_msg: + genlmsg_cancel(msg, hdr); + return err; +} + static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct gen= l_info *info) { struct vdpa_device *vdev; @@ -995,6 +1088,60 @@ vdpa_nl_cmd_dev_config_get_dumpit(struct sk_buff *msg= , struct netlink_callback * return msg->len; } =20 +static int vdpa_nl_cmd_dev_stats_get_doit(struct sk_buff *skb, + struct genl_info *info) +{ + struct vdpa_device *vdev; + struct sk_buff *msg; + const char *devname; + struct device *dev; + u32 index; + int err; + + if (!info->attrs[VDPA_ATTR_DEV_NAME]) + return -EINVAL; + + if (!info->attrs[VDPA_ATTR_DEV_QUEUE_INDEX]) + return -EINVAL; + + devname =3D nla_data(info->attrs[VDPA_ATTR_DEV_NAME]); + msg =3D nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); + if (!msg) + return -ENOMEM; + + index =3D nla_get_u32(info->attrs[VDPA_ATTR_DEV_QUEUE_INDEX]); + mutex_lock(&vdpa_dev_mutex); + dev =3D bus_find_device(&vdpa_bus, NULL, devname, vdpa_name_match); + if (!dev) { + NL_SET_ERR_MSG_MOD(info->extack, "device not found"); + err =3D -ENODEV; + goto dev_err; + } + vdev =3D container_of(dev, struct vdpa_device, dev); + if (!vdev->mdev) { + NL_SET_ERR_MSG_MOD(info->extack, "unmanaged vdpa device"); + err =3D -EINVAL; + goto mdev_err; + } + err =3D vdpa_dev_vendor_stats_fill(vdev, msg, info, index); + if (err) + goto mdev_err; + + err =3D genlmsg_reply(msg, info); + + put_device(dev); + mutex_unlock(&vdpa_dev_mutex); + + return err; + +mdev_err: + put_device(dev); +dev_err: + nlmsg_free(msg); + mutex_unlock(&vdpa_dev_mutex); + return err; +} + static const struct nla_policy vdpa_nl_policy[VDPA_ATTR_MAX + 1] =3D { [VDPA_ATTR_MGMTDEV_BUS_NAME] =3D { .type =3D NLA_NUL_STRING }, [VDPA_ATTR_MGMTDEV_DEV_NAME] =3D { .type =3D NLA_STRING }, @@ -1035,6 +1182,12 @@ static const struct genl_ops vdpa_nl_ops[] =3D { .doit =3D vdpa_nl_cmd_dev_config_get_doit, .dumpit =3D vdpa_nl_cmd_dev_config_get_dumpit, }, + { + .cmd =3D VDPA_CMD_DEV_VSTATS_GET, + .validate =3D GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .doit =3D vdpa_nl_cmd_dev_stats_get_doit, + .flags =3D GENL_ADMIN_PERM, + }, }; =20 static struct genl_family vdpa_nl_family __ro_after_init =3D { diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h index 8943a209202e..2ae8443331e1 100644 --- a/include/linux/vdpa.h +++ b/include/linux/vdpa.h @@ -276,6 +276,9 @@ struct vdpa_config_ops { const struct vdpa_vq_state *state); int (*get_vq_state)(struct vdpa_device *vdev, u16 idx, struct vdpa_vq_state *state); + int (*get_vendor_vq_stats)(struct vdpa_device *vdev, u16 idx, + struct sk_buff *msg, + struct netlink_ext_ack *extack); struct vdpa_notification_area (*get_vq_notification)(struct vdpa_device *vdev, u16 idx); /* vq irq is not expected to be changed once DRIVER_OK is set */ diff --git a/include/uapi/linux/vdpa.h b/include/uapi/linux/vdpa.h index 1061d8d2d09d..25c55cab3d7c 100644 --- a/include/uapi/linux/vdpa.h +++ b/include/uapi/linux/vdpa.h @@ -18,6 +18,7 @@ enum vdpa_command { VDPA_CMD_DEV_DEL, VDPA_CMD_DEV_GET, /* can dump */ VDPA_CMD_DEV_CONFIG_GET, /* can dump */ + VDPA_CMD_DEV_VSTATS_GET, }; =20 enum vdpa_attr { @@ -46,6 +47,11 @@ enum vdpa_attr { VDPA_ATTR_DEV_NEGOTIATED_FEATURES, /* u64 */ VDPA_ATTR_DEV_MGMTDEV_MAX_VQS, /* u32 */ VDPA_ATTR_DEV_SUPPORTED_FEATURES, /* u64 */ + + VDPA_ATTR_DEV_QUEUE_INDEX, /* u32 */ + VDPA_ATTR_DEV_VENDOR_ATTR_NAME, /* string */ + VDPA_ATTR_DEV_VENDOR_ATTR_VALUE, /* u64 */ + /* new attributes must be added above here */ VDPA_ATTR_MAX, }; --=20 2.35.1 From nobody Fri May 8 03:08:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C851AC433EF for ; Thu, 12 May 2022 07:51:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351189AbiELHv4 (ORCPT ); Thu, 12 May 2022 03:51:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351183AbiELHvP (ORCPT ); Thu, 12 May 2022 03:51:15 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2045.outbound.protection.outlook.com [40.107.93.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CF622CC9A for ; Thu, 12 May 2022 00:51:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=isRQ5+Y9MLrVE51SnqEYUaG3PWi32ZNG5pN/vrmZCRi3YlFVVwj7ZRxRg7UYuvYM6llvJNCwVXk16araMbShWnnMAmzauF9I4TX43gZeSGEQS8MUFcsxTgVzOiiEXDl/yhj8sD5NbQqNsNG6J+Fa86Zmv0j5Nop61GShJGj0kCDAJZgCVUKP6eKfIFGuIUzxr0mz9wx0sArYBkx/ok9fGdUjs5VZbUFmOphciZx3wDb/weGIxZWm+7s+tx9T7KjTAEchT5k6kDRXsUdPkoIqpGsYl9IEsmSE8hYPkxLHhfN0sTjR40vXAX3rqt1Hrm9bELX6KH4E0lWg60ofegtoRg== 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=0NlhT34aUum4DMnzBqOmPoNGdEqSPSXY3Mw3ZCJCW9g=; b=DDD+V/Cio9WK35uMvXtEr+MAp8gq9otSR0K6AqG3vUkueXFAH34ZkOBh1ye68PEfkqamzpW5W6kEo6fMg3V7yhSre9vgKq4C4swjs8XZK7w0FvLBAelV1t+VNYgbLJkmHS4pqVP7FoKbtMjGTWxPUGxz47FlPWPac+JrUp33OpGOTk4h7D9i8Va+h4so7tu9hoECqwHtLriUeN1Faj62H2RqqTfNtOtHg15gueAz1x3j08zfEMrBboJefKjXNlnPcmT1uR13pXTC5DwFuEGfdCzAHOjfcSZrQqXF5xSFmZ0zZWACDz2WVE/0yOCPX35fzPUnMDIXz3oLryURJbQeKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) smtp.rcpttodomain=vger.kernel.org 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=0NlhT34aUum4DMnzBqOmPoNGdEqSPSXY3Mw3ZCJCW9g=; b=Oy+fDpUPtxO+hJgHnErFzD6+GqVg6ImMyQCF/zP9SnA1I/oxg3lZYN1IyTsbEFoB0ybfgEkD1LlfnDAXluOW2dR6h6Ie8JN4koUgkQj9zORSWx45Rf/JvGrFAYEEK58BLL8+4EzAGtL8RNoOKUE+f/Km3WXDeyFSNCKSoXBxzzH0kks+/o+xObuWgV6kmFcK15Vu+moVaEw/NTML33J7YVF4ayjvHnMGT+IVLKLfhzJXl3B+Q7hr4nvpu51NfpD3ceto+YjHXVvaVGBgULYVss2Z0KWhc7kMvoB/sxeH8AH/xxG4PdGAjkz+aeSOiMimTzxNOWgZJEWWR9co+8p6lA== Received: from MW4PR04CA0196.namprd04.prod.outlook.com (2603:10b6:303:86::21) by MN2PR12MB3101.namprd12.prod.outlook.com (2603:10b6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.21; Thu, 12 May 2022 07:51:12 +0000 Received: from CO1NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:303:86:cafe::87) by MW4PR04CA0196.outlook.office365.com (2603:10b6:303:86::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.23 via Frontend Transport; Thu, 12 May 2022 07:51:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.234) 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.234 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.234; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.234) by CO1NAM11FT008.mail.protection.outlook.com (10.13.175.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5250.13 via Frontend Transport; Thu, 12 May 2022 07:51:11 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by DRHQMAIL101.nvidia.com (10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Thu, 12 May 2022 07:51:10 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Thu, 12 May 2022 00:51:10 -0700 Received: from vdi.nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.986.22 via Frontend Transport; Thu, 12 May 2022 00:51:08 -0700 From: Eli Cohen To: , CC: , , , Eli Cohen Subject: [PATCH v6 3/4] net/vdpa: Use readers/writers semaphore instead of mutex Date: Thu, 12 May 2022 10:50:59 +0300 Message-ID: <20220512075100.1715286-4-elic@nvidia.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220512075100.1715286-1-elic@nvidia.com> References: <20220512075100.1715286-1-elic@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a6119fa8-4ab9-43a5-3c51-08da33ec2e9c X-MS-TrafficTypeDiagnostic: MN2PR12MB3101:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YIuqT1xMrVD5mKIR/Mo7v3hNQ4+uQFtcKLjFij3rKQeFLZ7sWqmSFtYibQyUDvb6hMeYbEvMMpUWu407MI1ATX2yA4Nem1p/gaSElX2nSc0TXfSHMqONikDI3b3BBZVKQzS3AashRYrE6obeYZlxLQUc5LqY6Pv6iUAC9N/4BxM5mu4QLWS4s9NyAEPfTS0lIaVch9ZqzW5OORiipVhGRfUBJdElCgK+wCogkVWTbbRDarBGU+c9a3jBfgDwC7lKfSs7E8ikryRiYGqpRorOGYXRNoXZdjYyyGJNwj7dQT/D/rahWYYluW5OWKVXY1J/tD47WhBeYqwWh4DR6JxGFTvzySO/axO9UUX0xeEqH21AS7IiKqT7rQPOqQPFr67SH1+ESxbL75/Q2ALLO3JmvH6+ci448382nKBwSxAOI5TsiEbRSE80vg09TSoMDWgo+8voD00j4JQHQKc0+wyZfx+r4ajtMcGHsvJmIadkmY5pHSsgZXBGrYfN98gCv6xPeo/oYwYM+a3UECvm1wdEG4ebTtPKNsXyOueoSIG/LKfqhlTZNlvz4gGujbJcNCEhMMSO+WkUaj8cZRjtzzGIsLYq6YHbBIs1HUGxRQ99P1qMr+qGBwCkvk3basv9X+tZ0bCNuOIIgODryAqRpBGh87NT/7P5qUFMbfBITmbK/4sC2lXYUebNidU266r0P+jgetywDQaBLDD29azV1GMR9g== X-Forefront-Antispam-Report: CIP:12.22.5.234;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:InfoNoRecords;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(8676002)(2906002)(81166007)(4326008)(70206006)(70586007)(5660300002)(8936002)(82310400005)(110136005)(86362001)(356005)(336012)(426003)(47076005)(6666004)(186003)(2616005)(83380400001)(36860700001)(26005)(7696005)(316002)(40460700003)(1076003)(107886003)(54906003)(508600001)(36756003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 07:51:11.2698 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a6119fa8-4ab9-43a5-3c51-08da33ec2e9c 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.234];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3101 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use rw_semaphore instead of mutex to control access to vdpa devices. This can be especially beneficial in case processes poll on statistics information. Suggested-by: Si-Wei Liu Reviewed-by: Si-Wei Liu Acked-by: Jason Wang Signed-off-by: Eli Cohen --- drivers/vdpa/vdpa.c | 64 ++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index 7ce417ff0ea8..5308e5e34ff2 100644 --- a/drivers/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c @@ -18,7 +18,7 @@ =20 static LIST_HEAD(mdev_head); /* A global mutex that protects vdpa management device and device level op= erations. */ -static DEFINE_MUTEX(vdpa_dev_mutex); +static DECLARE_RWSEM(vdpa_dev_lock); static DEFINE_IDA(vdpa_index_ida); =20 void vdpa_set_status(struct vdpa_device *vdev, u8 status) @@ -238,7 +238,7 @@ static int __vdpa_register_device(struct vdpa_device *v= dev, u32 nvqs) =20 vdev->nvqs =3D nvqs; =20 - lockdep_assert_held(&vdpa_dev_mutex); + lockdep_assert_held(&vdpa_dev_lock); dev =3D bus_find_device(&vdpa_bus, NULL, dev_name(&vdev->dev), vdpa_name_= match); if (dev) { put_device(dev); @@ -278,9 +278,9 @@ int vdpa_register_device(struct vdpa_device *vdev, u32 = nvqs) { int err; =20 - mutex_lock(&vdpa_dev_mutex); + down_write(&vdpa_dev_lock); err =3D __vdpa_register_device(vdev, nvqs); - mutex_unlock(&vdpa_dev_mutex); + up_write(&vdpa_dev_lock); return err; } EXPORT_SYMBOL_GPL(vdpa_register_device); @@ -293,7 +293,7 @@ EXPORT_SYMBOL_GPL(vdpa_register_device); */ void _vdpa_unregister_device(struct vdpa_device *vdev) { - lockdep_assert_held(&vdpa_dev_mutex); + lockdep_assert_held(&vdpa_dev_lock); WARN_ON(!vdev->mdev); device_unregister(&vdev->dev); } @@ -305,9 +305,9 @@ EXPORT_SYMBOL_GPL(_vdpa_unregister_device); */ void vdpa_unregister_device(struct vdpa_device *vdev) { - mutex_lock(&vdpa_dev_mutex); + down_write(&vdpa_dev_lock); device_unregister(&vdev->dev); - mutex_unlock(&vdpa_dev_mutex); + up_write(&vdpa_dev_lock); } EXPORT_SYMBOL_GPL(vdpa_unregister_device); =20 @@ -352,9 +352,9 @@ int vdpa_mgmtdev_register(struct vdpa_mgmt_dev *mdev) return -EINVAL; =20 INIT_LIST_HEAD(&mdev->list); - mutex_lock(&vdpa_dev_mutex); + down_write(&vdpa_dev_lock); list_add_tail(&mdev->list, &mdev_head); - mutex_unlock(&vdpa_dev_mutex); + up_write(&vdpa_dev_lock); return 0; } EXPORT_SYMBOL_GPL(vdpa_mgmtdev_register); @@ -371,14 +371,14 @@ static int vdpa_match_remove(struct device *dev, void= *data) =20 void vdpa_mgmtdev_unregister(struct vdpa_mgmt_dev *mdev) { - mutex_lock(&vdpa_dev_mutex); + down_write(&vdpa_dev_lock); =20 list_del(&mdev->list); =20 /* Filter out all the entries belong to this management device and delete= it. */ bus_for_each_dev(&vdpa_bus, NULL, mdev, vdpa_match_remove); =20 - mutex_unlock(&vdpa_dev_mutex); + up_write(&vdpa_dev_lock); } EXPORT_SYMBOL_GPL(vdpa_mgmtdev_unregister); =20 @@ -532,17 +532,17 @@ static int vdpa_nl_cmd_mgmtdev_get_doit(struct sk_buf= f *skb, struct genl_info *i if (!msg) return -ENOMEM; =20 - mutex_lock(&vdpa_dev_mutex); + down_read(&vdpa_dev_lock); mdev =3D vdpa_mgmtdev_get_from_attr(info->attrs); if (IS_ERR(mdev)) { - mutex_unlock(&vdpa_dev_mutex); + up_read(&vdpa_dev_lock); NL_SET_ERR_MSG_MOD(info->extack, "Fail to find the specified mgmt device= "); err =3D PTR_ERR(mdev); goto out; } =20 err =3D vdpa_mgmtdev_fill(mdev, msg, info->snd_portid, info->snd_seq, 0); - mutex_unlock(&vdpa_dev_mutex); + up_read(&vdpa_dev_lock); if (err) goto out; err =3D genlmsg_reply(msg, info); @@ -561,7 +561,7 @@ vdpa_nl_cmd_mgmtdev_get_dumpit(struct sk_buff *msg, str= uct netlink_callback *cb) int idx =3D 0; int err; =20 - mutex_lock(&vdpa_dev_mutex); + down_read(&vdpa_dev_lock); list_for_each_entry(mdev, &mdev_head, list) { if (idx < start) { idx++; @@ -574,7 +574,7 @@ vdpa_nl_cmd_mgmtdev_get_dumpit(struct sk_buff *msg, str= uct netlink_callback *cb) idx++; } out: - mutex_unlock(&vdpa_dev_mutex); + up_read(&vdpa_dev_lock); cb->args[0] =3D idx; return msg->len; } @@ -627,7 +627,7 @@ static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff = *skb, struct genl_info *i !netlink_capable(skb, CAP_NET_ADMIN)) return -EPERM; =20 - mutex_lock(&vdpa_dev_mutex); + down_write(&vdpa_dev_lock); mdev =3D vdpa_mgmtdev_get_from_attr(info->attrs); if (IS_ERR(mdev)) { NL_SET_ERR_MSG_MOD(info->extack, "Fail to find the specified management = device"); @@ -643,7 +643,7 @@ static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff = *skb, struct genl_info *i =20 err =3D mdev->ops->dev_add(mdev, name, &config); err: - mutex_unlock(&vdpa_dev_mutex); + up_write(&vdpa_dev_lock); return err; } =20 @@ -659,7 +659,7 @@ static int vdpa_nl_cmd_dev_del_set_doit(struct sk_buff = *skb, struct genl_info *i return -EINVAL; name =3D nla_data(info->attrs[VDPA_ATTR_DEV_NAME]); =20 - mutex_lock(&vdpa_dev_mutex); + down_write(&vdpa_dev_lock); dev =3D bus_find_device(&vdpa_bus, NULL, name, vdpa_name_match); if (!dev) { NL_SET_ERR_MSG_MOD(info->extack, "device not found"); @@ -677,7 +677,7 @@ static int vdpa_nl_cmd_dev_del_set_doit(struct sk_buff = *skb, struct genl_info *i mdev_err: put_device(dev); dev_err: - mutex_unlock(&vdpa_dev_mutex); + up_write(&vdpa_dev_lock); return err; } =20 @@ -743,7 +743,7 @@ static int vdpa_nl_cmd_dev_get_doit(struct sk_buff *skb= , struct genl_info *info) if (!msg) return -ENOMEM; =20 - mutex_lock(&vdpa_dev_mutex); + down_read(&vdpa_dev_lock); dev =3D bus_find_device(&vdpa_bus, NULL, devname, vdpa_name_match); if (!dev) { NL_SET_ERR_MSG_MOD(info->extack, "device not found"); @@ -761,13 +761,13 @@ static int vdpa_nl_cmd_dev_get_doit(struct sk_buff *s= kb, struct genl_info *info) =20 err =3D genlmsg_reply(msg, info); put_device(dev); - mutex_unlock(&vdpa_dev_mutex); + up_read(&vdpa_dev_lock); return err; =20 mdev_err: put_device(dev); err: - mutex_unlock(&vdpa_dev_mutex); + up_read(&vdpa_dev_lock); nlmsg_free(msg); return err; } @@ -809,9 +809,9 @@ static int vdpa_nl_cmd_dev_get_dumpit(struct sk_buff *m= sg, struct netlink_callba info.start_idx =3D cb->args[0]; info.idx =3D 0; =20 - mutex_lock(&vdpa_dev_mutex); + down_read(&vdpa_dev_lock); bus_for_each_dev(&vdpa_bus, NULL, &info, vdpa_dev_dump); - mutex_unlock(&vdpa_dev_mutex); + up_read(&vdpa_dev_lock); cb->args[0] =3D info.idx; return msg->len; } @@ -1022,7 +1022,7 @@ static int vdpa_nl_cmd_dev_config_get_doit(struct sk_= buff *skb, struct genl_info if (!msg) return -ENOMEM; =20 - mutex_lock(&vdpa_dev_mutex); + down_read(&vdpa_dev_lock); dev =3D bus_find_device(&vdpa_bus, NULL, devname, vdpa_name_match); if (!dev) { NL_SET_ERR_MSG_MOD(info->extack, "device not found"); @@ -1043,7 +1043,7 @@ static int vdpa_nl_cmd_dev_config_get_doit(struct sk_= buff *skb, struct genl_info mdev_err: put_device(dev); dev_err: - mutex_unlock(&vdpa_dev_mutex); + up_read(&vdpa_dev_lock); if (err) nlmsg_free(msg); return err; @@ -1081,9 +1081,9 @@ vdpa_nl_cmd_dev_config_get_dumpit(struct sk_buff *msg= , struct netlink_callback * info.start_idx =3D cb->args[0]; info.idx =3D 0; =20 - mutex_lock(&vdpa_dev_mutex); + down_read(&vdpa_dev_lock); bus_for_each_dev(&vdpa_bus, NULL, &info, vdpa_dev_config_dump); - mutex_unlock(&vdpa_dev_mutex); + up_read(&vdpa_dev_lock); cb->args[0] =3D info.idx; return msg->len; } @@ -1110,7 +1110,7 @@ static int vdpa_nl_cmd_dev_stats_get_doit(struct sk_b= uff *skb, return -ENOMEM; =20 index =3D nla_get_u32(info->attrs[VDPA_ATTR_DEV_QUEUE_INDEX]); - mutex_lock(&vdpa_dev_mutex); + down_read(&vdpa_dev_lock); dev =3D bus_find_device(&vdpa_bus, NULL, devname, vdpa_name_match); if (!dev) { NL_SET_ERR_MSG_MOD(info->extack, "device not found"); @@ -1130,7 +1130,7 @@ static int vdpa_nl_cmd_dev_stats_get_doit(struct sk_b= uff *skb, err =3D genlmsg_reply(msg, info); =20 put_device(dev); - mutex_unlock(&vdpa_dev_mutex); + up_read(&vdpa_dev_lock); =20 return err; =20 @@ -1138,7 +1138,7 @@ static int vdpa_nl_cmd_dev_stats_get_doit(struct sk_b= uff *skb, put_device(dev); dev_err: nlmsg_free(msg); - mutex_unlock(&vdpa_dev_mutex); + up_read(&vdpa_dev_lock); return err; } =20 --=20 2.35.1 From nobody Fri May 8 03:08:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 327E5C433EF for ; Thu, 12 May 2022 07:52:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351215AbiELHv7 (ORCPT ); Thu, 12 May 2022 03:51:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351195AbiELHvQ (ORCPT ); Thu, 12 May 2022 03:51:16 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2050.outbound.protection.outlook.com [40.107.244.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 046BF2CCAF for ; Thu, 12 May 2022 00:51:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=go+xOKAGv/jkiJmw+lAswkwXdjBauLH2y3li9Zxmvj46dNpb1+/Btd2ceyinTR96YJdy9edqyPwwgCwBR/ZCGibYlAx4B+IPu6MO04pO+AJbTaTV103TvJMK1eARS9fqdVyZkSv4KXF09wJANbaUo+M+kiaflecU9kk73opF79tRFWNRjsPhZ/aKI1dq0/95d3tUN+M4+zLPIY97P91G+6FJO427uPqt8eRH4p4uQw0TScHiNEiB+2FJjAaNIonj26mONSlNN7e4n0lllSLYxUdM4JgMk3HOq0wwlVUq+cMSK1YN3wKeLzPD97lkfDfoGCYvaTB2Zs4aEgdH+wlN6A== 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=312A3BVq8nGwxPItx97gwsGjNQOj1EAqLAX9lSsqoQQ=; b=AQl2i36WwH8zE+J7UYquvwJRRHZo3KuIL8FcSL+Nou7qQiYG+0Xw5f8UCghu1mwXj6h90raSVKWCY9TiDKsLPr9lwKccIvcfBXYgMDxfl7L8PQVgK+4ZtpMD63xG+0Tce9//kRIkcy2TaIOUlOd1y9Y8oR1TNZVkFhlOvrWINY6GoAJzW4vp0e0ZEp4aiLz08IhcJGKuI7micW17Zhu64YRU12jNtPDnadZ7qmqKqy4r+yZnO5OQ4smHI0cnn/ADepS7JaGbmkFjb/GTVGst9mOgwvQ4y8M0VVa3EpDYji6jMLvZspKN8uhaLp3+Xw7a/l0qsRvu7/ANhK0k3ziDVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) smtp.rcpttodomain=vger.kernel.org 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=312A3BVq8nGwxPItx97gwsGjNQOj1EAqLAX9lSsqoQQ=; b=VQ0OTHOgbEw+lDCsmbKUzL0ntU8hXi3n2FzRBnmj+4O0eKjXaaBxiCdA8tnJ05eWipBPNrwJJ/b7YqacYBnzPKcXT0nC2ZIUAmxC7/QlgjCvOs802vnzKpyDNnpOWO/VhW5nHeQaeyEVkT37s0zXAtYD7TZfwabu4nWy5VNNBLTCruAxeopZGgbQwkzktgJWU0+ef1F9h4ZIKx4IQgKGz3SVqDKu1q1C8MqEwAi0MKZpqeBOrA6hgq+D1Tz4AroVlRcLCPlnDmUc1qIRSF+6bNymXkgtQhKMTmAZCOpQYGv6Q34k2H6vrlOtUzVrUVKU9x2Xs3j8ObkM+jI3K05AmQ== Received: from MW4PR03CA0028.namprd03.prod.outlook.com (2603:10b6:303:8f::33) by MW2PR12MB2474.namprd12.prod.outlook.com (2603:10b6:907:9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.22; Thu, 12 May 2022 07:51:13 +0000 Received: from CO1NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8f:cafe::78) by MW4PR03CA0028.outlook.office365.com (2603:10b6:303:8f::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.23 via Frontend Transport; Thu, 12 May 2022 07:51:13 +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; Received: from mail.nvidia.com (12.22.5.236) by CO1NAM11FT005.mail.protection.outlook.com (10.13.174.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5250.13 via Frontend Transport; Thu, 12 May 2022 07:51:13 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Thu, 12 May 2022 07:51:12 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Thu, 12 May 2022 00:51:12 -0700 Received: from vdi.nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.986.22 via Frontend Transport; Thu, 12 May 2022 00:51:10 -0700 From: Eli Cohen To: , CC: , , , Eli Cohen Subject: [PATCH v6 4/4] vdpa/mlx5: Add support for reading descriptor statistics Date: Thu, 12 May 2022 10:51:00 +0300 Message-ID: <20220512075100.1715286-5-elic@nvidia.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220512075100.1715286-1-elic@nvidia.com> References: <20220512075100.1715286-1-elic@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cd671e95-ba6e-4666-030e-08da33ec2fc9 X-MS-TrafficTypeDiagnostic: MW2PR12MB2474:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H2YpElOH5Y4jmYhIkYejiY3694HmnSGelqgsAYJN84FKnGkGTVdHaVLovdz5pxHdwWr5TpZ9rV3omEOxSEsHOEdfUbcqNA8ibc2Xfsj4R9gp5icn/Hu+Vr/gMnxKC2Hlir1JzKFHmeU0jXUVfFLXCLVQuEo+i467KTZMO/IZmGzbeKTpO+kS0GCohua3DfGl/IruFXZrEtfT8H4pm7smbYkzmTFfVqjHYAwTM89BtvUOFMvLyDdwvhjCN5Zmp9aMNibGhWwRi1fh53hR+Xr6bika5ZeAcRNywEi8dbRz36FwQcyzRrMU12jQasc4Oj2wjaVK7BNRPg4Do1ESqVaDv4+Lov84J6aqKWFWFmK7FKRO3NJY22rpXIVWfCIooRu2UTyd/yAai2Y9CjnwLxPE+uGbNGX5MDsJn7/X9tolTBGfopbjWJS5P+2cjJVeQXWuDNOhNxdQuXaEbPHwmBSggGZ3b+nD6iVeau2d6l30LiwAg6T0yY9a/1mFnhLyl0YSpFOmiGbFoz1hJZXtKd9I6MRQViXZ0TNAjzN1i8o4sFUcRLg1eLPNjjoVFymsZqME5nYixEb0QFaozHKwoUMaqMJz68ZaxxR8rRunRZtuKalK8p7Mu+sIRD8iDtBhpvpvOFQwsjEtmo40FLTQQHBGTH4I2TqnHE7pKpCQR3OcEAwejpyIqHOKR2AgKP/Qkhf3gwZCw2l/w5PxvhZm1E7CMg== 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:(13230001)(4636009)(46966006)(36840700001)(40470700004)(508600001)(86362001)(7696005)(6666004)(336012)(426003)(40460700003)(36860700001)(83380400001)(81166007)(54906003)(2616005)(26005)(1076003)(186003)(82310400005)(356005)(8936002)(107886003)(36756003)(5660300002)(2906002)(316002)(110136005)(8676002)(70206006)(70586007)(4326008)(30864003)(47076005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 07:51:13.2253 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd671e95-ba6e-4666-030e-08da33ec2fc9 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: CO1NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB2474 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Implement the get_vq_stats calback of vdpa_config_ops to return the statistics for a virtqueue. The statistics are provided as vendor specific statistics where the driver provides a pair of attribute name and attribute value. In addition to the attribute name/attribute value pair, the driver returns the negotiated features and max virtqueue pairs for userspace can decide for a given queue index whether it is a data or control virtqueue. Currently supported are received descriptors and completed descriptors. Acked-by: Jason Wang Signed-off-by: Eli Cohen v3 -> v4: Only return statistics if feature negotiation was complete --- drivers/vdpa/mlx5/core/mlx5_vdpa.h | 2 + drivers/vdpa/mlx5/net/mlx5_vnet.c | 155 +++++++++++++++++++++++++++++ include/linux/mlx5/mlx5_ifc.h | 1 + include/linux/mlx5/mlx5_ifc_vdpa.h | 39 ++++++++ 4 files changed, 197 insertions(+) diff --git a/drivers/vdpa/mlx5/core/mlx5_vdpa.h b/drivers/vdpa/mlx5/core/ml= x5_vdpa.h index daaf7b503677..44104093163b 100644 --- a/drivers/vdpa/mlx5/core/mlx5_vdpa.h +++ b/drivers/vdpa/mlx5/core/mlx5_vdpa.h @@ -61,6 +61,8 @@ struct mlx5_control_vq { struct vringh_kiov riov; struct vringh_kiov wiov; unsigned short head; + unsigned int received_desc; + unsigned int completed_desc; }; =20 struct mlx5_vdpa_wq_ent { diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5= _vnet.c index 79001301b383..c9759021dfd6 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -119,6 +119,7 @@ struct mlx5_vdpa_virtqueue { struct mlx5_vdpa_umem umem2; struct mlx5_vdpa_umem umem3; =20 + u32 counter_set_id; bool initialized; int index; u32 virtq_id; @@ -164,6 +165,7 @@ struct mlx5_vdpa_net { struct notifier_block nb; struct vdpa_callback config_cb; struct mlx5_vdpa_wq_ent cvq_ent; + /* sync access to virtqueues statistics */ }; =20 static void free_resources(struct mlx5_vdpa_net *ndev); @@ -822,6 +824,12 @@ static u16 get_features_12_3(u64 features) (!!(features & BIT_ULL(VIRTIO_NET_F_GUEST_CSUM)) << 6); } =20 +static bool counters_supported(const struct mlx5_vdpa_dev *mvdev) +{ + return MLX5_CAP_GEN_64(mvdev->mdev, general_obj_types) & + BIT_ULL(MLX5_OBJ_TYPE_VIRTIO_Q_COUNTERS); +} + static int create_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_v= irtqueue *mvq) { int inlen =3D MLX5_ST_SZ_BYTES(create_virtio_net_q_in); @@ -876,6 +884,8 @@ static int create_virtqueue(struct mlx5_vdpa_net *ndev,= struct mlx5_vdpa_virtque MLX5_SET(virtio_q, vq_ctx, umem_3_id, mvq->umem3.id); MLX5_SET(virtio_q, vq_ctx, umem_3_size, mvq->umem3.size); MLX5_SET(virtio_q, vq_ctx, pd, ndev->mvdev.res.pdn); + if (counters_supported(&ndev->mvdev)) + MLX5_SET(virtio_q, vq_ctx, counter_set_id, mvq->counter_set_id); =20 err =3D mlx5_cmd_exec(ndev->mvdev.mdev, in, inlen, out, sizeof(out)); if (err) @@ -1139,6 +1149,47 @@ static int modify_virtqueue(struct mlx5_vdpa_net *nd= ev, struct mlx5_vdpa_virtque return err; } =20 +static int counter_set_alloc(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_= virtqueue *mvq) +{ + u32 in[MLX5_ST_SZ_DW(create_virtio_q_counters_in)] =3D {}; + u32 out[MLX5_ST_SZ_DW(create_virtio_q_counters_out)] =3D {}; + void *cmd_hdr; + int err; + + if (!counters_supported(&ndev->mvdev)) + return 0; + + cmd_hdr =3D MLX5_ADDR_OF(create_virtio_q_counters_in, in, hdr); + + MLX5_SET(general_obj_in_cmd_hdr, cmd_hdr, opcode, MLX5_CMD_OP_CREATE_GENE= RAL_OBJECT); + MLX5_SET(general_obj_in_cmd_hdr, cmd_hdr, obj_type, MLX5_OBJ_TYPE_VIRTIO_= Q_COUNTERS); + MLX5_SET(general_obj_in_cmd_hdr, cmd_hdr, uid, ndev->mvdev.res.uid); + + err =3D mlx5_cmd_exec(ndev->mvdev.mdev, in, sizeof(in), out, sizeof(out)); + if (err) + return err; + + mvq->counter_set_id =3D MLX5_GET(general_obj_out_cmd_hdr, out, obj_id); + + return 0; +} + +static void counter_set_dealloc(struct mlx5_vdpa_net *ndev, struct mlx5_vd= pa_virtqueue *mvq) +{ + u32 in[MLX5_ST_SZ_DW(destroy_virtio_q_counters_in)] =3D {}; + u32 out[MLX5_ST_SZ_DW(destroy_virtio_q_counters_out)] =3D {}; + + if (!counters_supported(&ndev->mvdev)) + return; + + MLX5_SET(destroy_virtio_q_counters_in, in, hdr.opcode, MLX5_CMD_OP_DESTRO= Y_GENERAL_OBJECT); + MLX5_SET(destroy_virtio_q_counters_in, in, hdr.obj_id, mvq->counter_set_i= d); + MLX5_SET(destroy_virtio_q_counters_in, in, hdr.uid, ndev->mvdev.res.uid); + MLX5_SET(destroy_virtio_q_counters_in, in, hdr.obj_type, MLX5_OBJ_TYPE_VI= RTIO_Q_COUNTERS); + if (mlx5_cmd_exec(ndev->mvdev.mdev, in, sizeof(in), out, sizeof(out))) + mlx5_vdpa_warn(&ndev->mvdev, "dealloc counter set 0x%x\n", mvq->counter_= set_id); +} + static int setup_vq(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue= *mvq) { u16 idx =3D mvq->index; @@ -1166,6 +1217,10 @@ static int setup_vq(struct mlx5_vdpa_net *ndev, stru= ct mlx5_vdpa_virtqueue *mvq) if (err) goto err_connect; =20 + err =3D counter_set_alloc(ndev, mvq); + if (err) + goto err_counter; + err =3D create_virtqueue(ndev, mvq); if (err) goto err_connect; @@ -1183,6 +1238,8 @@ static int setup_vq(struct mlx5_vdpa_net *ndev, struc= t mlx5_vdpa_virtqueue *mvq) return 0; =20 err_connect: + counter_set_dealloc(ndev, mvq); +err_counter: qp_destroy(ndev, &mvq->vqqp); err_vqqp: qp_destroy(ndev, &mvq->fwqp); @@ -1227,6 +1284,7 @@ static void teardown_vq(struct mlx5_vdpa_net *ndev, s= truct mlx5_vdpa_virtqueue * =20 suspend_vq(ndev, mvq); destroy_virtqueue(ndev, mvq); + counter_set_dealloc(ndev, mvq); qp_destroy(ndev, &mvq->vqqp); qp_destroy(ndev, &mvq->fwqp); cq_destroy(ndev, mvq->index); @@ -1681,6 +1739,7 @@ static void mlx5_cvq_kick_handler(struct work_struct = *work) if (read !=3D sizeof(ctrl)) break; =20 + cvq->received_desc++; switch (ctrl.class) { case VIRTIO_NET_CTRL_MAC: status =3D handle_ctrl_mac(mvdev, ctrl.cmd); @@ -1704,6 +1763,7 @@ static void mlx5_cvq_kick_handler(struct work_struct = *work) if (vringh_need_notify_iotlb(&cvq->vring)) vringh_notify(&cvq->vring); =20 + cvq->completed_desc++; queue_work(mvdev->wq, &wqent->work); break; } @@ -2323,6 +2383,8 @@ static int mlx5_vdpa_reset(struct vdpa_device *vdev) mlx5_vdpa_destroy_mr(&ndev->mvdev); ndev->mvdev.status =3D 0; ndev->cur_num_vqs =3D 0; + ndev->mvdev.cvq.received_desc =3D 0; + ndev->mvdev.cvq.completed_desc =3D 0; memset(ndev->event_cbs, 0, sizeof(*ndev->event_cbs) * (mvdev->max_vqs + 1= )); ndev->mvdev.actual_features =3D 0; ++mvdev->generation; @@ -2442,6 +2504,98 @@ static u64 mlx5_vdpa_get_driver_features(struct vdpa= _device *vdev) return mvdev->actual_features; } =20 +static int counter_set_query(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_= virtqueue *mvq, + u64 *received_desc, u64 *completed_desc) +{ + u32 in[MLX5_ST_SZ_DW(query_virtio_q_counters_in)] =3D {}; + u32 out[MLX5_ST_SZ_DW(query_virtio_q_counters_out)] =3D {}; + void *cmd_hdr; + void *ctx; + int err; + + if (!counters_supported(&ndev->mvdev)) + return -EOPNOTSUPP; + + if (mvq->fw_state !=3D MLX5_VIRTIO_NET_Q_OBJECT_STATE_RDY) + return -EAGAIN; + + cmd_hdr =3D MLX5_ADDR_OF(query_virtio_q_counters_in, in, hdr); + + MLX5_SET(general_obj_in_cmd_hdr, cmd_hdr, opcode, MLX5_CMD_OP_QUERY_GENER= AL_OBJECT); + MLX5_SET(general_obj_in_cmd_hdr, cmd_hdr, obj_type, MLX5_OBJ_TYPE_VIRTIO_= Q_COUNTERS); + MLX5_SET(general_obj_in_cmd_hdr, cmd_hdr, uid, ndev->mvdev.res.uid); + MLX5_SET(general_obj_in_cmd_hdr, cmd_hdr, obj_id, mvq->counter_set_id); + + err =3D mlx5_cmd_exec(ndev->mvdev.mdev, in, sizeof(in), out, sizeof(out)); + if (err) + return err; + + ctx =3D MLX5_ADDR_OF(query_virtio_q_counters_out, out, counters); + *received_desc =3D MLX5_GET64(virtio_q_counters, ctx, received_desc); + *completed_desc =3D MLX5_GET64(virtio_q_counters, ctx, completed_desc); + return 0; +} + +static int mlx5_vdpa_get_vendor_vq_stats(struct vdpa_device *vdev, u16 idx, + struct sk_buff *msg, + struct netlink_ext_ack *extack) +{ + struct mlx5_vdpa_dev *mvdev =3D to_mvdev(vdev); + struct mlx5_vdpa_net *ndev =3D to_mlx5_vdpa_ndev(mvdev); + struct mlx5_vdpa_virtqueue *mvq; + struct mlx5_control_vq *cvq; + u64 received_desc; + u64 completed_desc; + int err =3D 0; + u16 max_vqp; + + mutex_lock(&ndev->reslock); + if (!is_index_valid(mvdev, idx)) { + NL_SET_ERR_MSG_MOD(extack, "virtqueue index is not valid"); + err =3D -EINVAL; + goto out_err; + } + + if (idx =3D=3D ctrl_vq_idx(mvdev)) { + cvq =3D &mvdev->cvq; + received_desc =3D cvq->received_desc; + completed_desc =3D cvq->completed_desc; + goto out; + } + + mvq =3D &ndev->vqs[idx]; + err =3D counter_set_query(ndev, mvq, &received_desc, &completed_desc); + if (err) { + NL_SET_ERR_MSG_MOD(extack, "failed to query hardware"); + goto out_err; + } + +out: + err =3D -EMSGSIZE; + max_vqp =3D mlx5vdpa16_to_cpu(mvdev, ndev->config.max_virtqueue_pairs); + if (nla_put_u16(msg, VDPA_ATTR_DEV_NET_CFG_MAX_VQP, max_vqp)) + goto out_err; + + if (nla_put_string(msg, VDPA_ATTR_DEV_VENDOR_ATTR_NAME, "received_desc")) + goto out_err; + + if (nla_put_u64_64bit(msg, VDPA_ATTR_DEV_VENDOR_ATTR_VALUE, received_desc, + VDPA_ATTR_PAD)) + goto out_err; + + if (nla_put_string(msg, VDPA_ATTR_DEV_VENDOR_ATTR_NAME, "completed_desc")) + goto out_err; + + if (nla_put_u64_64bit(msg, VDPA_ATTR_DEV_VENDOR_ATTR_VALUE, completed_des= c, + VDPA_ATTR_PAD)) + goto out_err; + + err =3D 0; +out_err: + mutex_unlock(&ndev->reslock); + return err; +} + static const struct vdpa_config_ops mlx5_vdpa_ops =3D { .set_vq_address =3D mlx5_vdpa_set_vq_address, .set_vq_num =3D mlx5_vdpa_set_vq_num, @@ -2451,6 +2605,7 @@ static const struct vdpa_config_ops mlx5_vdpa_ops =3D= { .get_vq_ready =3D mlx5_vdpa_get_vq_ready, .set_vq_state =3D mlx5_vdpa_set_vq_state, .get_vq_state =3D mlx5_vdpa_get_vq_state, + .get_vendor_vq_stats =3D mlx5_vdpa_get_vendor_vq_stats, .get_vq_notification =3D mlx5_get_vq_notification, .get_vq_irq =3D mlx5_get_vq_irq, .get_vq_align =3D mlx5_vdpa_get_vq_align, diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index 49a48d7709ac..1d193d9b6029 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -94,6 +94,7 @@ enum { enum { MLX5_OBJ_TYPE_GENEVE_TLV_OPT =3D 0x000b, MLX5_OBJ_TYPE_VIRTIO_NET_Q =3D 0x000d, + MLX5_OBJ_TYPE_VIRTIO_Q_COUNTERS =3D 0x001c, MLX5_OBJ_TYPE_MATCH_DEFINER =3D 0x0018, MLX5_OBJ_TYPE_MKEY =3D 0xff01, MLX5_OBJ_TYPE_QP =3D 0xff02, diff --git a/include/linux/mlx5/mlx5_ifc_vdpa.h b/include/linux/mlx5/mlx5_i= fc_vdpa.h index 1a9c9d94cb59..4414ed5b6ed2 100644 --- a/include/linux/mlx5/mlx5_ifc_vdpa.h +++ b/include/linux/mlx5/mlx5_ifc_vdpa.h @@ -165,4 +165,43 @@ struct mlx5_ifc_modify_virtio_net_q_out_bits { struct mlx5_ifc_general_obj_out_cmd_hdr_bits general_obj_out_cmd_hdr; }; =20 +struct mlx5_ifc_virtio_q_counters_bits { + u8 modify_field_select[0x40]; + u8 reserved_at_40[0x40]; + u8 received_desc[0x40]; + u8 completed_desc[0x40]; + u8 error_cqes[0x20]; + u8 bad_desc_errors[0x20]; + u8 exceed_max_chain[0x20]; + u8 invalid_buffer[0x20]; + u8 reserved_at_180[0x280]; +}; + +struct mlx5_ifc_create_virtio_q_counters_in_bits { + struct mlx5_ifc_general_obj_in_cmd_hdr_bits hdr; + struct mlx5_ifc_virtio_q_counters_bits virtio_q_counters; +}; + +struct mlx5_ifc_create_virtio_q_counters_out_bits { + struct mlx5_ifc_general_obj_in_cmd_hdr_bits hdr; + struct mlx5_ifc_virtio_q_counters_bits virtio_q_counters; +}; + +struct mlx5_ifc_destroy_virtio_q_counters_in_bits { + struct mlx5_ifc_general_obj_in_cmd_hdr_bits hdr; +}; + +struct mlx5_ifc_destroy_virtio_q_counters_out_bits { + struct mlx5_ifc_general_obj_out_cmd_hdr_bits hdr; +}; + +struct mlx5_ifc_query_virtio_q_counters_in_bits { + struct mlx5_ifc_general_obj_in_cmd_hdr_bits hdr; +}; + +struct mlx5_ifc_query_virtio_q_counters_out_bits { + struct mlx5_ifc_general_obj_in_cmd_hdr_bits hdr; + struct mlx5_ifc_virtio_q_counters_bits counters; +}; + #endif /* __MLX5_IFC_VDPA_H_ */ --=20 2.35.1