Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp3548912pxb; Wed, 14 Apr 2021 08:01:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwD6RDxx6GOsbl/AS+2dRRCFugUHkPIfic2bYEWh6YDzqeMW9/gi4PbCzS7ZJ5wV6SPUSsA X-Received: by 2002:a63:ff22:: with SMTP id k34mr4152336pgi.336.1618412508666; Wed, 14 Apr 2021 08:01:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618412508; cv=none; d=google.com; s=arc-20160816; b=ApoLJubvtZ4hg8SpgW4HPI9ju0pkHz4c1JNEeFY2LQ1DfGGr+r/uBUEqfY9JJUS49v 15Sgpek9kpQzjQMytI2h+bdelAVjtojNdNZ2WSFf6yioLRe6j80MwA9qVaPsRi8ygiaD kyM/aB8vYFUD4dbeej5UtPDdl2/jId1HgKhVXrEsZwSxWs4WZ93jLft3WAgXG1YO4TYh bYwXNLEyK8CzYmNL6uhMsao0yc+W0QPOa+1OKloTTJoXhLTwOVjf+FPVtArPbiy5ZQ+U gOtb06Sgx2B0UUiEmVKsk/LADhS6TUZWrwJPjZvi8G0W3YUrkAfv/TZVf96X7rODF0lY BSTg== 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=HSgG3UUcAdiXcYPfW/22OUsui2yxNCvfFxfyZnx2W1c=; b=os5oIxMLSdb8lbkCCh66rsphYpbNPQ3B05ReHlxjGa5PggMGy4lc2NV2VvAbxU6qXV pgOsxwVy+oVDQUsaanBRfPoMlC+Pl4Eny61sdTriDJf4gmLfwVxPTSz1D2NNq7a31k9q Wit6JlNkV/D8kJrKt1CUxJ5Bl0xAE10GtlH1YWfuU2YOUrNtlwyGtpoAvObYJihiHOrS LrvssBE582FZnv+VRPV6hAewBaQ9W5tcB5g5RTJNFIRanRzSVuExtvr4lLGlZwJ5TXME WmDQXsfZKXfVIGjSU1GIiIl4eWlBPPzb5xhVcLddP0AEp8F9xolLfZbuiuCo4FcNIvSI 8iwA== 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 p10si7521300pjv.114.2021.04.14.08.01.34; Wed, 14 Apr 2021 08:01:48 -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 S1348698AbhDNJYz (ORCPT + 99 others); Wed, 14 Apr 2021 05:24:55 -0400 Received: from mga17.intel.com ([192.55.52.151]:26135 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350278AbhDNJYd (ORCPT ); Wed, 14 Apr 2021 05:24:33 -0400 IronPort-SDR: 1gamoEltVEOeC9yc18sbTKA9NC2z8g3BWxDF15fRxUZnSTLIojzYxUI1vLKJW7qneb/nPiTkMT W2hlh/7vuoAA== X-IronPort-AV: E=McAfee;i="6200,9189,9953"; a="174709620" X-IronPort-AV: E=Sophos;i="5.82,221,1613462400"; d="scan'208";a="174709620" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2021 02:24:11 -0700 IronPort-SDR: Z+lCQ2wpwHMYl9Ms9Fo0q5WnUi2F2x6tcWxAgSrwJ6QWzTjiuzgM9J23MPeqObhjGGhh0n5UZj 0XbC13vOlfdQ== X-IronPort-AV: E=Sophos;i="5.82,221,1613462400"; d="scan'208";a="424648494" 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; 14 Apr 2021 02:24:08 -0700 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 3/3] vDPA/ifcvf: get_config_size should return dev specific config size Date: Wed, 14 Apr 2021 17:18:32 +0800 Message-Id: <20210414091832.5132-4-lingshan.zhu@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210414091832.5132-1-lingshan.zhu@intel.com> References: <20210414091832.5132-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 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c index 9b6a38b798fa..b48b9789b69e 100644 --- a/drivers/vdpa/ifcvf/ifcvf_main.c +++ b/drivers/vdpa/ifcvf/ifcvf_main.c @@ -347,7 +347,16 @@ 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_hw *vf = vdpa_to_vf(vdpa_dev); + size_t size; + + if (vf->dev_type == VIRTIO_ID_NET) + size = sizeof(struct virtio_net_config); + + if (vf->dev_type == VIRTIO_ID_BLOCK) + size = sizeof(struct virtio_blk_config); + + return size; } static void ifcvf_vdpa_get_config(struct vdpa_device *vdpa_dev, -- 2.27.0