From nobody Mon Apr 27 06:01:42 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 2DAF0C433EF for ; Thu, 16 Jun 2022 13:27:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377005AbiFPN1r (ORCPT ); Thu, 16 Jun 2022 09:27:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376850AbiFPN1j (ORCPT ); Thu, 16 Jun 2022 09:27:39 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2082.outbound.protection.outlook.com [40.107.237.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E3F71055D for ; Thu, 16 Jun 2022 06:27:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HVOcuCtYX4d3vWL0Qa5ca4e/hO+vgARV6DiWgf/TVpV1hq9rKH/Sh5MffejAUCa69wDWH5dtECT430JWOvGqDuwMhryLIOI97MXKIRB1qtEK9pGp+mmRGoegWsP8XAczMmsuRcDQfG2ZksnY13sLhYRj1BiW6BiPri/nk08HZIn5GARaRJrQcf4Umf8Q83yogXKoo+hSxVNVynS2GVQ8IQ4gWvo1C+KI90M3zZ426LIUa5C4lFOagPu5rwPNks8wzM4e4ygZxtRD+20umUN4C1QpCMSdcLedbSelDUZ36+O8hC9KNFlenLr1KdjLz4D1x3RTxEUOxzJthJo5QOAyPw== 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=G1TNaiYlGz6BOATzCfzpp76zcvcQbVRq3YMZbzx1OS0=; b=ONmbyiMg3fkr/GyzudjnGaYpgfL/6eqyaBUa1e30BVdykcvnoABRA7FGbnl5BftrZ0r/1IZBOdPnw6a3fLXagUtPhomCAinyi3UTrj/HyTTFuK2leQbf1IQ/nYh7mO9C1NNVuTZTugh3uCkPv0IcxX6Z4MGxV1dTi4pMrKiqjslF6t6iMDGKruTEPa1Zd4G5JZ085li92d3XK8sPfL5dphACwQlzMqGWQ2qVSK5jBs1pyI2KKyO49TuFQHdl2QUARAjb5wTEGFlguZll10ZmCfxf4P7qjNZ4vNpPz0LFp4Gtw412AOuWbfp7ZWbomD7n6Cjkf7Sd6mPTWRqKqo6jWg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) 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=G1TNaiYlGz6BOATzCfzpp76zcvcQbVRq3YMZbzx1OS0=; b=OxdX1/xpf0BxRg1Imol0U4ld+XA5eSGrZsCUS9RKXW+BTkaMj2k+XLMbXBI72xrwzOwcJgH0yhDwbC7kSesF483iHJv3a+G8ihcr22b5gyeEWp0j8ocEIP4dzxY8C59WW7nS/t8QA3vbCR7slfSg1gDiPhSa3ZByJvt1I2aRB2Sv/9R4HUQZyyqfAW/HatWu4chvolOEDqumpRkG6TdMMAAQLi9tx8iHbn4CXJkVwxSfEhuMEAj06ghOu5vZLJw8UoSQ/S4xnf8hC4TyY8z5XBJLUJ6/2sc+9IrE6VaaL1MUYQHyh1wnHKgN0mzvEkOggsWjAOiqdumHTnwMnTMuYA== Received: from MWHPR12CA0052.namprd12.prod.outlook.com (2603:10b6:300:103::14) by BL1PR12MB5047.namprd12.prod.outlook.com (2603:10b6:208:31a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13; Thu, 16 Jun 2022 13:27:35 +0000 Received: from CO1NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:300:103:cafe::7c) by MWHPR12CA0052.outlook.office365.com (2603:10b6:300:103::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14 via Frontend Transport; Thu, 16 Jun 2022 13:27:35 +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 CO1NAM11FT003.mail.protection.outlook.com (10.13.175.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Thu, 16 Jun 2022 13:27:34 +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; Thu, 16 Jun 2022 13:27:34 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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.22; Thu, 16 Jun 2022 06:27:33 -0700 Received: from vdi.nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server id 15.2.986.22 via Frontend Transport; Thu, 16 Jun 2022 06:27:31 -0700 From: Eli Cohen To: , , , CC: , , , Eli Cohen Subject: [PATCH RFC 1/3] vdpa/mlx5: Implement susupend virtqueue callback Date: Thu, 16 Jun 2022 16:27:23 +0300 Message-ID: <20220616132725.50599-2-elic@nvidia.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220616132725.50599-1-elic@nvidia.com> References: <20220616132725.50599-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: 9cd4b356-0112-4cd8-3599-08da4f9bf962 X-MS-TrafficTypeDiagnostic: BL1PR12MB5047: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: b13mvtWNB839LkNVeFDSAkz+hrsMMZ4gp28X6qXtQ+BuHwf7sLBYRFifN6oPyBujP2klomFN4Q5yRPYH6DkRwxMZClbS5fnrHoNGIJe/SjPMFHPx68XAz48Olkg7vcORrmnBXaY3A7TQMn9kHQH090Eh7I+TaTFA7KLsh1aTD9Ue2giMYZcJRzg3AOUGbJBXkSvSQGysd2AQrpKLPSy0VprjDCAuir+Z8VbVAC1dhGvqHIewcLP5qmw7NQWgtZCFMcxyiEI7FEagRpOoJRW3aTV55HbqnkD91YI4Oh0Hwf3waKtmzJHuKSnAdFOAe3rb4hinEW/JlgpsSqV1UbSugSI8KF0HPtHjXLcpB6GbVVgAVUaJqNWKh1jwkzD7g6UIwvRlqUtQ3g6594fvmb80CwGsY9PYn7bInhBxdv/K/r3Eo5MEQxCA7sd46IFMBE7nu43ASl6JbW0xrl9crzGg3AKzI+wmC+q0cOD3Y9BODbjpykqaZ0CXVg9eeZ3nQMm7R1i+Iyf7FbvLglxIlnfc649oC70vAWBecZP+q7mfK3noSzKiMOxgakrxt6oBH5rb479ZtJgaleZ2AAyWmdOn1VQCi+ML6fCO3jYVREStRVC9wH2EOhsjtSzKyv6Sch3IhgmphUiDQA+ccP8d/xcOiT7WZA7xCtRcJ1vvsLg6ir2jkhkwwqK4UtReuz06H3ePm3F9TbUpqZufwgt3RMZBAQ== 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)(36840700001)(40470700004)(46966006)(8676002)(81166007)(36860700001)(83380400001)(4326008)(40460700003)(26005)(70586007)(82310400005)(86362001)(5660300002)(70206006)(186003)(508600001)(7696005)(110136005)(47076005)(336012)(356005)(426003)(2616005)(1076003)(2906002)(36756003)(316002)(6666004)(107886003)(54906003)(8936002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2022 13:27:34.7740 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9cd4b356-0112-4cd8-3599-08da4f9bf962 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: CO1NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5047 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 the shadow virtqueue to kick in. Signed-off-by: Eli Cohen --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 68 +++++++++++++++++++++++++++++- include/linux/mlx5/mlx5_ifc_vdpa.h | 8 ++++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5= _vnet.c index fb0b23e71383..ea4bc8a0cd25 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -895,6 +895,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 +923,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 +1123,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 +1146,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; @@ -1991,6 +2013,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; @@ -2004,8 +2027,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; } @@ -2732,6 +2763,39 @@ 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, bool suspen= d) +{ + struct mlx5_control_vq *cvq; + + if (!(mvdev->actual_features & BIT_ULL(VIRTIO_NET_F_CTRL_VQ))) + return; + + cvq =3D &mvdev->cvq; + cvq->ready =3D !suspend; +} + +static int mlx5_vdpa_suspend(struct vdpa_device *vdev, bool suspend) +{ + 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; + + if (!suspend) { + mlx5_vdpa_warn(mvdev, "Resume of virtqueues is not supported\n"); + return -EOPNOTSUPP; + } + + down_write(&ndev->reslock); + for (i =3D 0; i < ndev->cur_num_vqs; i++) { + mvq =3D &ndev->vqs[i]; + suspend_vq(ndev, mvq); + } + mlx5_vdpa_cvq_suspend(mvdev, suspend); + 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, @@ -2762,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) @@ -2827,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]; diff --git a/include/linux/mlx5/mlx5_ifc_vdpa.h b/include/linux/mlx5/mlx5_i= fc_vdpa.h index 4414ed5b6ed2..423562f39d3c 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 alreadyi + * 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 Mon Apr 27 06:01:42 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 7FAEDC433EF for ; Thu, 16 Jun 2022 13:27:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377014AbiFPN1t (ORCPT ); Thu, 16 Jun 2022 09:27:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233436AbiFPN1n (ORCPT ); Thu, 16 Jun 2022 09:27:43 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2043.outbound.protection.outlook.com [40.107.236.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1320A12099 for ; Thu, 16 Jun 2022 06:27:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=na7v6yswZ9M/zAfVwJFHopj26zsaZLfE0RWg04i1izsmAnLpSMOmJz98dwJu5kGBX11Nlswdci4xxgCBImRO7TjVGn/zdRLM47SIgc8SPIZJgB42po3V59/1ZqZBWYI+pcnz7x2se2dV9LqQBM/mMk9efN0YWJEeALtjdJG38hBahEtFI/cpIY4CCkFH9Yl/F5n7KjCrbU0VrE90zjiDAw92Ao5m4B9JoaoSgCZi4rkqhDyJgpH4b6g69OruN4lF+z8rA2I/rLZfdy3IjQ/Zhntq2xqoR0C7jb1/gqn1J+7dza/j63WOkMcSQW+82hULVtQJuLQ9A0JOAKcuWHYJPw== 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=L+Df8I5nQd2aEREc8toiOuA+03oW9Ppmmo0tyC6jqV4=; b=mVg82Gexo1tCfkLs7qfEQ8pOKLxf0Aq27/rlRiSoD4RmXWe6XpuOQucNBzbN4h/E6OrVIQin6EG7hLvZ2yEr42krXJGDKQ5v90EkGoZvw1ZIlA9M32dMQQTXpiQCZPnCN8sLOHuOrxuTmdvbZU2vgtPPrA7b6/2nFOlhmTTQeZOv7osi9jITTqQyvIeInrhzdP839o8HUB1MprJp8Jg6/JKrsbR8qau7MMuLvpQa9FD0tumzWtiDzZgtKPvU5c31KmI/y9riTO7DCUpiTgyE/PtJWuvoVtgy4YhM2szuHE9UrS0IoC4h+7gaLBQsObXI7QyY3wSm8Qs6ACw+b+J1Uw== 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=L+Df8I5nQd2aEREc8toiOuA+03oW9Ppmmo0tyC6jqV4=; b=ZJN5L0s7mKdWu++VkQPELnmvJ4wjKvCgDdmdS1VZVuxzZNCc2Y9efrTXfz3gMX2aIUT3VAuXo/Sh/ZLUu/8geSxRXBFQ72JGy4C11evw4bwKbm+Rjididcv7qkgjJNmSDsMie8ngGTFfb+UfphUHBdW/m43sZVk94jto7sfeuM6P9ZYwaQou/otqAmBTXAfqHyAnPwylragJliR4b0RmxHQEHvoK9AFAsvk5QKm/7yvbmdF/SYj0QwMQzQ6anBcYazJbAAGzF6FN/09UN+lgsk4bAy1vWAPGS6dmvew9x7sno744MGCT+TUfvRA9SHzddN81cfbcCJSZHi5ibM9McQ== Received: from BN6PR14CA0026.namprd14.prod.outlook.com (2603:10b6:404:13f::12) by BL3PR12MB6547.namprd12.prod.outlook.com (2603:10b6:208:38e::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Thu, 16 Jun 2022 13:27:40 +0000 Received: from BN8NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:404:13f:cafe::8c) by BN6PR14CA0026.outlook.office365.com (2603:10b6:404:13f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15 via Frontend Transport; Thu, 16 Jun 2022 13:27:40 +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 BN8NAM11FT023.mail.protection.outlook.com (10.13.177.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5332.12 via Frontend Transport; Thu, 16 Jun 2022 13:27:38 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Thu, 16 Jun 2022 13:27:38 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Thu, 16 Jun 2022 06:27:37 -0700 Received: from vdi.nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server id 15.2.986.22 via Frontend Transport; Thu, 16 Jun 2022 06:27:34 -0700 From: Eli Cohen To: , , , CC: , , , Eli Cohen Subject: [PATCH RFC 2/3] vdpa/mlx5: Support different address spaces for control and data Date: Thu, 16 Jun 2022 16:27:24 +0300 Message-ID: <20220616132725.50599-3-elic@nvidia.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220616132725.50599-1-elic@nvidia.com> References: <20220616132725.50599-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: 74e684fc-b3d3-4928-09e4-08da4f9bfbdc X-MS-TrafficTypeDiagnostic: BL3PR12MB6547: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: psxzAlzhfcuWblcf0MK24w3UqLiIDRpYE+h9NVkzi2EQFHBInMDxKuXtl1Vwiu8B3p6Duv39IvXFFGE9bb20Qb0oiFOr5UVSc48UvykrbRxSRzQOZznwTOK8kJgrlWBNhsfvZ61pusdxMb81ExvvzGA7fVku6X3gAo2yCfAZsQRH3Hcc9jSqM9zrJ4yfGwRCP82NK5VPzKPwgtwAt7GWna1ulb8LmsQcIp4nF1pzGXOm1pwHsENbsbk7qV3JtD9bwNea2uyaj27qD3iFrJH+eVX5nDP51UYwY/tG0cmD0fVRVFOnk83aoeCrtUvPYg3wRcgxdhxjD6vCpziHnnBb+bxLPk8BKsgf14T/Pw92o5WxivDnlKDHWLBr/PNgwHSOOiUWGOGUnxeB2LO6f/KXOnaKZMr3AiMeHINlRmdjYqXxSqJAA/A/+97bSJypbfAVrDbvlFTrRT9UORr0GZE2vXFC3YegQQrtNmN5bbkS40yt+0qEN9YHtVwu+dLjMd5nMSZZEuFoLZc+vmgHDezbh7+LtjVWLWrOfU+M4UbO0DDfn1TLwLPQzg/cGyKxJuuUZZSTnDZrpNcPpn4v6mQKvQJOWFra5ryn12gExnSZhyZEV6jICJOM66H0kpO/EbSn2c0riJ9M9T/HQ6IblKV8dNd3IfZXVJLyMLUAjz9ja1bpzYUuHjYFNw6JSWGC8EQqF7CtjpsZ/2UodKsTcmTt7g== 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)(46966006)(36840700001)(40470700004)(1076003)(107886003)(2616005)(81166007)(356005)(36860700001)(316002)(186003)(83380400001)(336012)(47076005)(8676002)(5660300002)(8936002)(70206006)(2906002)(82310400005)(6666004)(7696005)(4326008)(40460700003)(54906003)(26005)(508600001)(110136005)(36756003)(426003)(86362001)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2022 13:27:38.8654 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 74e684fc-b3d3-4928-09e4-08da4f9bfbdc 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: BN8NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6547 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: oce for control virtqueue which is implemented in software, and one for data virtqueus. Signed-off-by: Eli Cohen Acked-by: Jason Wang --- drivers/vdpa/mlx5/core/mlx5_vdpa.h | 11 ++++ drivers/vdpa/mlx5/net/mlx5_vnet.c | 101 +++++++++++++++++++++++++---- 2 files changed, 101 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 ea4bc8a0cd25..34bd81cb697c 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -2125,9 +2125,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, @@ -2541,6 +2546,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); @@ -2559,7 +2573,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"); @@ -2597,26 +2613,76 @@ 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 u32 get_group(struct mlx5_vdpa_dev *mvdev, unsigned int asid) +{ + u32 group; + + for (group =3D 0; group < MLX5_VDPA_NUMVQ_GROUPS; group++) { + if (mvdev->group2asid[group] =3D=3D asid) + return group; + } + return -EINVAL; +} + +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); + u32 group; + int err; + + down_write(&ndev->reslock); + group =3D get_group(mvdev, asid); + switch (group) { + case MLX5_VDPA_DATAVQ_GROUP: + err =3D set_map_data(mvdev, iotlb); + break; + case MLX5_VDPA_CVQ_GROUP: + err =3D set_map_control(mvdev, iotlb); + break; + default: + err =3D -EINVAL; + } up_write(&ndev->reslock); return err; } @@ -2796,6 +2862,18 @@ static int mlx5_vdpa_suspend(struct vdpa_device *vde= v, bool suspend) 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 +2903,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, }; @@ -3047,7 +3126,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 From nobody Mon Apr 27 06:01:42 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 06679CCA47E for ; Thu, 16 Jun 2022 13:28:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377087AbiFPN2R (ORCPT ); Thu, 16 Jun 2022 09:28:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377025AbiFPN1u (ORCPT ); Thu, 16 Jun 2022 09:27:50 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2052.outbound.protection.outlook.com [40.107.244.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21EFC12ACA for ; Thu, 16 Jun 2022 06:27:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DW+XVObgbQcb0e7NQIPn4DDspuqaJqQWJ++9IgcA16PblJMCMvn8MkriZgNZqwZBrllbeIyjJeZUekYNqsCcmw4qXm8gvJ1x0ODopHuFNQI5n/B3zrrUd0A+kuKBCVIGew5wI/II5QaPMXWooq5RrGLUGqX1faBogGS6MKCZeyO0JwSxYzU8pP9F1ZE4t3mRnHQCgsRYc5fk7beXjU9PPwWk6/4Nsrihbzk7W5YfHwn2W3TGam/lWQbFAKSuU/UT8AytD4/EjrmfqXfxYTnraiFsdjYSPDuA7rP+AxistNnlfSuGiIG0VVcLu8kAvbTN1VtFEr1DN9VvwfHzOqmbuA== 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=N8DXp/xcUhLMf/MGUx3oq50TAThwwYZ/d5jMFpWM4nE=; b=dKygLTgecHa6uBFrDJjWhPGN4XOVorpWbcPGbI6qf1cqhvZJV1aPYnhfiwKTGt/w/RReDW7MW0AwlFyJFH0xMIdpvfo7Je4xDWqbG5PqhKao99s3wRJVG0u8O5RkGG0pfER5LaI5ullactUjeNOhpM9PedcQyTQl2/NlDMl6dFICFfUfRZYSiQNVRoEh2f0m85bW4qkgtU8oawz5jgwups3QL+3X+ZzZ01YQ2+jPmu2UbKE81PHy0lWmT2kb+6xdeU1n2jzIhJn+7JhRjeiETfd9np5Bk6Q3iAShj7Bo/t4TI/bArUzudfal2x+g3ygiokUUZTQEkC2RHUnMr+FOVw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) 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=N8DXp/xcUhLMf/MGUx3oq50TAThwwYZ/d5jMFpWM4nE=; b=nSH5RxVN8//8cAzrDnW97sHVWmR6JpVJonzAT3tIOhY+sAFLl+2u2+t5FkdnhSNBMHYw+FuZ8Nd9MvcXeaVHOLZrcesUZvxLLmnB//Jx7NuAqbzN7EI2ACP+3PNkQnw3WjbvSfjCVqow2MMZydrQ+NFOvIjm6+bFDUVE0qKRIHaE/TLGhEYDLbUb0TY9HQ+vUsNAgfrw2K3B42Ep85P/NOzXy0Gzm2A0x7QlCjHcM956jfq7Qoz1jAEJthfKBRfVThvHQMdl6OgGxs5JfC/gdhPsPz8feVQlGMNY7eHHc/6bZeVyzBVNe82AEVVTZbRMb6VR1VC0Z4vQHKD8tGvXeQ== Received: from BN9PR03CA0921.namprd03.prod.outlook.com (2603:10b6:408:107::26) by BN7PR12MB2611.namprd12.prod.outlook.com (2603:10b6:408:27::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Thu, 16 Jun 2022 13:27:42 +0000 Received: from BN8NAM11FT036.eop-nam11.prod.protection.outlook.com (2603:10b6:408:107:cafe::77) by BN9PR03CA0921.outlook.office365.com (2603:10b6:408:107::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.16 via Frontend Transport; Thu, 16 Jun 2022 13:27:42 +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; pr=C Received: from mail.nvidia.com (12.22.5.234) by BN8NAM11FT036.mail.protection.outlook.com (10.13.177.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5332.12 via Frontend Transport; Thu, 16 Jun 2022 13:27:42 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) by DRHQMAIL101.nvidia.com (10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Thu, 16 Jun 2022 13:27:41 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Thu, 16 Jun 2022 06:27:40 -0700 Received: from vdi.nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server id 15.2.986.22 via Frontend Transport; Thu, 16 Jun 2022 06:27:38 -0700 From: Eli Cohen To: , , , CC: , , , Eli Cohen Subject: [PATCH RFC 3/3] vdpa/mlx5: Disable VLAN support to support live migration Date: Thu, 16 Jun 2022 16:27:25 +0300 Message-ID: <20220616132725.50599-4-elic@nvidia.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220616132725.50599-1-elic@nvidia.com> References: <20220616132725.50599-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: a8160737-9d3a-4b6d-cf0c-08da4f9bfdca X-MS-TrafficTypeDiagnostic: BN7PR12MB2611: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: q5Cixr4BC5x2VSsX+9hcL49XzF68c+EEPd7pZm4++28lDa/zL9Vt7IZ/R4WDQ15DCnBuzNDtJ7xWXtrZzti8UaEbtXSKC3CSCE7gjC4qJ5rPTFfLftlRZJIjT4rLym/D/mCyLBUjMecrm7l7WS5WYeccgtLXOZqYeirsDooVC8/NdK4F8lCJWAs5wRpFaWDwqp6lVZ3Na9goLMf4NFelkvNjUYVOcQ+e7KGwYtl1QhkDKQUf1o1VSQdqvLzp5tIC+D/QEQSVUDd7EPa+FWR2cWh9M6eNn5d/NN/7YTKXCdIDM8GanHMGCXtY4VI0zRQagy8F2jg/0qwhD77+QpGsXw/v/1Fuk8H+KtYb2Njvpk2W/d7L9uWtho58HEwrTMRKc4hG4ko8SiYu0QmyzTbcgj0J8YEvLqA5ccLgzOKLf6YaA16Np9EiuZ/ceqeEsAqCAO/q6bJRwl4V/CCWQCHpqC8SZmnr/vMkz4XRZL8ZSG74dMVgbr1/q1A2Y+CBwdXDoUnHQcdrWsvT6J8MLOCse6K0Iu7M5tmvQ821wlP7/AKJxRjHfQ7s1FyGJkRrYA7kNx61G2b/WqgWyCLETOXedfXmx/GUaOomJ2to5pXn6wIfVw/osQH1yGPDb3EbuNeSseeXWIWa1m/NytbDEkxVSVVwApg+u1c9P6T6RMft4D9FIwL7KELK+zEyum1T1shHUwWmXxaspmFMMqq8KQKQ9A== 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:(13230016)(4636009)(40470700004)(46966006)(36840700001)(2906002)(6666004)(70586007)(70206006)(7696005)(8676002)(4326008)(36860700001)(4744005)(81166007)(5660300002)(356005)(54906003)(110136005)(36756003)(426003)(82310400005)(47076005)(107886003)(2616005)(336012)(316002)(1076003)(40460700003)(186003)(86362001)(8936002)(508600001)(83380400001)(26005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2022 13:27:42.1079 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a8160737-9d3a-4b6d-cf0c-08da4f9bfdca 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: BN8NAM11FT036.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR12MB2611 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Current qemu code does not support live migration for devices supporting VLAN. Disable it. Note: this patch is provided just to enable testing with current qemu. Signed-off-by: Eli Cohen --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5= _vnet.c index 34bd81cb697c..1568cfdf07e6 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -2172,7 +2172,6 @@ static u64 get_supported_features(struct mlx5_core_de= v *mdev) mlx_vdpa_features |=3D BIT_ULL(VIRTIO_NET_F_MQ); mlx_vdpa_features |=3D BIT_ULL(VIRTIO_NET_F_STATUS); mlx_vdpa_features |=3D BIT_ULL(VIRTIO_NET_F_MTU); - mlx_vdpa_features |=3D BIT_ULL(VIRTIO_NET_F_CTRL_VLAN); =20 return mlx_vdpa_features; } --=20 2.35.1