From nobody Wed Oct 15 22:45:56 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0697C178CE5; Sun, 24 Mar 2024 23:39:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323594; cv=none; b=MV2qvIEJwbceZ83/pfjCj78cHLaB0CCe0NtHdFEUdTo8ZV7z4/x7ZKuH2kqyq5BsaqZP7NAQrIJbvlGaBMK3YZfH8bOs4XWXgNcQBXrNgj9Fqar+U8/l7h4LRr9aV0I/cT1FfwMbYCSttP9jW6kVAIOput7AWqWO9lS44fyuasg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323594; c=relaxed/simple; bh=9vpMZPAtBm6cIMVe/t5RJO0lOHsCbr811yyFXdRrKiw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RayenayCvGbH6Q6g3sgr2+esQR4FpFgxdWSX0LU/e/CF+TLFh4NNaaKdDMwA9neQZXWzmheBVmJK+VBzGyvrPl8qEAGBVfhSO9kvUJ4EXJeyHlVTaUF5EjqmNjY0y50NHnEdylGosKAxMxQN38yfsnhA60+VVSIC7OxBQSoYb6I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OxGLghep; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OxGLghep" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02DB3C43399; Sun, 24 Mar 2024 23:39:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711323592; bh=9vpMZPAtBm6cIMVe/t5RJO0lOHsCbr811yyFXdRrKiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OxGLghepnxylKfpAc6Hl9HK+x2lMEu4aDYsygWzyJKE6bdEX+gffnJ9tDbXxRFtzr Ska4R0kFuPjeOe3ovQBOJVP7hU3vuUOCVFrcBxSkD5XAHZLjfNIWlzgVrqTHxrYCwr A5g+P3QCRL2GXcUEHC0V6AI0t6CKsfPFm+CBSV4kGsPYtYbuyleBPXgFBeCXh0z0C2 Lx1g2COE3D8JJJ7/tliOdFq19l7FFTp62SMS9OROu1QeY5EbUj1OM6uKEZWih+UI20 9g+FSmPPgf3fARcUqMuuVptgSkIqdkW0aYs7WmrId145oDYzCD9YfUCDLFtCcPcZ6F tzFGg5Nc1dNjA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jonah Palmer , Dragos Tatulea , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , "Michael S . Tsirkin" , Lei Yang , Sasha Levin Subject: [PATCH 5.15 299/317] vdpa/mlx5: Allow CVQ size changes Date: Sun, 24 Mar 2024 19:34:39 -0400 Message-ID: <20240324233458.1352854-300-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324233458.1352854-1-sashal@kernel.org> References: <20240324233458.1352854-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable From: Jonah Palmer [ Upstream commit 749a4016839270163efc36ecddddd01de491a16b ] The MLX driver was not updating its control virtqueue size at set_vq_num and instead always initialized to MLX5_CVQ_MAX_ENT (16) at setup_cvq_vring. Qemu would try to set the size to 64 by default, however, because the CVQ size always was initialized to 16, an error would be thrown when sending >16 control messages (as used-ring entry 17 is initialized to 0). For example, starting a guest with x-svq=3Don and then executing the following command would produce the error below: # for i in {1..20}; do ifconfig eth0 hw ether XX:xx:XX:xx:XX:XX; done qemu-system-x86_64: Insufficient written data (0) [ 435.331223] virtio_net virtio0: Failed to set mac address by vq command. SIOCSIFHWADDR: Invalid argument Acked-by: Dragos Tatulea Acked-by: Eugenio P=C3=A9rez Signed-off-by: Jonah Palmer Message-Id: <20240216142502.78095-1-jonah.palmer@oracle.com> Signed-off-by: Michael S. Tsirkin Tested-by: Lei Yang Fixes: 5262912ef3cf ("vdpa/mlx5: Add support for control VQ and MAC setting= ") Signed-off-by: Sasha Levin --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5= _vnet.c index 46c72e6d3a29b..d9e4a949129a0 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -173,8 +173,6 @@ static void teardown_driver(struct mlx5_vdpa_net *ndev); =20 static bool mlx5_vdpa_debug; =20 -#define MLX5_CVQ_MAX_ENT 16 - #define MLX5_LOG_VIO_FLAG(_feature) = \ do { = \ if (features & BIT_ULL(_feature)) = \ @@ -1685,9 +1683,16 @@ static void mlx5_vdpa_set_vq_num(struct vdpa_device = *vdev, u16 idx, u32 num) struct mlx5_vdpa_net *ndev =3D to_mlx5_vdpa_ndev(mvdev); struct mlx5_vdpa_virtqueue *mvq; =20 - if (!is_index_valid(mvdev, idx) || is_ctrl_vq_idx(mvdev, idx)) + if (!is_index_valid(mvdev, idx)) return; =20 + if (is_ctrl_vq_idx(mvdev, idx)) { + struct mlx5_control_vq *cvq =3D &mvdev->cvq; + + cvq->vring.vring.num =3D num; + return; + } + mvq =3D &ndev->vqs[idx]; mvq->num_ent =3D num; } @@ -2182,7 +2187,7 @@ static int setup_cvq_vring(struct mlx5_vdpa_dev *mvde= v) u16 idx =3D cvq->vring.last_avail_idx; =20 err =3D vringh_init_iotlb(&cvq->vring, mvdev->actual_features, - MLX5_CVQ_MAX_ENT, false, + cvq->vring.vring.num, false, (struct vring_desc *)(uintptr_t)cvq->desc_addr, (struct vring_avail *)(uintptr_t)cvq->driver_addr, (struct vring_used *)(uintptr_t)cvq->device_addr); --=20 2.43.0