From patchwork Mon Feb 6 23:07:56 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: 53547 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2514461wrn; Mon, 6 Feb 2023 15:10:34 -0800 (PST) X-Google-Smtp-Source: AK7set9F90Wlc8wjzbD4qtaQjyhx2uQaOVzfY9qNZ0Lmn6KVEVIFVNwqYGN55Ogkd4PwdcPh/sef X-Received: by 2002:a05:6a20:4422:b0:be:9893:fd82 with SMTP id ce34-20020a056a20442200b000be9893fd82mr1358295pzb.23.1675725034329; Mon, 06 Feb 2023 15:10:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675725034; cv=none; d=google.com; s=arc-20160816; b=rsVRlSgS3OcAWtr9fOupx53xOVlz7xTjwlQfl7UGKYxQSMrm/Zaxqfk4+WB1RwTqp7 m/CFR3mLTsrbMNse+ViKa/n+QKlEEReEEfXOFcHuVmIy6LYU30s4qYp9aM058Y35nOzk BMonauNGIIPBijsL4CwHY7kg/pUVgpPGkfKLpE7UHfyzBAfTrxRRN2AuP2Y1VUlc2lsw Y620yu0HS602NCByQqk1bKPrLESZ8eMnRpw1EVxVm6wmIscZcBEprv1tn2UwMtUsI1w0 SFsiDdD1MXxyMMvRN7WJbzmZnDWxAUD9songCvom31t2ahK35Ucw6Ih4HjUo3uL0Qgn6 /yJA== 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=Qu7xVQBjH3QyINlgGCfvRYdJpf2OQd6ZDfiujBCmENo=; b=D41H3QiPMzE0+5pyrE2jBEIUWorTfoEzwjBHd2Mi1Rq3j/iGIBcNF4lASf4e/0eUOo i5dXRRkVyOlKk/OvJFuMICt57G75ieldegC2LTAM6e9jmlwxTNzviqeR0HPgDNOAjxlW UMIAl5+CrwKU7uiUhAgWBm5C4nq+6+RJ+fz1ou+vU/CWYBLTCA79sBISc+9ysvfkGyeH Z9WxalRfbBizH6QD1wmDpKjQBgqg9c0T97j3ECnForsizYQB2lMMEZzgSqbtAX0ZVo7X lE+I3k/jePHzjvp9nPRBseg8dzXnqXPZrSW8vsBQp1HmVoZCKa+Z6Sqk80R67MHxu0KA N37A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2022-7-12 header.b=jwjdbVup; 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 g2-20020aa79dc2000000b0058b9025bd61si12753382pfq.53.2023.02.06.15.10.21; Mon, 06 Feb 2023 15:10:34 -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=jwjdbVup; 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 S230121AbjBFXJC (ORCPT + 99 others); Mon, 6 Feb 2023 18:09:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230239AbjBFXIs (ORCPT ); Mon, 6 Feb 2023 18:08:48 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D503032518 for ; Mon, 6 Feb 2023 15:08:25 -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 316KE2cp029642; Mon, 6 Feb 2023 23:08:21 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=Qu7xVQBjH3QyINlgGCfvRYdJpf2OQd6ZDfiujBCmENo=; b=jwjdbVupt1DL9lAebZ6X95nhiRPZrkyLLP2z4h7GZLKmuHV8OR/PEBLfT2pZgY3vI+R0 lrXGjBxK9fGxAgbPudJD5Ks1TufABcWSDHVHOxyfD42btIXwwDtBrr5B3fhTFE5+vF11 FS0G0werPDjvwAs410Vz36IfVVmxWDsSQsvAQ7UqKdRo5r3+acVMFElOPB98kAWWMqjc IfOBD3smi1558c8iOohyLD4+HLsl/SKVI5u6swNPkkSYK33OQpHq5GYDW2B7mjpwJvrk 2tz/EmWSLbXwhwPEGu/QVDHIX8CRX08oPFaWrKpx6OGgN9HG+pdsCGiC2ycoiYIrCdxF QQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3nhdsdm92w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 06 Feb 2023 23:08:21 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 316LbeUK040865; Mon, 6 Feb 2023 23:08:20 GMT Received: from ban25x6uut24.us.oracle.com (ban25x6uut24.us.oracle.com [10.153.73.24]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3nhdtb99m7-3; Mon, 06 Feb 2023 23:08:20 +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 v3 2/6] vdpa: conditionally read STATUS in config space Date: Mon, 6 Feb 2023 15:07:56 -0800 Message-Id: <1675724880-7216-3-git-send-email-si-wei.liu@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1675724880-7216-1-git-send-email-si-wei.liu@oracle.com> References: <1675724880-7216-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 spamscore=0 mlxlogscore=999 mlxscore=0 adultscore=0 phishscore=0 suspectscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302060202 X-Proofpoint-ORIG-GUID: EnboAqUy1AWuiPc9-H8a8pgd6zaWJ0To X-Proofpoint-GUID: EnboAqUy1AWuiPc9-H8a8pgd6zaWJ0To 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?1757125053254039637?= X-GMAIL-MSGID: =?utf-8?q?1757125053254039637?= The spec says: status only exists if VIRTIO_NET_F_STATUS is set Similar to MAC and MTU, vdpa_dev_net_config_fill() should read STATUS conditionally depending on the feature bits. Signed-off-by: Si-Wei Liu Reviewed-by: Parav Pandit Reviewed-by: Eli Cohen --- drivers/vdpa/vdpa.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index 3a82ca78..21c8aa3 100644 --- a/drivers/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c @@ -843,18 +843,25 @@ static int vdpa_dev_net_mac_config_fill(struct sk_buff *msg, u64 features, sizeof(config->mac), config->mac); } +static int vdpa_dev_net_status_config_fill(struct sk_buff *msg, u64 features, + const struct virtio_net_config *config) +{ + u16 val_u16; + + if ((features & BIT_ULL(VIRTIO_NET_F_STATUS)) == 0) + return 0; + + val_u16 = __virtio16_to_cpu(true, config->status); + return nla_put_u16(msg, VDPA_ATTR_DEV_NET_STATUS, val_u16); +} + static int vdpa_dev_net_config_fill(struct vdpa_device *vdev, struct sk_buff *msg) { struct virtio_net_config config = {}; u64 features_device; - u16 val_u16; vdev->config->get_config(vdev, 0, &config, sizeof(config)); - val_u16 = __virtio16_to_cpu(true, config.status); - if (nla_put_u16(msg, VDPA_ATTR_DEV_NET_STATUS, val_u16)) - return -EMSGSIZE; - features_device = vdev->config->get_device_features(vdev); if (nla_put_u64_64bit(msg, VDPA_ATTR_DEV_FEATURES, features_device, @@ -867,6 +874,9 @@ static int vdpa_dev_net_config_fill(struct vdpa_device *vdev, struct sk_buff *ms if (vdpa_dev_net_mac_config_fill(msg, features_device, &config)) return -EMSGSIZE; + if (vdpa_dev_net_status_config_fill(msg, features_device, &config)) + return -EMSGSIZE; + return vdpa_dev_net_mq_config_fill(msg, features_device, &config); }