From patchwork Mon Feb 6 23:12:00 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: 53552 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2515485wrn; Mon, 6 Feb 2023 15:12:54 -0800 (PST) X-Google-Smtp-Source: AK7set893eqLWiwcaw+J1+FeycMVoj+oS51QHmDT2Ac1QDvbkFqqrrapmYv0hsY3UB6RaVCsEdPI X-Received: by 2002:a17:902:9a45:b0:198:f1c4:dd5a with SMTP id x5-20020a1709029a4500b00198f1c4dd5amr523203plv.17.1675725173738; Mon, 06 Feb 2023 15:12:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675725173; cv=none; d=google.com; s=arc-20160816; b=zoVK5Z/LO4upvAB91hvOQLMl3TMIP227sxwkZDgssvl30eOUIjW/kbYUmN2J2Dy1yi q1sokijhThmGYVqvkSocW+ye5Rp03CLOlXDFCL5rn95KfWN3csFlHdoU7haM5SKKPMaj efBgzEyG9Tos03JyTIn091C7/BIyLlSyN1YLr9qQg3arL8MoPimrZHdXasyQN87L09i6 BrWByDj6qV0PrDIhH2CBLfPg6uJAhEWoTJdo2eJe88TRbVGmwjzN4qDUXPrwTTgJ+Jx3 ZKjxu4DGFzVFhWuKZuVytGplnihuJNbazQxAVXt0OfYdV05QthWBr3/sXE3g4/n7b/B3 z07Q== 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=GHic99hz/fEGfgcHBMAjJUtz1+W1aX9rCPjtmIpFCjoGbAxDIKD32zVs5rN8EQaT6u 5bXmQP9Aj6U54XfB+9GCvIsl/TZfYsFGkOuMaha/jo2aLEJYfJ66vd6u1yE5iCFtH/c8 XigoHFeycXuiLb4biZFDbpk8vJrEpS9DbKzJefeWqjnvwtiYlhFhjNl28Gn0Y2q7PviT ynHP5uRRNn/On18zW13FcxFdXm4VvQgqLW+SWouguBs8M+B7c73EHXaFLrZScfALfj7N JTZVIcLzFHozKtsMbEj+mWE1Gt0QYb5RxNmv9bKrO9LYy75l1uxuh3sw4V3aTbx82K+l nlNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2022-7-12 header.b=Vo72+tj9; 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 u6-20020a170902e80600b00198fbf41935si8739726plg.76.2023.02.06.15.12.41; Mon, 06 Feb 2023 15:12:53 -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=Vo72+tj9; 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 S229657AbjBFXMc (ORCPT + 99 others); Mon, 6 Feb 2023 18:12:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229615AbjBFXMb (ORCPT ); Mon, 6 Feb 2023 18:12:31 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 178B43AA9 for ; Mon, 6 Feb 2023 15:12:30 -0800 (PST) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 316KE5p1028043; Mon, 6 Feb 2023 23:12:26 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=Vo72+tj9qTKIsQzCl06l7/pvPMZ8ENcIEgXrnFkXJfMxAxu8a/qG6Y7+PcqhcJF/slZx 12PKvWVhuVY67YvwHC98xaoPy5MvOwyCrpoPWNIaQy3PW0xc4NSjZH3RYR8oGVtaKudb 96iqmWK1LwJIUxHydECHmYFhaBEhC7+plitl1WdHUcjZDow6PCtTYfefIInjwgLKjYy/ Qsnv8a3JlSWLWXNUjVCgkg6Gfqs0J5bRYIqGcu05HjVvUOb3NzDzWXwdnjQ00c+fi0sC X932WN+Caj6tT+N+OpxSwvfoJ16K7WFLY9nYtztO69a9SO15fOu3hfNaK4GpmMyKipBD 5A== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3nhdy1480k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 06 Feb 2023 23:12:26 +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 316LpWgr021033; Mon, 6 Feb 2023 23:12:25 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-3; Mon, 06 Feb 2023 23:12:25 +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 2/6] vdpa: conditionally read STATUS in config space Date: Mon, 6 Feb 2023 15:12:00 -0800 Message-Id: <1675725124-7375-3-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-GUID: CWXNbnUoI1Kyj90cUxoll5WntXaSGl8Y X-Proofpoint-ORIG-GUID: CWXNbnUoI1Kyj90cUxoll5WntXaSGl8Y 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?1757125199797706315?= X-GMAIL-MSGID: =?utf-8?q?1757125199797706315?= 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); }