From nobody Sat Apr 18 12:36:49 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 3FACFC433EF for ; Thu, 14 Jul 2022 11:38:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239005AbiGNLiZ (ORCPT ); Thu, 14 Jul 2022 07:38:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbiGNLiX (ORCPT ); Thu, 14 Jul 2022 07:38:23 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2042.outbound.protection.outlook.com [40.107.94.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 273EB5B04A for ; Thu, 14 Jul 2022 04:38:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TlfjDDdmGzcswPtFqiNVMCkHEahIjED9jBg4BuWo7/PdxHQ/EwEc4ArsBrYY82sIbuCQE5W3i4erZQCmyj/fDDixZvxATITLJonwxK2UZaOE6ShVJquNo+5o47CdPs7Dv6hA2f7NzrTUPsuXmWJfYzfqXcPngTviu+XEcaXzYx2QbPSEvdgTMpSLwFCUSKcva3YalskDSiFmmr/Pfvhvzv0oE9PL+ZPcojJA69s3oPKR3x85RQrP2LgNFxAtand2mQrvJnsG3NX11bta8xlv16Up9ZHPut7jU/5R1O+Ia56uNc1x5KaDeLUE5Cu97M4Vjz456VefakXmhX6W08mwcw== 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=Bo/fueSfex7i2u/z5nflWqJD11bsY91JZasHE5xKXxY=; b=Xir5aZD0SRZvv+BOQzUbH+V1kgEFYu9W/W/H2704BF9mJ47o6IiAPSH0DHiZcqvfrq5fXncs6QTyRf98pRgclhOHHFz3YjWKSGcbtYb025nl42SneGDe8/B3lWRe/cA9vjN/T0bmyd8RVGsImIgW13SF7kqDynsrpg7wd1FI3ybPmWyzR0N0AwwjNEZkRNdXuKsE4R7dRsey2uQDE35soT8H8CnHq46fhKiAEZPo9/5n+OvBIReGnv+dN8NYygCHLb+gk5fCTdO1sNP49EpUyULIDk4VeNmjY+mCbghUSkHeW4QlxpMwkWuhxQdImmeYVmplfZJNsHNzyolqILUE3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=lists.linux-foundation.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=Bo/fueSfex7i2u/z5nflWqJD11bsY91JZasHE5xKXxY=; b=UyFijco87ljKbxubsnBF1reH/BrLL0wnlKbxPPzSvf7a3A1+DAiiWYGVkCkT0OGDp6fCA/U8bVFsJv26AMFeizqPkYERgjHyDEMGLarvobTm18ji1w/zTW1kQeDv1iQXPxgjzfS2r7zmx2beqfwThKXeRs9PCFAK8/f6Thb78VQw+ssBwYNqlupw1o3sWiOioPziEHQa3R3Pf/S/0EeAwnUJTHjdxa/SdIRnf1NzajHuLoGEwSFWS26NSTr+jRgeQOQqNwCiflVSKEUXgncvLPepjmE1yCxK01eiU8XA9VUuxHgw+dozRpLjqEJoO7nzEniIe67Hu4u3pPsROwYMAQ== Received: from BN9PR03CA0195.namprd03.prod.outlook.com (2603:10b6:408:f9::20) by DM5PR1201MB0155.namprd12.prod.outlook.com (2603:10b6:4:55::20) 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 11:38:20 +0000 Received: from BN8NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f9:cafe::81) by BN9PR03CA0195.outlook.office365.com (2603:10b6:408:f9::20) 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 11:38:20 +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; pr=C Received: from mail.nvidia.com (12.22.5.235) by BN8NAM11FT014.mail.protection.outlook.com (10.13.177.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 11:38:19 +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, 14 Jul 2022 11:38:15 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) 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.26; Thu, 14 Jul 2022 04:38:14 -0700 Received: from vdi.nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.986.26 via Frontend Transport; Thu, 14 Jul 2022 04:38:12 -0700 From: Eli Cohen To: , , , CC: , , , Eli Cohen Subject: [PATCH 1/2] vdpa/mlx5: Implement susupend virtqueue callback Date: Thu, 14 Jul 2022 14:38:06 +0300 Message-ID: <20220714113807.85665-2-elic@nvidia.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220714113807.85665-1-elic@nvidia.com> References: <20220714113807.85665-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: b4caf4c8-0af4-47c1-1390-08da658d59cd X-MS-TrafficTypeDiagnostic: DM5PR1201MB0155:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 93AHdnfHvp4Pl7dYV7CilquXtwekXMp2t85TOhWSYRHGD6lH4Gkt720Ph9YqbL1gNoZ9cew6YQkwTt06laPMip8XtITpKtEyngaEzFf6UQ6Rmvie2Ybh5GyZEpxEvUAk5xHHtm3Sor3vVBhjh8WgC4m84/pF5y/lG+kAf0KMv5hqbgujbBAF4s00HGfQjj3itdLzLijgPbqRXBXccFek1ehyPbHuRU+47NKjErGlnEOuhT03Qpf+qN7LX5Kr1G0zP6Iba2z6+/o5v1Za56P4cLV8rZMYFK1yk6hTlGO2AW8Sk8ZomUNC4rQ8qhmlDXKVAr0fHiolJp6y2yWSw8IgxQBcJ1aVug8cIOh7yfFjErlfROQY+O4L9zEzvdSFQyhMHZbhGhcTIdWHXVvA5p77Pq0nlYu2C4CHXjx4XDwjwp/8MYYDoREvOGUcK0GfMRhqdu2ujSeiWYcRQtH5u3NMEggwm9DGPG6wIa4gk9l73Mzgy1X7Sf3jZ7K+SvszJGQOGyTC6SgYi60enjTyUpdoQOJ3FKDlWbbScxF9jIyGI7xLz92FJjK6xZNYJsLzZQpbm80RzQ5C5Yrb2uY+eSqlwy+R9gs0hgLIOvpmOMpsOygxcVUHGjIhzsq8GIiY7Xy87miv19uU8oXSZetnve3/RumrPRUogYG85moHP2pSxrsXce/xvuOfjBQ4iyQmlOvZOuVRRY9KdE0uxDEZt5RmkTUI/kzrY4TnYOVv4Ckib8ys/s6uY2lBuPUK3EAGKZpUOg2cUnCGeHLOAcS/l0Zw1XjrE4yfMA16oLpkW+WGZTUkohTbFTIdzL93eOf/a2ebLlm9mM0RKxOXgaEUPr/3sw9QPghSJef1g9MEPgVDv8k= 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:(13230016)(4636009)(396003)(39860400002)(346002)(136003)(376002)(36840700001)(40470700004)(46966006)(336012)(82740400003)(8676002)(316002)(70586007)(107886003)(186003)(2616005)(26005)(7696005)(40460700003)(70206006)(8936002)(110136005)(478600001)(1076003)(5660300002)(81166007)(82310400005)(41300700001)(86362001)(6666004)(4326008)(54906003)(356005)(2906002)(47076005)(426003)(40480700001)(83380400001)(36860700001)(36756003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2022 11:38:19.5878 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b4caf4c8-0af4-47c1-1390-08da658d59cd 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: BN8NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0155 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Implement the suspend callback allowing to suspend the virtqueues so they stop processing descriptors. This is required to allow to query a consistent state of the virtqueue while live migration is taking place. Signed-off-by: Eli Cohen --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 83 ++++++++++++++++++++++++++++-- include/linux/mlx5/mlx5_ifc_vdpa.h | 8 +++ 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5= _vnet.c index e85c1d71f4ed..d0fff559ca15 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -164,6 +164,7 @@ struct mlx5_vdpa_net { bool setup; u32 cur_num_vqs; u32 rqt_size; + bool nb_registered; struct notifier_block nb; struct vdpa_callback config_cb; struct mlx5_vdpa_wq_ent cvq_ent; @@ -895,6 +896,7 @@ static int create_virtqueue(struct mlx5_vdpa_net *ndev,= struct mlx5_vdpa_virtque if (err) goto err_cmd; =20 + mvq->fw_state =3D MLX5_VIRTIO_NET_Q_OBJECT_STATE_INIT; kfree(in); mvq->virtq_id =3D MLX5_GET(general_obj_out_cmd_hdr, out, obj_id); =20 @@ -922,6 +924,7 @@ static void destroy_virtqueue(struct mlx5_vdpa_net *nde= v, struct mlx5_vdpa_virtq mlx5_vdpa_warn(&ndev->mvdev, "destroy virtqueue 0x%x\n", mvq->virtq_id); return; } + mvq->fw_state =3D MLX5_VIRTIO_NET_Q_OBJECT_NONE; umems_destroy(ndev, mvq); } =20 @@ -1121,6 +1124,20 @@ static int query_virtqueue(struct mlx5_vdpa_net *nde= v, struct mlx5_vdpa_virtqueu return err; } =20 +static bool is_valid_state_change(int oldstate, int newstate) +{ + switch (oldstate) { + case MLX5_VIRTIO_NET_Q_OBJECT_STATE_INIT: + return newstate =3D=3D MLX5_VIRTIO_NET_Q_OBJECT_STATE_RDY; + case MLX5_VIRTIO_NET_Q_OBJECT_STATE_RDY: + return newstate =3D=3D MLX5_VIRTIO_NET_Q_OBJECT_STATE_SUSPEND; + case MLX5_VIRTIO_NET_Q_OBJECT_STATE_SUSPEND: + case MLX5_VIRTIO_NET_Q_OBJECT_STATE_ERR: + default: + return false; + } +} + static int modify_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_v= irtqueue *mvq, int state) { int inlen =3D MLX5_ST_SZ_BYTES(modify_virtio_net_q_in); @@ -1130,6 +1147,12 @@ static int modify_virtqueue(struct mlx5_vdpa_net *nd= ev, struct mlx5_vdpa_virtque void *in; int err; =20 + if (mvq->fw_state =3D=3D MLX5_VIRTIO_NET_Q_OBJECT_NONE) + return 0; + + if (!is_valid_state_change(mvq->fw_state, state)) + return -EINVAL; + in =3D kzalloc(inlen, GFP_KERNEL); if (!in) return -ENOMEM; @@ -1992,6 +2015,7 @@ static void mlx5_vdpa_set_vq_ready(struct vdpa_device= *vdev, u16 idx, bool ready 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; + int err; =20 if (!mvdev->actual_features) return; @@ -2005,8 +2029,16 @@ static void mlx5_vdpa_set_vq_ready(struct vdpa_devic= e *vdev, u16 idx, bool ready } =20 mvq =3D &ndev->vqs[idx]; - if (!ready) + if (!ready) { suspend_vq(ndev, mvq); + } else { + err =3D modify_virtqueue(ndev, mvq, MLX5_VIRTIO_NET_Q_OBJECT_STATE_RDY); + if (err) { + mlx5_vdpa_warn(mvdev, "modify VQ %d to ready failed (%d)\n", idx, err); + ready =3D false; + } + } + =20 mvq->ready =3D ready; } @@ -2733,6 +2765,37 @@ static int mlx5_vdpa_get_vendor_vq_stats(struct vdpa= _device *vdev, u16 idx, return err; } =20 +static void mlx5_vdpa_cvq_suspend(struct mlx5_vdpa_dev *mvdev) +{ + struct mlx5_control_vq *cvq; + + if (!(mvdev->actual_features & BIT_ULL(VIRTIO_NET_F_CTRL_VQ))) + return; + + cvq =3D &mvdev->cvq; + cvq->ready =3D false; +} + +static int mlx5_vdpa_suspend(struct vdpa_device *vdev) +{ + 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; + int i; + + down_write(&ndev->reslock); + mlx5_notifier_unregister(mvdev->mdev, &ndev->nb); + ndev->nb_registered =3D false; + flush_workqueue(ndev->mvdev.wq); + for (i =3D 0; i < ndev->cur_num_vqs; i++) { + mvq =3D &ndev->vqs[i]; + suspend_vq(ndev, mvq); + } + mlx5_vdpa_cvq_suspend(mvdev); + up_write(&ndev->reslock); + return 0; +} + 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, @@ -2763,6 +2826,7 @@ static const struct vdpa_config_ops mlx5_vdpa_ops =3D= { .get_generation =3D mlx5_vdpa_get_generation, .set_map =3D mlx5_vdpa_set_map, .free =3D mlx5_vdpa_free, + .suspend =3D mlx5_vdpa_suspend, }; =20 static int query_mtu(struct mlx5_core_dev *mdev, u16 *mtu) @@ -2828,6 +2892,7 @@ static void init_mvqs(struct mlx5_vdpa_net *ndev) mvq->index =3D i; mvq->ndev =3D ndev; mvq->fwqp.fw =3D true; + mvq->fw_state =3D MLX5_VIRTIO_NET_Q_OBJECT_NONE; } for (; i < ndev->mvdev.max_vqs; i++) { mvq =3D &ndev->vqs[i]; @@ -2902,13 +2967,21 @@ static int event_handler(struct notifier_block *nb,= unsigned long event, void *p switch (eqe->sub_type) { case MLX5_PORT_CHANGE_SUBTYPE_DOWN: case MLX5_PORT_CHANGE_SUBTYPE_ACTIVE: + down_read(&ndev->reslock); + if (!ndev->nb_registered) { + up_read(&ndev->reslock); + return NOTIFY_DONE; + } wqent =3D kzalloc(sizeof(*wqent), GFP_ATOMIC); - if (!wqent) + if (!wqent) { + up_read(&ndev->reslock); return NOTIFY_DONE; + } =20 wqent->mvdev =3D &ndev->mvdev; INIT_WORK(&wqent->work, update_carrier); queue_work(ndev->mvdev.wq, &wqent->work); + up_read(&ndev->reslock); ret =3D NOTIFY_OK; break; default: @@ -3062,6 +3135,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_= mdev, const char *name, =20 ndev->nb.notifier_call =3D event_handler; mlx5_notifier_register(mdev, &ndev->nb); + ndev->nb_registered =3D true; mvdev->vdev.mdev =3D &mgtdev->mgtdev; err =3D _vdpa_register_device(&mvdev->vdev, max_vqs + 1); if (err) @@ -3093,7 +3167,10 @@ static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *= v_mdev, struct vdpa_device * struct mlx5_vdpa_net *ndev =3D to_mlx5_vdpa_ndev(mvdev); struct workqueue_struct *wq; =20 - mlx5_notifier_unregister(mvdev->mdev, &ndev->nb); + if (ndev->nb_registered) { + mlx5_notifier_unregister(mvdev->mdev, &ndev->nb); + ndev->nb_registered =3D false; + } wq =3D mvdev->wq; mvdev->wq =3D NULL; destroy_workqueue(wq); diff --git a/include/linux/mlx5/mlx5_ifc_vdpa.h b/include/linux/mlx5/mlx5_i= fc_vdpa.h index 4414ed5b6ed2..9becdc3fa503 100644 --- a/include/linux/mlx5/mlx5_ifc_vdpa.h +++ b/include/linux/mlx5/mlx5_ifc_vdpa.h @@ -150,6 +150,14 @@ enum { MLX5_VIRTIO_NET_Q_OBJECT_STATE_ERR =3D 0x3, }; =20 +/* This indicates that the object was not created or has already + * been desroyed. It is very safe to assume that this object will never + * have so many states + */ +enum { + MLX5_VIRTIO_NET_Q_OBJECT_NONE =3D 0xffffffff +}; + enum { MLX5_RQTC_LIST_Q_TYPE_RQ =3D 0x0, MLX5_RQTC_LIST_Q_TYPE_VIRTIO_NET_Q =3D 0x1, --=20 2.35.1 From nobody Sat Apr 18 12:36:49 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 8DF9BC433EF for ; Thu, 14 Jul 2022 11:38:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239024AbiGNLi1 (ORCPT ); Thu, 14 Jul 2022 07:38:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229551AbiGNLiY (ORCPT ); Thu, 14 Jul 2022 07:38:24 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2055.outbound.protection.outlook.com [40.107.243.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3B3D5B045 for ; Thu, 14 Jul 2022 04:38:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kB2WpT5T0rU0D0Td4/b8XxpHdPQ+wZi1UMxDlN0bGKnGu//2aj6wdQqdNQMy785l7MdpOmIa3fZ43FssCyljLXh3g1bAwBe7aGtEbD6FuJTOoouoSQcrZukunZsmFTWPTWNEl7AgCJQA+SQH08xTJvOG2DwcODweRYgdkU/7+pXPecHWq9nEXnAjb2z2lRoGIBjlhe4jhf3W3G5OmdGGdWQYLuq0/cpDMPVK1EpaaWezNYOOyJznvL1Fvq/WgCimowPdMhbu3c7aRNek7XEcjDed4LUO/3NZ4Qa9nll3j4vdM+irGGLwgxNiVt2KQghxIWYGpaej9c8Ipcf5ubd28Q== 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=5oFO1rNzknZZToXxXUnl8+S7wkT2qbMZF/sY+eavt+w=; b=IBX5PcNV0y9TZd1j9WJbFd1/I04rjPsyXTXq8cWOt/Og82h+6B/DWMqETRhP5z8WA+wXTBtMR2B9ETgUr9dSFZ6rTXwjGtyfDubv///uteg/o0j4H/u0Hiz8Wnf0ayJF5Dd5NdblzZDlCpjRA22+9maUJRjtKxpDaRC7wHiJaxz15SUd1DzFXIL0L8AwolR0KgW6hsMRjJPNCZ0SzjXwC6pWE2nNpWR9hQWswEr09/uMgGcuUpkKc6pyuH4isJviRvqERNbiXYRCar2QjSbhe8YogsZEoz9NnjYogbYUxvgPbfIgvJNdlpGoXTM/nw6T1tGGScrlGWPJFwYGNCae/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) smtp.rcpttodomain=lists.linux-foundation.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=5oFO1rNzknZZToXxXUnl8+S7wkT2qbMZF/sY+eavt+w=; b=sXQJW1ZzKeL7ATCZmF2N3cx5+F29V5kqDnWQq1uvnUKhLyuwj21nEkGttHSuymxyatnTIcT1N94iBtGx+ZLE3RrCqDtLGxi8VIrevbsRnGbNf+wD49OuIEQkfjiY1lAKPKDcO9CUXQ3heupM0CB/ReReq8VH6uV98LC3URf6b7+sh6mpIuuFcW5vHrrCPKy4DvTojMbkG6O84qSrtjL4hRnjx/VNyB06wX1LMSTpSqwjeRSb7hnovl9ncHT4X/y2vb6Z1Bo0sFJ5LXdA+R8MnoOF9dSwoFxNLuIjnzYPB1wew+us6RjIRD1UcIvc89NfpnLtOkfZaJ+Zthd/UA70Eg== Received: from BN0PR08CA0004.namprd08.prod.outlook.com (2603:10b6:408:142::22) by CY4PR1201MB0087.namprd12.prod.outlook.com (2603:10b6:910:1b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.25; Thu, 14 Jul 2022 11:38:20 +0000 Received: from BN8NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:408:142:cafe::3a) by BN0PR08CA0004.outlook.office365.com (2603:10b6:408:142::22) 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 11:38:20 +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; pr=C Received: from mail.nvidia.com (12.22.5.238) by BN8NAM11FT050.mail.protection.outlook.com (10.13.177.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5438.12 via Frontend Transport; Thu, 14 Jul 2022 11:38:19 +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, 14 Jul 2022 11:38:18 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) 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.26; Thu, 14 Jul 2022 04:38:17 -0700 Received: from vdi.nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.986.26 via Frontend Transport; Thu, 14 Jul 2022 04:38:15 -0700 From: Eli Cohen To: , , , CC: , , , Eli Cohen Subject: [PATCH 2/2] vdpa/mlx5: Support different address spaces for control and data Date: Thu, 14 Jul 2022 14:38:07 +0300 Message-ID: <20220714113807.85665-3-elic@nvidia.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220714113807.85665-1-elic@nvidia.com> References: <20220714113807.85665-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: 5163350b-07fa-4de8-5dd9-08da658d59ac X-MS-TrafficTypeDiagnostic: CY4PR1201MB0087:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OGymn/Od8xBSvJ1gscKSiLGauSgB1maL3M2trawiFzx5MMRI5aFJ3hHM52EQRQd7NANsKA6yN8dh/QQR8p97Zout4B+wD6/QymIfX+BXxs5jiMtINJ/Ga71bmmh3NupgSxFyrX9b+2d+nOfj2xRS806Ldjfxv/rAjbqgJf6qwBlxdZbBtuCHLap6EuaW9gfPdATu593CcfUdcr6hVeMVpzO3QtjRTiUPZi6CtbrVOkHhhdlVDNRXUJEc0NdD+uPFaEB8pcr3r2MHLhB+MkP1w6LiGyTCYibgbdLrIAdgsbsYfJvo2dm9c9HX0uAuSf4F30UPasJLO2M6sXcEwgcdLjm6fZKhKaOYVGJ0QUKdiXfB8WdtiR8eS08N2a71Qw0uJv490yT8kVhsZ8CoD8A6ZkV9cer+i8MsNxxujn1m8MWLulOZyWvxJLrZVzCrRgPrYy42c25F5PnOEV3mZElB/k3CDDcCZ47U2b+5Ub6BjUIXfdpZzsp4c17MZKNXHD53g+r3BJx+VRWrlfr8vJLBuAB9Fn/JokNfwbLuhZnnBnfwsInOUubYyzCw959iu+AkKLTnti50L4yB4OaVP54YblH+q2aRw8Ut/u+PSV4sQ6vWCMHJ+qMgYjcFOgaoDh6chgoIEuQaYD7uAmlT4tagdl7BOg1k1/psVqvgW3G8Xc1c3GaEpzry8mpprM9DxWlB6tTzBb1xLwNMgBOiB2N9a/Z1EW4fo9nSBLc/NyiaMaLMiairuxFHpfwx70ZMcHrCFpxL0mq0YQFCXh8wMdqErfhp0w/gPttcf1LmLEbkhE5EFw6IkX0Ctl/hzf8cRHiW6SVMp0L6HG97evMzkNblVowLJ2Zb4/RpaPuafgRtt9Y= 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:(13230016)(4636009)(396003)(376002)(136003)(346002)(39860400002)(46966006)(36840700001)(40470700004)(26005)(70206006)(47076005)(7696005)(336012)(8676002)(70586007)(107886003)(186003)(4326008)(426003)(1076003)(82310400005)(2616005)(316002)(41300700001)(86362001)(356005)(81166007)(2906002)(110136005)(478600001)(40480700001)(54906003)(6666004)(83380400001)(82740400003)(36860700001)(36756003)(5660300002)(8936002)(40460700003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2022 11:38:19.3734 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5163350b-07fa-4de8-5dd9-08da658d59ac 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: BN8NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0087 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Partition virtqueues to two different address spaces: one for control virtqueue which is implemented in software, and one for data virtqueues. Based-on: <20220526124338.36247-1-eperezma@redhat.com> Signed-off-by: Eli Cohen --- drivers/vdpa/mlx5/core/mlx5_vdpa.h | 11 ++++ drivers/vdpa/mlx5/net/mlx5_vnet.c | 88 ++++++++++++++++++++++++++---- 2 files changed, 88 insertions(+), 11 deletions(-) diff --git a/drivers/vdpa/mlx5/core/mlx5_vdpa.h b/drivers/vdpa/mlx5/core/ml= x5_vdpa.h index 44104093163b..6af9fdbb86b7 100644 --- a/drivers/vdpa/mlx5/core/mlx5_vdpa.h +++ b/drivers/vdpa/mlx5/core/mlx5_vdpa.h @@ -70,6 +70,16 @@ struct mlx5_vdpa_wq_ent { struct mlx5_vdpa_dev *mvdev; }; =20 +enum { + MLX5_VDPA_DATAVQ_GROUP, + MLX5_VDPA_CVQ_GROUP, + MLX5_VDPA_NUMVQ_GROUPS +}; + +enum { + MLX5_VDPA_NUM_AS =3D MLX5_VDPA_NUMVQ_GROUPS +}; + struct mlx5_vdpa_dev { struct vdpa_device vdev; struct mlx5_core_dev *mdev; @@ -85,6 +95,7 @@ struct mlx5_vdpa_dev { struct mlx5_vdpa_mr mr; struct mlx5_control_vq cvq; struct workqueue_struct *wq; + unsigned int group2asid[MLX5_VDPA_NUMVQ_GROUPS]; }; =20 int mlx5_vdpa_alloc_pd(struct mlx5_vdpa_dev *dev, u32 *pdn, u16 uid); diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5= _vnet.c index d0fff559ca15..834023e8e073 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -2127,9 +2127,14 @@ static u32 mlx5_vdpa_get_vq_align(struct vdpa_device= *vdev) return PAGE_SIZE; } =20 -static u32 mlx5_vdpa_get_vq_group(struct vdpa_device *vdpa, u16 idx) +static u32 mlx5_vdpa_get_vq_group(struct vdpa_device *vdev, u16 idx) { - return 0; + struct mlx5_vdpa_dev *mvdev =3D to_mvdev(vdev); + + if (is_ctrl_vq_idx(mvdev, idx)) + return MLX5_VDPA_CVQ_GROUP; + + return MLX5_VDPA_DATAVQ_GROUP; } =20 enum { MLX5_VIRTIO_NET_F_GUEST_CSUM =3D 1 << 9, @@ -2543,6 +2548,15 @@ static void mlx5_vdpa_set_status(struct vdpa_device = *vdev, u8 status) up_write(&ndev->reslock); } =20 +static void init_group_to_asid_map(struct mlx5_vdpa_dev *mvdev) +{ + int i; + + /* default mapping all groups are mapped to asid 0 */ + for (i =3D 0; i < MLX5_VDPA_NUMVQ_GROUPS; i++) + mvdev->group2asid[i] =3D 0; +} + static int mlx5_vdpa_reset(struct vdpa_device *vdev) { struct mlx5_vdpa_dev *mvdev =3D to_mvdev(vdev); @@ -2561,7 +2575,9 @@ static int mlx5_vdpa_reset(struct vdpa_device *vdev) 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; + init_group_to_asid_map(mvdev); ++mvdev->generation; + if (MLX5_CAP_GEN(mvdev->mdev, umem_uid_0)) { if (mlx5_vdpa_create_mr(mvdev, NULL)) mlx5_vdpa_warn(mvdev, "create MR failed\n"); @@ -2599,26 +2615,63 @@ static u32 mlx5_vdpa_get_generation(struct vdpa_dev= ice *vdev) return mvdev->generation; } =20 -static int mlx5_vdpa_set_map(struct vdpa_device *vdev, unsigned int asid, - struct vhost_iotlb *iotlb) +static int set_map_control(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb= *iotlb) +{ + u64 start =3D 0ULL, last =3D 0ULL - 1; + struct vhost_iotlb_map *map; + int err =3D 0; + + spin_lock(&mvdev->cvq.iommu_lock); + vhost_iotlb_reset(mvdev->cvq.iotlb); + + for (map =3D vhost_iotlb_itree_first(iotlb, start, last); map; + map =3D vhost_iotlb_itree_next(map, start, last)) { + err =3D vhost_iotlb_add_range(mvdev->cvq.iotlb, map->start, + map->last, map->addr, map->perm); + if (err) + goto out; + } + +out: + spin_unlock(&mvdev->cvq.iommu_lock); + return err; +} + +static int set_map_data(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb *i= otlb) { - struct mlx5_vdpa_dev *mvdev =3D to_mvdev(vdev); - struct mlx5_vdpa_net *ndev =3D to_mlx5_vdpa_ndev(mvdev); bool change_map; int err; =20 - down_write(&ndev->reslock); - err =3D mlx5_vdpa_handle_set_map(mvdev, iotlb, &change_map); if (err) { mlx5_vdpa_warn(mvdev, "set map failed(%d)\n", err); - goto err; + return err; } =20 if (change_map) err =3D mlx5_vdpa_change_map(mvdev, iotlb); =20 -err: + return err; +} + +static int mlx5_vdpa_set_map(struct vdpa_device *vdev, unsigned int asid, + struct vhost_iotlb *iotlb) +{ + struct mlx5_vdpa_dev *mvdev =3D to_mvdev(vdev); + struct mlx5_vdpa_net *ndev =3D to_mlx5_vdpa_ndev(mvdev); + int err; + + down_write(&ndev->reslock); + if (mvdev->group2asid[MLX5_VDPA_DATAVQ_GROUP] =3D=3D asid) { + err =3D set_map_data(mvdev, iotlb); + if (err) + goto out; + } + + if (mvdev->group2asid[MLX5_VDPA_CVQ_GROUP] =3D=3D asid) + err =3D set_map_control(mvdev, iotlb); + +out: up_write(&ndev->reslock); return err; } @@ -2796,6 +2849,18 @@ static int mlx5_vdpa_suspend(struct vdpa_device *vde= v) return 0; } =20 +static int mlx5_set_group_asid(struct vdpa_device *vdev, u32 group, + unsigned int asid) +{ + struct mlx5_vdpa_dev *mvdev =3D to_mvdev(vdev); + + if (group >=3D MLX5_VDPA_NUMVQ_GROUPS) + return -EINVAL; + + mvdev->group2asid[group] =3D asid; + return 0; +} + 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, @@ -2825,6 +2890,7 @@ static const struct vdpa_config_ops mlx5_vdpa_ops =3D= { .set_config =3D mlx5_vdpa_set_config, .get_generation =3D mlx5_vdpa_get_generation, .set_map =3D mlx5_vdpa_set_map, + .set_group_asid =3D mlx5_set_group_asid, .free =3D mlx5_vdpa_free, .suspend =3D mlx5_vdpa_suspend, }; @@ -3055,7 +3121,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_= mdev, const char *name, } =20 ndev =3D vdpa_alloc_device(struct mlx5_vdpa_net, mvdev.vdev, mdev->device= , &mlx5_vdpa_ops, - 1, 1, name, false); + MLX5_VDPA_NUMVQ_GROUPS, MLX5_VDPA_NUM_AS, name, false); if (IS_ERR(ndev)) return PTR_ERR(ndev); =20 --=20 2.35.1