From mboxrd@z Thu Jan 1 00:00:00 1970 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 63D3C15F3E3; Sun, 24 Mar 2024 23:18:58 +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=1711322339; cv=none; b=Lmkvbk3mlM0PYPg3qH/nytHBha372JMSV7XfiX5VGLA03xZKBAG1Dvv/YRi/KBOyXIXjojWenlpaiAyVZkwSXCuciyC/z5QFPbgcO6tHh9nn4d7rYuBEDsaYz8qWRw6PLVZn//m1uO3MEhhFLnvbkNh1sbqRvYj5Jh5vZXZKb+I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711322339; c=relaxed/simple; bh=UIh4EwftxtgWNokURxmrNKJ0LEaBG7OfiRM0iG3TRCM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VAZTbCI7o/w+pa5GNM7M4r2TooOoLjc6yooAbcKFltlDrj23rOq8ReFtxWbbTxCyFQAas3jalaIMT8wTjbCY4E9qsgemLrB4f5wVul1gZW1vsK3tkkL8QULdW2bxBUQgtlIgOeqlHkIb3qDHfoifGKelpLBMQttHxPdgIWZVJtg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W2iI7Wr4; 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="W2iI7Wr4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F9EBC43390; Sun, 24 Mar 2024 23:18:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711322338; bh=UIh4EwftxtgWNokURxmrNKJ0LEaBG7OfiRM0iG3TRCM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W2iI7Wr4xEdDdHDm/VP3innV9hI4oZjrhlv6y8MKQ/eTQzTGLzqnPb7g1W7seNCWh sOE6jYjgMQUUT1AFBnRWS3Keni+45RI6/wM5LOd6PLcV8qCh8e26JMVzsB+VETCL2i 5qZE8ahRAjHDKIqWyiyfyOaxT5G8TPAhyKj0rPGPy3TIZKLSrDgZn6ZR68paFdvlOb 41eR1ge3opmKMJEMrV4f2PgDKCyO7RKPtQT5T93vv++lP8jQsF+nClD8lIJic8UTI1 O68WjuarzRnmZrh/To6IA6Iu8HBd+3fzEioIzHiGydiLVGR6GgUEydmxU5Sp95vYgJ KxLELaMLJSMZg== 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 6.1 420/451] vdpa/mlx5: Allow CVQ size changes Date: Sun, 24 Mar 2024 19:11:36 -0400 Message-ID: <20240324231207.1351418-421-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324231207.1351418-1-sashal@kernel.org> References: <20240324231207.1351418-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@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: 8bit 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=on 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érez 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 2b7e796c48897..74d295312466f 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -185,8 +185,6 @@ static void teardown_driver(struct mlx5_vdpa_net *ndev); static bool mlx5_vdpa_debug; -#define MLX5_CVQ_MAX_ENT 16 - #define MLX5_LOG_VIO_FLAG(_feature) \ do { \ if (features & BIT_ULL(_feature)) \ @@ -1980,9 +1978,16 @@ static void mlx5_vdpa_set_vq_num(struct vdpa_device *vdev, u16 idx, u32 num) struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev); struct mlx5_vdpa_virtqueue *mvq; - if (!is_index_valid(mvdev, idx) || is_ctrl_vq_idx(mvdev, idx)) + if (!is_index_valid(mvdev, idx)) return; + if (is_ctrl_vq_idx(mvdev, idx)) { + struct mlx5_control_vq *cvq = &mvdev->cvq; + + cvq->vring.vring.num = num; + return; + } + mvq = &ndev->vqs[idx]; mvq->num_ent = num; } @@ -2512,7 +2517,7 @@ static int setup_cvq_vring(struct mlx5_vdpa_dev *mvdev) u16 idx = cvq->vring.last_avail_idx; err = 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); -- 2.43.0