Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   Eli Cohen <elic@nvidia.com>
To:     Jason Wang <jasowang@redhat.com>, "mst@redhat.com" <mst@redhat.com>
CC:     "virtualization@lists.linux-foundation.org" 
        <virtualization@lists.linux-foundation.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH 1/2] vdpa: mlx5: prevent cvq work from hogging CPU
Thread-Topic: [PATCH 1/2] vdpa: mlx5: prevent cvq work from hogging CPU
Thread-Index: AQHYPOmOAGfLcKLGQkKqa8QJSXdItazJX8ag
Date:   Mon, 21 Mar 2022 06:31:18 +0000
Message-ID: <DM8PR12MB54000AA4A7C05D57006C5920AB169@DM8PR12MB5400.namprd12.prod.outlook.com>
References: <20220321060429.10457-1-jasowang@redhat.com>
In-Reply-To: <20220321060429.10457-1-jasowang@redhat.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?9B06LPBvLs7nBNqtNdg18weFdUlyUo9vNAZ4Thh72YrMnAiaxitcOK3NYeKN?=
 =?us-ascii?Q?OOLHhKVhz6TQg0RzCFkBYZS87gY3lJAs8p0HoCS6CHxlD7Wa5l9Yuf+9G9Bm?=
 =?us-ascii?Q?QpEJHzNk8qpN9ZfXk9yRsoHkxc1rMwM6oqZZ1wNepEFsNpZaDr59pSSiqmyW?=
 =?us-ascii?Q?IqZK3y/3g8IWI0R86emquQ2BTbHWhIi4QW5EHey37relkjM90XSr36swOOkS?=
 =?us-ascii?Q?4b5X4YQs68J2hwwZfIZrIKMqdTUJ5W/NbY+3qFLoPRHDhPFZY1mEVdRpwz2D?=
 =?us-ascii?Q?Zx3sgMx1kjOJDTOQY9ZnUMob1h9lRPYhdtc86DJxE7DKf2rd+KVFX1TyV0pW?=
 =?us-ascii?Q?hdQ3CuEOCitBq04JgesjYg9XFswWikgQSMr7sq0k52cd2D4PMGwOvdWCRVUO?=
 =?us-ascii?Q?Ae/LWqV09idMShmzTcAuoa/tyCKSgUu1VhF9hezLqzieL/Ps8hA2nnDNSM2g?=
 =?us-ascii?Q?TZz2UHatJOv0fOENW2Bozt3dVILbZQN/pl6R6v7gqiRcdLNY9X8P5N1UXEQN?=
 =?us-ascii?Q?uFJtguOFFsDTPBoY4vDXW/fQeWVpRt5yUqMQqD2FcdRdqWlUCLG9DhtgBzyY?=
 =?us-ascii?Q?iYXwHbdlYUWn31E6RxKJI7kfr4acTdJlF2oyhHAQjjSvzDS1EMYD/eWSPZ8q?=
 =?us-ascii?Q?+mfWl6WdpvrcgKM5KfJzQDPFDASwmPHVOvr2ZEY3JrF2+L6cmzGLG+/lDoWg?=
 =?us-ascii?Q?1iOhaEcs4DXY9cbk9hCiLVEtX433LgmumINJb3x06aYkQBK46TKItuARcb3v?=
 =?us-ascii?Q?gD7idCKsANP6cGoPnaqxbOAQ/e0W/eXHgSfsrdD5jf4vTskJejUY04QbuRyc?=
 =?us-ascii?Q?Dz1Qc9EvQ3HlI9u0/SC6TVJRF/ZU5KaiIfmvN9sf2o5XT8We6sCNehIlS1i1?=
 =?us-ascii?Q?F4vNgSMlfoWfl9UYbxuR2Py33mklFTjRWilpm3FiDwbwDVLcXIMwd+ag9p3b?=
 =?us-ascii?Q?vQmQMwms8R1tVfEjjIwzGIGUX6kkNpAunGCcZfpCqonmtpjcRUl15Ktqgk8e?=
 =?us-ascii?Q?9OJbwx6wCn1t0nsry5AIaaEv+lzGtoeP+WGl6KC2u/az2sJiPA4RVS9iMcZ3?=
 =?us-ascii?Q?GpkwT7yG0kPhwC4LdUiySFAmaZjyRI7/ef62o8U2skCuYh5KtdSdze74RBRY?=
 =?us-ascii?Q?a2JtbpXOMgaRcP/Ss0dfknRiIKXmlGgNOkATrnmfmB7SfyXxJezAJvXiq4kA?=
 =?us-ascii?Q?JsZXfVxEPZdlu1ylk4ESHpH5cq2EpQIFBfGCDaORK+2X/nGWluVo5mSwPfdg?=
 =?us-ascii?Q?NDSS6PSQw703+jDDEkmwvOR+S9SP+JzfwYTQpPE6U8fQdHAgLxEnfHhIXcHg?=
 =?us-ascii?Q?VbxksW3GEUH6cpptP70QuoCJyDmk7figNeItoAoT2xqw8qgISGUR1NKXfo1j?=
 =?us-ascii?Q?zqMLy74w2Cs90E1kPCxjfzN1nAieSfTq2yD4u5DrqffjCXiOJosCK76F/zpo?=
 =?us-ascii?Q?uwvAHaBBPZE=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: DM8PR12MB5400.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 201c1b30-caa6-4a18-588f-08da0b046889
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Mar 2022 06:31:18.7015
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 3h5l+5SbyWaibnyzyxgwb7P7zoueVlClrgzLaJqwInoEMNrG76MJIUI1RK1GPl8l
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB2989
X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Jason Wang <jasowang@redhat.com>
> Sent: Monday, March 21, 2022 8:04 AM
> To: mst@redhat.com; jasowang@redhat.com
> Cc: Eli Cohen <elic@nvidia.com>; virtualization@lists.linux-foundation.or=
g; linux-kernel@vger.kernel.org
> Subject: [PATCH 1/2] vdpa: mlx5: prevent cvq work from hogging CPU
>=20
> A userspace triggerable infinite loop could happen in
> mlx5_cvq_kick_handler() if userspace keeps sending a huge amount of
> cvq requests.
>=20
> Fixing this by introducing a quota and re-queue the work if we're out
not requeuing the work ...
> of the budget. While at it, using a per device workqueue to avoid on
using per device work. The workqueue is already per device.
> demand memory allocation for cvq.
>=20
> Fixes: 5262912ef3cfc ("vdpa/mlx5: Add support for control VQ and MAC sett=
ing")
> Signed-off-by: Jason Wang <jasowang@redhat.com>

Reviewed-by: Eli Cohen <elic@nvidia.com>

> ---
>  drivers/vdpa/mlx5/net/mlx5_vnet.c | 28 +++++++++++++++-------------
>  1 file changed, 15 insertions(+), 13 deletions(-)
>=20
> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/ml=
x5_vnet.c
> index d0f91078600e..d5a6fb3f9c41 100644
> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> @@ -163,6 +163,7 @@ struct mlx5_vdpa_net {
>  	u32 cur_num_vqs;
>  	struct notifier_block nb;
>  	struct vdpa_callback config_cb;
> +	struct mlx5_vdpa_wq_ent cvq_ent;
>  };
>=20
>  static void free_resources(struct mlx5_vdpa_net *ndev);
> @@ -1600,6 +1601,8 @@ static virtio_net_ctrl_ack handle_ctrl_mq(struct ml=
x5_vdpa_dev *mvdev, u8 cmd)
>  	return status;
>  }
>=20
> +#define MLX5_CVQ_BUDGET 16
> +
>  static void mlx5_cvq_kick_handler(struct work_struct *work)
>  {
>  	virtio_net_ctrl_ack status =3D VIRTIO_NET_ERR;
> @@ -1609,17 +1612,17 @@ static void mlx5_cvq_kick_handler(struct work_str=
uct *work)
>  	struct mlx5_control_vq *cvq;
>  	struct mlx5_vdpa_net *ndev;
>  	size_t read, write;
> -	int err;
> +	int err, n =3D 0;
>=20
>  	wqent =3D container_of(work, struct mlx5_vdpa_wq_ent, work);
>  	mvdev =3D wqent->mvdev;
>  	ndev =3D to_mlx5_vdpa_ndev(mvdev);
>  	cvq =3D &mvdev->cvq;
>  	if (!(ndev->mvdev.actual_features & BIT_ULL(VIRTIO_NET_F_CTRL_VQ)))
> -		goto out;
> +		return;
>=20
>  	if (!cvq->ready)
> -		goto out;
> +		return;
>=20
>  	while (true) {
>  		err =3D vringh_getdesc_iotlb(&cvq->vring, &cvq->riov, &cvq->wiov, &cvq=
->head,
> @@ -1653,9 +1656,13 @@ static void mlx5_cvq_kick_handler(struct work_stru=
ct *work)
>=20
>  		if (vringh_need_notify_iotlb(&cvq->vring))
>  			vringh_notify(&cvq->vring);
> +
> +		n++;
> +		if (n > MLX5_CVQ_BUDGET) {
> +			queue_work(mvdev->wq, &wqent->work);
> +			break;
> +		}
>  	}
> -out:
> -	kfree(wqent);
>  }
>=20
>  static void mlx5_vdpa_kick_vq(struct vdpa_device *vdev, u16 idx)
> @@ -1663,7 +1670,6 @@ static void mlx5_vdpa_kick_vq(struct vdpa_device *v=
dev, u16 idx)
>  	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_vdpa_wq_ent *wqent;
>=20
>  	if (!is_index_valid(mvdev, idx))
>  		return;
> @@ -1672,13 +1678,7 @@ static void mlx5_vdpa_kick_vq(struct vdpa_device *=
vdev, u16 idx)
>  		if (!mvdev->cvq.ready)
>  			return;
>=20
> -		wqent =3D kzalloc(sizeof(*wqent), GFP_ATOMIC);
> -		if (!wqent)
> -			return;
> -
> -		wqent->mvdev =3D mvdev;
> -		INIT_WORK(&wqent->work, mlx5_cvq_kick_handler);
> -		queue_work(mvdev->wq, &wqent->work);
> +		queue_work(mvdev->wq, &ndev->cvq_ent.work);
>  		return;
>  	}
>=20
> @@ -2668,6 +2668,8 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *=
v_mdev, const char *name,
>  	if (err)
>  		goto err_mr;
>=20
> +	ndev->cvq_ent.mvdev =3D mvdev;
> +	INIT_WORK(&ndev->cvq_ent.work, mlx5_cvq_kick_handler);
>  	mvdev->wq =3D create_singlethread_workqueue("mlx5_vdpa_wq");
>  	if (!mvdev->wq) {
>  		err =3D -ENOMEM;
> --
> 2.18.1