Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2CDB336E for ; Wed, 8 Feb 2023 05:24:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675833865; x=1707369865; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=dU7w0TBrSrIdIYJms8Qb9NuKI4fw5vUjPE8FdmU+g/s=; b=eobk+6PlbsfJS84cvppB41gJwnD6631WtGZhiGpJa25I/WLPv4XeCMDT wV4CQMq9DnCsXGcK0FG8NGVYJwsQt/AKd6dQpNt0BP484nDInxzk5pHag 99zcK926furtJP6rNzkDO1WV3IKCZU+0d8a/wvOdJnFXvQ9cLB9nXnfu8 Npg+PthRGqyWgcRZWJhCeLou5JlNKnQxhgYA3+Fe+BIjBRDsdpRxBHjU0 QshZvp8ZgmDogJGiTKG/DInVwPIeJAul88R6AelBCYakBWyDQqe4pTnu7 lmeQNNWQSCJvacIj94Dq4mBGDbJqG15jzs3H1BtS8olE4WMmZMw3T+Qzv A==; X-IronPort-AV: E=McAfee;i="6500,9779,10614"; a="329741321" X-IronPort-AV: E=Sophos;i="5.97,280,1669104000"; d="scan'208";a="329741321" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2023 21:24:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10614"; a="841045809" X-IronPort-AV: E=Sophos;i="5.97,280,1669104000"; d="scan'208";a="841045809" Received: from allen-box.sh.intel.com ([10.239.159.48]) by orsmga005.jf.intel.com with ESMTP; 07 Feb 2023 21:24:22 -0800 From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Will Deacon , Robin Murphy , Kevin Tian , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 1/1] iommu/vt-d: Fix error handling in sva enable/disable paths Date: Wed, 8 Feb 2023 13:15:59 +0800 Message-Id: <20230208051559.700109-1-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Roll back all previous actions in error paths of intel_iommu_enable_sva() and intel_iommu_disable_sva(). Fixes: d5b9e4bfe0d8 ("iommu/vt-d: Report prq to io-pgfault framework") Signed-off-by: Lu Baolu --- drivers/iommu/intel/iommu.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index a049178cd9f8..36d1867159d7 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -4650,8 +4650,12 @@ static int intel_iommu_enable_sva(struct device *dev) return -EINVAL; ret = iopf_queue_add_device(iommu->iopf_queue, dev); - if (!ret) - ret = iommu_register_device_fault_handler(dev, iommu_queue_iopf, dev); + if (ret) + return ret; + + ret = iommu_register_device_fault_handler(dev, iommu_queue_iopf, dev); + if (ret) + iopf_queue_remove_device(iommu->iopf_queue, dev); return ret; } @@ -4663,8 +4667,12 @@ static int intel_iommu_disable_sva(struct device *dev) int ret; ret = iommu_unregister_device_fault_handler(dev); - if (!ret) - ret = iopf_queue_remove_device(iommu->iopf_queue, dev); + if (ret) + return ret; + + ret = iopf_queue_remove_device(iommu->iopf_queue, dev); + if (ret) + iommu_register_device_fault_handler(dev, iommu_queue_iopf, dev); return ret; } -- 2.34.1