Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp636450pxb; Thu, 15 Apr 2021 03:03:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLIcXUj/q1ATn9JjoLGC0+hbmaEdHCqfgOW63RPqTQc0u5g/w6Pb1lXVGkamebowPT81Ai X-Received: by 2002:a50:f30b:: with SMTP id p11mr3167142edm.387.1618481006751; Thu, 15 Apr 2021 03:03:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618481006; cv=none; d=google.com; s=arc-20160816; b=d57K085Hzyk4HCETN7h1q0rr3Zz7849Srg0GyOEnp19RvL234HWWm+efKgusE7nURf +I7G+51kXR5uZQPdnb8VEbV/AxrCsHrIuPdSHHlbx0EmPCRs5cOjjPFJ5dnfQBURateg C90QVJjY9iCjW6Cid+xHFtxTTrYDjd0iXYPFcGHlqwMTYeIG1okJqFSvA2F7+IAECisi TCI9yQOMUbSOSAo6GqdUPR+P7ygCle3xYHTKkdSwEghA5/GPskOhRT5Pnr91tpCmfxNC gDpJuumZXvPxcUMHJ/bSrbWFEwSLP2fAlt7MyCV4qnCR59IC+lcm+tYaX5daGCY+AZgP 6G4w== 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=n0C2A6XJCDBNLe3I3X0c+qPaIZ+9iGQDwsbJIWtJdC0=; b=bFh6ULXE5Gpmr3QFgTvEJ+QPzSKn9VCewpHXaoWOIeM2nWcIZmry4cydllXSvHeg+g SRZVsFqMJJv6fz36JDYD10fvrhw2C9QxP8V5OgC9fxxtveUK3T9cJz/AiMMiM98zo17m 3ksvSmUD7oeTgRCzxwjnNlX5GJc7N3H4DE8oYdULdZ7B7hDsHL78nHeLbOxZN2N/pj7M nl/qOMLneBkgwI1PTpqg5irVjGuWBdWHMU9pj3fN8rjr+ZY7ZQK7+hsu5n4Vtz6/A2iV Xr/pzvQU5UvTx62KaucLrJnzqUXwp29aWXx7V2VMvI/eO7OmZhelVmPFySOE0TL86LKy e2Ag== 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 eb8si2050588edb.103.2021.04.15.03.03.02; Thu, 15 Apr 2021 03:03:26 -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 S232307AbhDOJ7e (ORCPT + 99 others); Thu, 15 Apr 2021 05:59:34 -0400 Received: from mga12.intel.com ([192.55.52.136]:65315 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232294AbhDOJ71 (ORCPT ); Thu, 15 Apr 2021 05:59:27 -0400 IronPort-SDR: JQ3u8krA8A+ayFzI4RMAF7KRbmoAaPBZCyb8UGh7yMne5eEXvmjWnTtp/EWxW1xFQJ//dxXy99 BrFUSNzC6h1Q== X-IronPort-AV: E=McAfee;i="6200,9189,9954"; a="174321448" X-IronPort-AV: E=Sophos;i="5.82,223,1613462400"; d="scan'208";a="174321448" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2021 02:59:04 -0700 IronPort-SDR: AptOkeCkx0s85LJH4TjZFNfA6zvizGwZ6gcGZdSPqAVxuz7Jhl2t0gjF59bMkolL3BBGabWYZy vOdRc4Ipknxg== X-IronPort-AV: E=Sophos;i="5.82,223,1613462400"; d="scan'208";a="425123484" 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; 15 Apr 2021 02:59:01 -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 V2 3/3] vDPA/ifcvf: get_config_size should return dev specific config size Date: Thu, 15 Apr 2021 17:53:36 +0800 Message-Id: <20210415095336.4792-4-lingshan.zhu@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210415095336.4792-1-lingshan.zhu@intel.com> References: <20210415095336.4792-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 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c index cea1313b1a3f..6844c49fe1de 100644 --- a/drivers/vdpa/ifcvf/ifcvf_main.c +++ b/drivers/vdpa/ifcvf/ifcvf_main.c @@ -347,7 +347,23 @@ 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; + + if (vf->dev_type == VIRTIO_ID_NET) + size = sizeof(struct virtio_net_config); + + else if (vf->dev_type == VIRTIO_ID_BLOCK) + size = sizeof(struct virtio_blk_config); + + else { + 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