From patchwork Mon Feb 6 23:12:01 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: 53556 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2516550wrn; Mon, 6 Feb 2023 15:15:23 -0800 (PST) X-Google-Smtp-Source: AK7set+bocZ4VZ+tlT3Ihmd/ZiB2YN9n/FCz5C2vwOfow2p6hMnJODALuW2jj55usXXoS2zmO7Ky X-Received: by 2002:a17:907:3e0a:b0:87f:d08:1064 with SMTP id hp10-20020a1709073e0a00b0087f0d081064mr1897310ejc.6.1675725323471; Mon, 06 Feb 2023 15:15:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675725323; cv=none; d=google.com; s=arc-20160816; b=iYo30fmSaKbM7igNyaGgkN3X2bwUqEXM9f/P+GdRJVsLvQvV8Daqtlc4D3xD6xxlTI u2eU5p/cGq67WnaiO7BovavfIFYsO7iQ0B1tX9rqb7/rrbNsjjJjA5vdf0aowscUddd1 toHjv6LC3ADWpmzw+2dgyTnqMlJTAhN65VOU8qF0/ZyiBx0yNplxB5N6DT+WpsOZ950E JawZgZsCPHdTHiO+afEUjT0tnWe3gNdISToQDsq6jn3Aa+ukwsq/XZWY6g+NvOtRbYov Cy2+hThAXoqMYhO1Y/C1E6l8ZqRbHr04DXZqH0Ru/UxXZqXYlIiddYf63gWa1SEgv3pX 48LQ== 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=0CriircPtC5ExQ5QJKfnKlayKOe8WG6ZDKh8VqSRLTw=; b=S7i/e4M0k9PSRQF8SwJwUJZ7nty7bPQF3eVhuXqrk0Rh+rgYjz+AY6V4QR3EpFe+0z xEYPNln3g9xMQox4sCAGWp2i5QpZIW+WoTZESX5Byb1QLZSt4ygZIDKjEa1jJvvwUuIq BghvuoY6Q3UoZG09sFSgSkCcfgtB3tmhhH/UJTxF9ANrF4g7cLtdzSr3xHE22YUeqzU9 ubBAXqrd4MnZLR5JoklqKfd1f69g0tpnenK9VK4GsfxDuBiPmcjwzGslIN38hfW5ANZD uPizD/+YzUX1U3HdSXNgDNc22gYFNzPYODx0XqGFhwPSrhI9XRqqYjCNReF2ZiA6/wis k5gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2022-7-12 header.b=iVWUXcQi; 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 h20-20020a170906111400b00872236c2747si11329460eja.305.2023.02.06.15.14.59; Mon, 06 Feb 2023 15:15:23 -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=iVWUXcQi; 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 S230018AbjBFXMm (ORCPT + 99 others); Mon, 6 Feb 2023 18:12:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229772AbjBFXMg (ORCPT ); Mon, 6 Feb 2023 18:12:36 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B548C30EA6 for ; Mon, 6 Feb 2023 15:12:33 -0800 (PST) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 316KE2p6029602; Mon, 6 Feb 2023 23:12:28 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=0CriircPtC5ExQ5QJKfnKlayKOe8WG6ZDKh8VqSRLTw=; b=iVWUXcQi3PZ5p5b14zda5RyTLGqGx9+eL3FaftoBoXA+coVyfjZEhqUh3c9lJ4JhiWav rLlVpgMbXYLshDjIzr+a7827NGpGTqY1vbuL/ntWpPviwx0H7UZgJy077vTU/K7al3Ki JGAa73z70CYh/22wj2Icu8QPh3u/S0xySsnWuZlhj1Qn8zPV8Y04MNu7mdc3oFrfbPMF IeLid+9UpfJAdW0lNuFRLb3JuiZ27Fae/TzrdkFYcXJlO5BZRFMXDjp8YFtI6TMDw9Is 9bHfsx0Yd9KZKNsh4pwzajeJBOnmj6V1MlMfF91AW3GhAKO0qa3xc4OTsvclMi7LsKYx iw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3nhdsdm991-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 06 Feb 2023 23:12:27 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 316LpWgs021033; Mon, 6 Feb 2023 23:12:26 GMT Received: from ban25x6uut24.us.oracle.com (ban25x6uut24.us.oracle.com [10.153.73.24]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 3nhdt4sj6f-4; Mon, 06 Feb 2023 23:12:26 +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 RESENT v4 3/6] vdpa: validate provisioned device features against specified attribute Date: Mon, 6 Feb 2023 15:12:01 -0800 Message-Id: <1675725124-7375-4-git-send-email-si-wei.liu@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675725124-7375-1-git-send-email-si-wei.liu@oracle.com> References: <1675725124-7375-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-02-06_07,2023-02-06_03,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 bulkscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 adultscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302060202 X-Proofpoint-ORIG-GUID: vXQnM26dD8UEN7y1bMMm6xxbR58_yLxk X-Proofpoint-GUID: vXQnM26dD8UEN7y1bMMm6xxbR58_yLxk 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?1757125356770082581?= X-GMAIL-MSGID: =?utf-8?q?1757125356770082581?= With device feature provisioning, there's a chance for misconfiguration that the vdpa feature attribute supplied in 'vdpa dev add' command doesn't get selected on the device_features to be provisioned. For instance, when a @mac attribute is specified, the corresponding feature bit _F_MAC in device_features should be set for consistency. If there's conflict on provisioned features against the attribute, it should be treated as an error to fail the ambiguous command. Noted the opposite is not necessarily true, for e.g. it's okay to have _F_MAC set in device_features without providing a corresponding @mac attribute, in which case the vdpa vendor driver could load certain default value for attribute that is not explicitly specified. Generalize this check in vdpa core so that there's no duplicate code in each vendor driver. Signed-off-by: Si-Wei Liu Reviewed-by: Eli Cohen --- drivers/vdpa/vdpa.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index 21c8aa3..1eba978 100644 --- a/drivers/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c @@ -601,8 +601,26 @@ static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct genl_info *i config.mask |= BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MAX_VQP); } if (nl_attrs[VDPA_ATTR_DEV_FEATURES]) { + u64 missing = 0x0ULL; + config.device_features = nla_get_u64(nl_attrs[VDPA_ATTR_DEV_FEATURES]); + if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR] && + !(config.device_features & BIT_ULL(VIRTIO_NET_F_MAC))) + missing |= BIT_ULL(VIRTIO_NET_F_MAC); + if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MTU] && + !(config.device_features & BIT_ULL(VIRTIO_NET_F_MTU))) + missing |= BIT_ULL(VIRTIO_NET_F_MTU); + if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MAX_VQP] && + config.net.max_vq_pairs > 1 && + !(config.device_features & BIT_ULL(VIRTIO_NET_F_MQ))) + missing |= BIT_ULL(VIRTIO_NET_F_MQ); + if (missing) { + NL_SET_ERR_MSG_FMT_MOD(info->extack, + "Missing features 0x%llx for provided attributes", + missing); + return -EINVAL; + } config.mask |= BIT_ULL(VDPA_ATTR_DEV_FEATURES); }