Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp96021pxf; Wed, 10 Mar 2021 01:08:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJASvRPwpVlldOILAw3DKLWHFQ+dfxc4+hSQAQJODY2Jo0ZqHuDTq0+9QfkA0us92lKINA X-Received: by 2002:aa7:dc15:: with SMTP id b21mr2136799edu.350.1615367307462; Wed, 10 Mar 2021 01:08:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615367307; cv=none; d=google.com; s=arc-20160816; b=otUFBvMR9UlhgH39RddbPntXq8YZA3HCdTam52I4kVab6Pu92NLtfWLEnp0w6NDJPs qwVHE8FgVt9k+yNCmeQS+UuU6Fw3SJJgvFoCpRiOD1O8OjztSGArnCCszJjGQS5DPUrO odGbtxYmRq+MaUWpk5LRXmS8AHsw57dlt8y0OnB8cOlxAE0DWqUSUhEbr9K0+tqLeiaW /0qo0qZuU0JqgMdsMJOH+NL+1tf6GZAPL7geYM3Jo78NqkcKLodxXGNVsFM00yZaMvzv ep7HFqO4rNedaGsRJOTgJlnsicLD4fByjjxaSdzVE7PdADmoWDFPsGf3vGOlu9Xzmcox o1hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=0AKYS7Ft0p3XzcuzII+PUZ2TimfwHc5DsDs27llgoRg=; b=gMDhjyuiXePRHnm5hUSXHXXp6+xzaNdn5707vVByDu0OLhbJggRQV6q9Jjn6hvT1Kr 5VhkT2Yo4ObyR16y2cvDWDv1AEinVQ127xCPgjWW1PkhH3J3fB3aEKPnZmiWgY9U4YQT x16Wzbbd3UJ0fkx8TTWztfkfQJakuyOS0INY2C9DMBIvCdnlL5iqjet6QZ81gKoqfuOK fXU+YRZZB+BnFIImtNiRDCgUMJ02eO1o+bS/5GkNl9FdtiiMUoEV3twevHDlDLzV4Hjb hhoMyumGbXoCKnITwdOhm1ILMjo6LMROmSB93tULTa23xuSEMqEeIz65AP8YL5A2UnV6 v0OA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d15si10950437edv.309.2021.03.10.01.08.05; Wed, 10 Mar 2021 01:08:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232655AbhCJJGt (ORCPT + 99 others); Wed, 10 Mar 2021 04:06:49 -0500 Received: from mga03.intel.com ([134.134.136.65]:64352 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232543AbhCJJGR (ORCPT ); Wed, 10 Mar 2021 04:06:17 -0500 IronPort-SDR: 2WBpFZu3OSID21g4un4pdGjC8K1GMCBm3rPJ6pT6xLwccPjXkNpfYOI7H8qHVuux+GaMJFy2jr 9i/5oVF8BDZw== X-IronPort-AV: E=McAfee;i="6000,8403,9917"; a="188461287" X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="188461287" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2021 01:06:16 -0800 IronPort-SDR: UMcHxfR5j1/WESWpiQIfAqBkak8tKIs3NFHxTms4wBzfyUkrE/1nmCm819e05X3EdB8fBU9qRZ ksfqEmaSepUw== X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="410110495" Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.193.73]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2021 01:06:14 -0800 From: Zhu Lingshan To: jasowang@redhat.com, mst@redhat.com, lulu@redhat.com, leonro@nvidia.com Cc: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Zhu Lingshan Subject: [PATCH V3 6/6] vDPA/ifcvf: verify mandatory feature bits for vDPA Date: Wed, 10 Mar 2021 17:00:52 +0800 Message-Id: <20210310090052.4762-7-lingshan.zhu@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210310090052.4762-1-lingshan.zhu@intel.com> References: <20210310090052.4762-1-lingshan.zhu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org vDPA requres VIRTIO_F_ACCESS_PLATFORM as a must, this commit examines this when set features. Signed-off-by: Zhu Lingshan --- drivers/vdpa/ifcvf/ifcvf_base.c | 8 ++++++++ drivers/vdpa/ifcvf/ifcvf_base.h | 1 + drivers/vdpa/ifcvf/ifcvf_main.c | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/drivers/vdpa/ifcvf/ifcvf_base.c b/drivers/vdpa/ifcvf/ifcvf_base.c index ea6a78791c9b..58f47fdce385 100644 --- a/drivers/vdpa/ifcvf/ifcvf_base.c +++ b/drivers/vdpa/ifcvf/ifcvf_base.c @@ -224,6 +224,14 @@ u64 ifcvf_get_features(struct ifcvf_hw *hw) return hw->hw_features; } +int ifcvf_verify_min_features(struct ifcvf_hw *hw) +{ + if (!(hw->hw_features & BIT_ULL(VIRTIO_F_ACCESS_PLATFORM))) + return -EINVAL; + + return 0; +} + void ifcvf_read_net_config(struct ifcvf_hw *hw, u64 offset, void *dst, int length) { diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h index dbb8c10aa3b1..91c5735d4dc9 100644 --- a/drivers/vdpa/ifcvf/ifcvf_base.h +++ b/drivers/vdpa/ifcvf/ifcvf_base.h @@ -123,6 +123,7 @@ void io_write64_twopart(u64 val, u32 *lo, u32 *hi); void ifcvf_reset(struct ifcvf_hw *hw); u64 ifcvf_get_features(struct ifcvf_hw *hw); u64 ifcvf_get_hw_features(struct ifcvf_hw *hw); +int ifcvf_verify_min_features(struct ifcvf_hw *hw); u16 ifcvf_get_vq_state(struct ifcvf_hw *hw, u16 qid); int ifcvf_set_vq_state(struct ifcvf_hw *hw, u16 qid, u16 num); struct ifcvf_adapter *vf_to_adapter(struct ifcvf_hw *hw); diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c index 25fb9dfe23f0..f624f202447d 100644 --- a/drivers/vdpa/ifcvf/ifcvf_main.c +++ b/drivers/vdpa/ifcvf/ifcvf_main.c @@ -179,6 +179,11 @@ static u64 ifcvf_vdpa_get_features(struct vdpa_device *vdpa_dev) static int ifcvf_vdpa_set_features(struct vdpa_device *vdpa_dev, u64 features) { struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev); + int ret; + + ret = ifcvf_verify_min_features(vf); + if (ret) + return ret; vf->req_features = features; -- 2.27.0