Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Angus Chen <angus.chen@jaguarmicro.com>
To:     mst@redhat.com, jasowang@redhat.com
Cc:     virtualization@lists.linux-foundation.org,
        linux-kernel@vger.kernel.org,
        Angus Chen <angus.chen@jaguarmicro.com>
Subject: [PATCH] vp_vdpa: Check queue number of vdpa device from add_config
Date:   Fri,  2 Jun 2023 15:34:42 +0800
Message-Id: <20230602073442.1765-1-angus.chen@jaguarmicro.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?17Xq0hD7jmha7dD6RgJJRorCilkd6kbGnF1ZmGOyQ3dnNlX9MzAkjofjfrvY?=
 =?us-ascii?Q?WgK3TOoUfRxYwhXUGEqLInV7QcfedP/aQ32IF6cskFUPAI2du2Qz9UgmtvBF?=
 =?us-ascii?Q?xXJgCwMEie06eKcVVorUBTBLoelUzRl0vy2yB9lo+O20mKkA1fFEr/4ZKde0?=
 =?us-ascii?Q?ZC2p48IuRJFENHbXgLw/F2xmalTkqeiJlwp0Evr2QpxBeGo04ePgo/n2CS3R?=
 =?us-ascii?Q?wx814Tk0EEWpHmw8N+qFRDnKWVGAF8A7SZ3FNfMrwqHQkDgX5wd9VHvJr2xC?=
 =?us-ascii?Q?61kyma54vWhgC0AGaZIqgY8+PY7ejIO/iL7yRAec7xAqPwsFg2z7V275pHaZ?=
 =?us-ascii?Q?RVmguKrLfq8IeLRss+NgHUEk09xlSAMR9u6FINkP9HgXNcD6p05AIUiH45pu?=
 =?us-ascii?Q?1JyPJnzu+IBWhfFjskGdGh1HYlgtFqniGES/VQvPf3UVr+Fnb5m00px2UNXx?=
 =?us-ascii?Q?he8Vo+h1oL4TSROA96ZDE031ojiZWo9l4zzSpIQbLXa3MgahoXJ+/BN00OWm?=
 =?us-ascii?Q?21pZau3XCSYjJQFpLjxf6mzcgDc7T/oM0YVTKAwbKIKradVxNRBRcJI4ny+K?=
 =?us-ascii?Q?BO5axmi6tiGk9bgklEEnYGsT3i8RF4zt4qhTKR/+V+3QJ1cqxZ0yRePjeIZI?=
 =?us-ascii?Q?Pl16YF49Oa/nQaN6HgTWU2kY2MAiaUFgD/vHVnpPI3jhIOmbnLo8plp+BTZ5?=
 =?us-ascii?Q?s7C9Gk56WuieKslNw3sI5/uJIA3BeY8RSqrpXWBuO1HY6LH610GrehhrfJTj?=
 =?us-ascii?Q?yASjUaYb7w4nbSBgJzRLWmJGVVlsLv1kSdSXLIJts5pPYibDGn0+pyzD4Ulx?=
 =?us-ascii?Q?GYoNVCRMBEgC951g/YvuF5F21VhdqhSnKHAp4kk+NL3SCXgu2mwl6w9dedU+?=
 =?us-ascii?Q?LTZmdhduyEEhYgAJoSd4RX1OzIXnbiBCzzOgGSibV+BljvYaMV0WfKamqt7z?=
 =?us-ascii?Q?410TTa2J+BZgz575i+YydkjDH/IZx/K2BbL8O+JTY/Ms1MuCht9Ns+GjC3LG?=
 =?us-ascii?Q?AoKNCgENKT7//4pVvfd0GXYG4wxBWzX88Lvpa3xmE6nn9NCkNIsVDPLLhZU1?=
 =?us-ascii?Q?xJQUbcoTCQRYdsgO28mpsI31pAFeAFL8UjTqqZjU7tsukuQHpA4DFiVxk1cE?=
 =?us-ascii?Q?ErkO9LbdbeJkJzIClVfiWhso425P+9zdjaC9bVEw5/IekUA2QCQpo3vjq3Kk?=
 =?us-ascii?Q?daNGVHy0Xl71wwlBdAlPcr3vhc01WddGR+Bv6Zw4SvStMCqDZT4b1aOHc/pD?=
 =?us-ascii?Q?/ylBoHaKYa8DwAJOjxID2E17+wq2wwXIk6n1ufoO1K3V8C+Jk6XEkorecPbz?=
 =?us-ascii?Q?LSoNmitC4oNePHLEpG0plhvgOtdPTW1pPTenrhrdNUpDDKqrYfzGR1h9g1ya?=
 =?us-ascii?Q?4yfECJ66rRB+AldpV5Vy+HDp9/Jrb5en0mvcO/bHq5SLsSb6QOqMwpabv0+h?=
 =?us-ascii?Q?DCdM6jbU7oV01YozMQ/N3zRTQETT7Bxz2DMSLMIDkj6BbLAz0wA+P+0kFBzz?=
 =?us-ascii?Q?26Ncox3Gmogkmpu8esWKRbLoMsashvJn0SZOWvmiZbN/ryuRPXA6We7mwznT?=
 =?us-ascii?Q?yBi5miilA7rOUu12sXssJOrSQiAnw2PwDozXA1iluYCaV1VP8c0MchDxYVyh?=
 =?us-ascii?Q?Cg=3D=3D?=
X-OriginatorOrg: jaguarmicro.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 34125a4f-f00e-49ba-1e76-08db633be314
X-MS-Exchange-CrossTenant-AuthSource: TY2PR06MB3424.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2023 07:35:07.1076
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 1e45a5c2-d3e1-46b3-a0e6-c5ebf6d8ba7b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: J2NI82gHSSbU5UY3gzrejJe8CBlAkZfYLTM/UHfhlj0GJOlgUXrsQkC8/EOnWjfi9PnEgBgy1ff09AmO9FLg6nEq/cu4JLfuuReAJn54VRk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB5201
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham 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

When add virtio_pci vdpa device,check the vqs number of device cap
and max_vq_pairs from add_config.

Signed-off-by: Angus Chen <angus.chen@jaguarmicro.com>
---
 drivers/vdpa/virtio_pci/vp_vdpa.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp_vdpa.c
index 281287fae89f..4bf1ab637d32 100644
--- a/drivers/vdpa/virtio_pci/vp_vdpa.c
+++ b/drivers/vdpa/virtio_pci/vp_vdpa.c
@@ -478,7 +478,7 @@ static int vp_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
 	struct device *dev = &pdev->dev;
 	struct vp_vdpa *vp_vdpa = NULL;
 	u64 device_features;
-	int ret, i;
+	int ret, i, queues;
 
 	vp_vdpa = vdpa_alloc_device(struct vp_vdpa, vdpa,
 				    dev, &vp_vdpa_ops, 1, 1, name, false);
@@ -491,7 +491,14 @@ static int vp_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
 	vp_vdpa_mgtdev->vp_vdpa = vp_vdpa;
 
 	vp_vdpa->vdpa.dma_dev = &pdev->dev;
-	vp_vdpa->queues = vp_modern_get_num_queues(mdev);
+	queues = vp_modern_get_num_queues(mdev);
+	if (add_config->mask & BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MAX_VQP)) {
+		if (add_config->net.max_vq_pairs > queues / 2)
+			return -EINVAL;
+		queues = min_t(u32, queues, 2 * add_config->net.max_vq_pairs);
+	}
+
+	vp_vdpa->queues = queues;
 	vp_vdpa->mdev = mdev;
 
 	device_features = vp_modern_get_features(mdev);
-- 
2.25.1