From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4867C3DA7A for ; Fri, 6 Jan 2023 11:35:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232591AbjAFLfS (ORCPT ); Fri, 6 Jan 2023 06:35:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232487AbjAFLew (ORCPT ); Fri, 6 Jan 2023 06:34:52 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA91B6C28C; Fri, 6 Jan 2023 03:34:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673004891; x=1704540891; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=h52bTybgotE/+arZH7dQLP3uJT6YAOrJvSJlk08qNYs=; b=MjN84eFLtuzD7Bpwbp/vsJ9IdpUcwYqn37ZDvS4XXWdyRPr/FUsp7qBa oPXpawbw4CvM56gBWRb3UY5OKZS1LBXmPH+WdbAjekQKem4rZWmtOa+2v IQ+a0JrMEimnBE6MmlECCFu2xs+3jaGYzcwF2WUqw1upBOkYa8FPSTa6K 8brwitgPvwmc0zFck6o7gAvIjdI4imuhhdtTRSFAB2zPWYbqx9im7XFFg iwtLtdCONT/IBRujUFxV4DcM4B5TWI+3DP3OQUCv+/LGd7I+lupVeG1vG X8KAkY7Jh/5BG1BHBXJVJ4hQ1PUNl4+1DLzjPYP812AzKJ7ZpUkNtr92M g==; X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="322531841" X-IronPort-AV: E=Sophos;i="5.96,305,1665471600"; d="scan'208";a="322531841" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2023 03:34:51 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="655934700" X-IronPort-AV: E=Sophos;i="5.96,305,1665471600"; d="scan'208";a="655934700" Received: from blu2-mobl.ccr.corp.intel.com (HELO [10.254.211.214]) ([10.254.211.214]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2023 03:34:43 -0800 Message-ID: <654b8a24-e5a5-07b1-3127-46df80c1b545@linux.intel.com> Date: Fri, 6 Jan 2023 19:34:41 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: [PATCH iommufd v3 3/9] vfio/type1: Convert to iommu_group_has_isolated_msi() Content-Language: en-US To: Jason Gunthorpe , Alexander Gordeev , Alex Williamson , Christian Borntraeger , Cornelia Huck , David Woodhouse , Gerald Schaefer , Vasily Gorbik , Heiko Carstens , iommu@lists.linux.dev, Joerg Roedel , kvm@vger.kernel.org, linux-s390@vger.kernel.org, Marc Zyngier , Robin Murphy , Suravee Suthikulpanit , Sven Schnelle , Thomas Gleixner , Will Deacon Cc: Bharat Bhushan , Christian Borntraeger , Eric Auger , Eric Farman , Kevin Tian , Marc Zyngier , Matthew Rosato , Tomasz Nowicki , Will Deacon References: <3-v3-3313bb5dd3a3+10f11-secure_msi_jgg@nvidia.com> From: Baolu Lu In-Reply-To: <3-v3-3313bb5dd3a3+10f11-secure_msi_jgg@nvidia.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 1/6/2023 3:33 AM, Jason Gunthorpe wrote: > Trivially use the new API. > > Tested-by: Matthew Rosato > Reviewed-by: Kevin Tian > Signed-off-by: Jason Gunthorpe > --- > drivers/vfio/vfio_iommu_type1.c | 16 +++------------- > 1 file changed, 3 insertions(+), 13 deletions(-) > > diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c > index 23c24fe98c00d4..393b27a3bd87ee 100644 > --- a/drivers/vfio/vfio_iommu_type1.c > +++ b/drivers/vfio/vfio_iommu_type1.c > @@ -37,7 +37,6 @@ > #include > #include > #include > -#include > #include "vfio.h" > > #define DRIVER_VERSION "0.2" > @@ -2160,12 +2159,6 @@ static void vfio_iommu_iova_insert_copy(struct vfio_iommu *iommu, > list_splice_tail(iova_copy, iova); > } > > -/* Redundantly walks non-present capabilities to simplify caller */ > -static int vfio_iommu_device_capable(struct device *dev, void *data) > -{ > - return device_iommu_capable(dev, (enum iommu_cap)data); > -} > - > static int vfio_iommu_domain_alloc(struct device *dev, void *data) > { > struct iommu_domain **domain = data; > @@ -2180,7 +2173,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, > struct vfio_iommu *iommu = iommu_data; > struct vfio_iommu_group *group; > struct vfio_domain *domain, *d; > - bool resv_msi, msi_remap; > + bool resv_msi; > phys_addr_t resv_msi_base = 0; > struct iommu_domain_geometry *geo; > LIST_HEAD(iova_copy); > @@ -2278,11 +2271,8 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, > INIT_LIST_HEAD(&domain->group_list); > list_add(&group->next, &domain->group_list); > > - msi_remap = irq_domain_check_msi_remap() || > - iommu_group_for_each_dev(iommu_group, (void *)IOMMU_CAP_INTR_REMAP, > - vfio_iommu_device_capable); > - > - if (!allow_unsafe_interrupts && !msi_remap) { > + if (!allow_unsafe_interrupts && > + !iommu_group_has_isolated_msi(iommu_group)) { > pr_warn("%s: No interrupt remapping support. Use the module param \"allow_unsafe_interrupts\" to enable VFIO IOMMU support on this platform\n", > __func__); > ret = -EPERM; Reviewed-by: Lu Baolu -- Best regards, baolu