From patchwork Tue Jan 31 23:22:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Si-Wei Liu X-Patchwork-Id: 51089 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp91089wrn; Tue, 31 Jan 2023 15:25:53 -0800 (PST) X-Google-Smtp-Source: AK7set/9E2jQ6wbigQdWBHKc0H/en81IwvQw/fJKr9UusHmGCy9TocRE9cKjOvpuJxpJF0+bfTUH X-Received: by 2002:a05:6a20:938b:b0:be:a817:ef9d with SMTP id x11-20020a056a20938b00b000bea817ef9dmr231935pzh.42.1675207552830; Tue, 31 Jan 2023 15:25:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675207552; cv=none; d=google.com; s=arc-20160816; b=Y2zUI8NfrXDsh/q3aXWe5aOh7fyjY0MgQiKY8rKblUsOyDr/kNMg2xFfodKQfdaqqx eqmxRBkDXvBkXzXRc5y+JHzFVlpNEqFTlTqz95DQoyFsMEH4aUcISkhaVl1DaggQ+sXt dmlH7F7qAM2bzJOfAU24SdfREIgfrKW3LSicp6l/gafO6MNeHXBopgTg6ztc5N2WgHp7 0GbD45j1dlGGP9uiTFrd2Q3p0PNcFDnDQ3ORQQGegL1f0UgCN1FkRq7PCHr3MV2kJLSy zhqGxEcVbUVxS86JPHl9nbYXIbTzpxLvo7iubbVkGJ6GtytNTan4hfKYyIWLmpW0NWmg f4OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=X8vNUi+5b0IaJnlztUNKoNbbjRp2qUPlQkLB5sClFlY=; b=ops9elWHCM/+R5J+ZRHLPmzpxgPAMQXGwKZht5YCEhgD38fQhdKw4FVWn1uaLCG5Hm o1U4Y+v2Rv7MDIfq/SgpbVZnO7G60XIhAFV5d+bccW2f+B6w/OdmADPEDGIkbpihAT9k t3wxI7qa+X8S8NeCW6YW5rCZv3WiyXQvh+ejxQrf+WbEdZ1biShurEJRmLBztZVLOZm8 qYnteyWNs/vSLVM0cx7aRHUWjEZSWgzfAb11SRg6Be1eNuWp8qEwfa7oVZNGHVVqIHGe fE5Ktq0Ptz/n3I6M6RyeNobfSQWyLahd3B7JbGsw4p7dwq92cCIQ/4P7p5DPC8uDvM4D FxXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2022-7-12 header.b=jhp+p44j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c4-20020a17090a8d0400b0022bb380256esi18461257pjo.106.2023.01.31.15.25.40; Tue, 31 Jan 2023 15:25:52 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2022-7-12 header.b=jhp+p44j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231439AbjAaXYV (ORCPT + 99 others); Tue, 31 Jan 2023 18:24:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232273AbjAaXYL (ORCPT ); Tue, 31 Jan 2023 18:24:11 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C52513D42 for ; Tue, 31 Jan 2023 15:23:40 -0800 (PST) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30VIi4tb032498; Tue, 31 Jan 2023 23:22:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2022-7-12; bh=X8vNUi+5b0IaJnlztUNKoNbbjRp2qUPlQkLB5sClFlY=; b=jhp+p44jA9agosdrZWgrnJFkGDiujlmFRXd9jFNiYVoWEXuT/KuzYkAdY6DksoLIAYzH g2bVwBBD8PtSptmOVySSv3BP947gI4NJiU0giadJU0dUz+6syDmatf8Dz7rjvkcsDE/H zva7AHzXbxAQ44UKZ+2dnAUR1ePZi479IteZnrDIAbZKsTDQKqFwqIMbBtqv86nqPrWJ bsKFhIytzJKCsX0BK+P9dODzHP8VYinQfsD14ttE9Gv+6Fl5vFjR9F4rOIZ0jAu+cYCf UmlN/8NjE1g/5kHvcijE+Q5hWaNMW9E2C3IPeys5khRp7IWczuo3W1IA7v1+5ejA2/7H Ow== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ncvrjxyxk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 31 Jan 2023 23:22:47 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30VN9OVo033826; Tue, 31 Jan 2023 23:22:46 GMT Received: from ban25x6uut24.us.oracle.com (ban25x6uut24.us.oracle.com [10.153.73.24]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 3nct56fb9w-6; Tue, 31 Jan 2023 23:22:46 +0000 From: Si-Wei Liu To: mst@redhat.com, jasowang@redhat.com, parav@nvidia.com, elic@nvidia.com Cc: virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/7] vdpa: validate device feature provisioning against supported class Date: Tue, 31 Jan 2023 15:22:23 -0800 Message-Id: <1675207345-22328-6-git-send-email-si-wei.liu@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675207345-22328-1-git-send-email-si-wei.liu@oracle.com> References: <1675207345-22328-1-git-send-email-si-wei.liu@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-31_08,2023-01-31_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 malwarescore=0 spamscore=0 phishscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301310201 X-Proofpoint-GUID: MJ9Igy1v62s08vACfewGNhbJKzOeqzTH X-Proofpoint-ORIG-GUID: MJ9Igy1v62s08vACfewGNhbJKzOeqzTH X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756582434633221448?= X-GMAIL-MSGID: =?utf-8?q?1756582434633221448?= Today when device features are explicitly provisioned, the features user supplied may contain device class specific features that are not supported by the parent managment device. On the other hand, when parent managment device supports more than one class, the device features to provision may be ambiguous if none of the class specific attributes is provided at the same time. Validate these cases and prompt appropriate user errors accordingly. Signed-off-by: Si-Wei Liu --- drivers/vdpa/vdpa.c | 51 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index 1eba978..35a72d6 100644 --- a/drivers/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c @@ -460,12 +460,30 @@ static int vdpa_nl_mgmtdev_handle_fill(struct sk_buff *msg, const struct vdpa_mg return 0; } +static u64 vdpa_mgmtdev_get_classes(const struct vdpa_mgmt_dev *mdev, + unsigned int *nclasses) +{ + u64 supported_classes = 0; + unsigned int n = 0; + int i = 0; + + while (mdev->id_table[i].device) { + if (mdev->id_table[i].device <= 63) { + supported_classes |= BIT_ULL(mdev->id_table[i].device); + n++; + } + i++; + } + if (nclasses) + *nclasses = n; + + return supported_classes; +} + static int vdpa_mgmtdev_fill(const struct vdpa_mgmt_dev *mdev, struct sk_buff *msg, u32 portid, u32 seq, int flags) { - u64 supported_classes = 0; void *hdr; - int i = 0; int err; hdr = genlmsg_put(msg, portid, seq, &vdpa_nl_family, flags, VDPA_CMD_MGMTDEV_NEW); @@ -475,14 +493,9 @@ static int vdpa_mgmtdev_fill(const struct vdpa_mgmt_dev *mdev, struct sk_buff *m if (err) goto msg_err; - while (mdev->id_table[i].device) { - if (mdev->id_table[i].device <= 63) - supported_classes |= BIT_ULL(mdev->id_table[i].device); - i++; - } - if (nla_put_u64_64bit(msg, VDPA_ATTR_MGMTDEV_SUPPORTED_CLASSES, - supported_classes, VDPA_ATTR_UNSPEC)) { + vdpa_mgmtdev_get_classes(mdev, NULL), + VDPA_ATTR_UNSPEC)) { err = -EMSGSIZE; goto msg_err; } @@ -571,8 +584,10 @@ static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct genl_info *i struct vdpa_dev_set_config config = {}; struct nlattr **nl_attrs = info->attrs; struct vdpa_mgmt_dev *mdev; + unsigned int ncls = 0; const u8 *macaddr; const char *name; + u64 classes; int err = 0; if (!info->attrs[VDPA_ATTR_DEV_NAME]) @@ -649,6 +664,24 @@ static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct genl_info *i goto err; } + classes = vdpa_mgmtdev_get_classes(mdev, &ncls); + if (config.mask & VDPA_DEV_NET_ATTRS_MASK && + !(classes & BIT_ULL(VIRTIO_ID_NET))) { + NL_SET_ERR_MSG_MOD(info->extack, + "Network class attributes provided on unsupported management device"); + err = -EINVAL; + goto err; + } + if (!(config.mask & VDPA_DEV_NET_ATTRS_MASK) && + config.mask & BIT_ULL(VDPA_ATTR_DEV_FEATURES) && + classes & BIT_ULL(VIRTIO_ID_NET) && ncls > 1 && + config.device_features & VIRTIO_DEVICE_F_MASK) { + NL_SET_ERR_MSG_MOD(info->extack, + "Management device supports multi-class while device features specified are ambiguous"); + err = -EINVAL; + goto err; + } + err = mdev->ops->dev_add(mdev, name, &config); err: up_write(&vdpa_dev_lock);