Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp104617pxb; Fri, 16 Apr 2021 00:24:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDCqRQX4W0H09gIwDJdLxTc3UdLN9HsHsguDfbqltXZzSp3QmoKqGbtysDArArjEKM/SXh X-Received: by 2002:a17:907:75d5:: with SMTP id jl21mr7155024ejc.408.1618557871084; Fri, 16 Apr 2021 00:24:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618557871; cv=none; d=google.com; s=arc-20160816; b=FbyzYnVsstAKZ56ucIGpCy+CuCd8KkCu41Jwt5Dsx1gyd9y58I1QQDW0dg/MhtQ5QC VZ90W/wgkH130kmN9EkSdd1ORClTEohmMvI1VOGVzmv1xh/jEa3YZYt+nxy52xduW7kw ufR8Yr5GevCYURLCyIOYxUS1ZKaEDXfChOoqr6X/C2fiY9vG+Kt05D8m/WOkuvZ5932y JrgaxOqCBylBjBjA4K8/pBdIee6UOZHc5aVIJmNgUFJYl6Q5sEP7PblvLgGlaLhDTV6f vcFhNb5+fgldUqoxbxNSSX7Qo2qadI3bDpIEBMC9jTIPxKMAJj/N1U6nGQ0AfiZKAmMe pu8g== 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=mwez+Z3igyatnfumDRsXWLP3mKCuLEY9MFE6EIeHnNQ=; b=KEwgCxppGFXEjbvBr3UG5dgwtoEPdB4oHoofHGTrXELfXsHle4vLLoUcGY8ad5/1d3 Vx9SVZeJldOZ+qFGq3FTiHzme9YZMcFfoHZwizWuF+Klam5B+1dWOY7Oe0zD62U674bd bJtAxRqFZO76POBf3I9Z7PrGgpfBkm/kSW7Rprz4AOfFE0xS6Fx5Pk90D6nvZTNHHLTL FwoUWzFfvzfn3/ke5tqztvNCekJfsHqGDvMrlH+77+tvM/d+MAbhST0vUC7AxZfOou0T d4yFpuqFPRkxYDu51ZC5LTqhg+Kv3AbrKfQAY88g07+0mkPERVIU0DPUCl+KGt8AfWF3 hKPQ== 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 w15si1301292edr.136.2021.04.16.00.24.08; Fri, 16 Apr 2021 00:24:31 -0700 (PDT) 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 S239513AbhDPHW3 (ORCPT + 99 others); Fri, 16 Apr 2021 03:22:29 -0400 Received: from mga14.intel.com ([192.55.52.115]:57485 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239271AbhDPHW1 (ORCPT ); Fri, 16 Apr 2021 03:22:27 -0400 IronPort-SDR: nnHSKsVdR1aKfBTU8DYCPNDMeCMhO+U0YQ227D+R2pvenNL91sOJvl1yu6RMUY6ngJWtg4YYle AgxLeM9Lbqjg== X-IronPort-AV: E=McAfee;i="6200,9189,9955"; a="194561115" X-IronPort-AV: E=Sophos;i="5.82,226,1613462400"; d="scan'208";a="194561115" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2021 00:22:03 -0700 IronPort-SDR: aEUdZ80edj3XHNnznvC+Sg6M6e6RqRDyhVnkOWA16iGpMx+g5D5441uXJLBCK+TtSIVq9zRqV5 F0SAW4AN2t6g== X-IronPort-AV: E=Sophos;i="5.82,226,1613462400"; d="scan'208";a="425489818" 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; 16 Apr 2021 00:21:59 -0700 From: Zhu Lingshan To: jasowang@redhat.com, mst@redhat.com, lulu@redhat.com, sgarzare@redhat.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 3/3] vDPA/ifcvf: get_config_size should return dev specific config size Date: Fri, 16 Apr 2021 15:16:28 +0800 Message-Id: <20210416071628.4984-4-lingshan.zhu@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210416071628.4984-1-lingshan.zhu@intel.com> References: <20210416071628.4984-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 get_config_size() should return the size based on the decected device type. Signed-off-by: Zhu Lingshan --- drivers/vdpa/ifcvf/ifcvf_main.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c index 376b2014916a..3b6f7862dbb8 100644 --- a/drivers/vdpa/ifcvf/ifcvf_main.c +++ b/drivers/vdpa/ifcvf/ifcvf_main.c @@ -356,7 +356,24 @@ static u32 ifcvf_vdpa_get_vq_align(struct vdpa_device *vdpa_dev) static size_t ifcvf_vdpa_get_config_size(struct vdpa_device *vdpa_dev) { - return sizeof(struct virtio_net_config); + struct ifcvf_adapter *adapter = vdpa_to_adapter(vdpa_dev); + struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev); + struct pci_dev *pdev = adapter->pdev; + size_t size; + + switch (vf->dev_type) { + case VIRTIO_ID_NET: + size = sizeof(struct virtio_net_config); + break; + case VIRTIO_ID_BLOCK: + size = sizeof(struct virtio_blk_config); + break; + default: + size = 0; + IFCVF_ERR(pdev, "VIRTIO ID %u not supported\n", vf->dev_type); + } + + return size; } static void ifcvf_vdpa_get_config(struct vdpa_device *vdpa_dev, -- 2.27.0