Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <88a9afd9-eb2d-55b0-e65e-dec209a5bba3@arm.com>
Date:   Fri, 2 Jun 2023 10:27:39 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:102.0) Gecko/20100101
 Thunderbird/102.11.2
Subject: Re: [PATCH v2 1/2] iommu/vt-d: Handle the failure case of
 dmar_reenable_qi()
To:     Yanfei Xu <yanfei.xu@intel.com>, dwmw2@infradead.org,
        baolu.lu@linux.intel.com, joro@8bytes.org, will@kernel.org
Cc:     iommu@lists.linux.dev, linux-kernel@vger.kernel.org
References: <20230602020520.224465-1-yanfei.xu@intel.com>
 <20230602020520.224465-2-yanfei.xu@intel.com>
Content-Language: en-GB
From:   Robin Murphy <robin.murphy@arm.com>
In-Reply-To: <20230602020520.224465-2-yanfei.xu@intel.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 2023-06-02 03:05, Yanfei Xu wrote:
> dmar_reenable_qi() may not succeed. Check and return when it fails.
> 
> Signed-off-by: Yanfei Xu <yanfei.xu@intel.com>
> ---
>   drivers/iommu/intel/iommu.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
> index 8096273b034c..e9188d045609 100644
> --- a/drivers/iommu/intel/iommu.c
> +++ b/drivers/iommu/intel/iommu.c
> @@ -2967,10 +2967,14 @@ static int init_iommu_hw(void)
>   {
>   	struct dmar_drhd_unit *drhd;
>   	struct intel_iommu *iommu = NULL;
> +	int ret;
>   
> -	for_each_active_iommu(iommu, drhd)
> +	for_each_active_iommu(iommu, drhd) {
>   		if (iommu->qi)
> -			dmar_reenable_qi(iommu);
> +			ret = dmar_reenable_qi(iommu);
> +		if (ret)

Nit: either this should be inside the previous condition, or you need to 
initialise ret to 0.

Thanks,
Robin.

> +			return ret;
> +	}
>   
>   	for_each_iommu(iommu, drhd) {
>   		if (drhd->ignored) {