All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nicolin Chen <nicolinc@nvidia.com>
To: <joro@8bytes.org>, <suravee.suthikulpanit@amd.com>,
	<will@kernel.org>, <robin.murphy@arm.com>, <robdclark@gmail.com>,
	<dwmw2@infradead.org>, <baolu.lu@linux.intel.com>,
	<agross@kernel.org>, <bjorn.andersson@linaro.org>,
	<konrad.dybcio@somainline.org>, <matthias.bgg@gmail.com>,
	<heiko@sntech.de>, <orsonzhai@gmail.com>,
	<baolin.wang@linux.alibaba.com>, <zhang.lyra@gmail.com>,
	<thierry.reding@gmail.com>, <jean-philippe@linaro.org>,
	<jgg@nvidia.com>, <sricharan@codeaurora.org>
Cc: <yong.wu@mediatek.com>, <vdumpa@nvidia.com>,
	<jonathanh@nvidia.com>, <tglx@linutronix.de>,
	<shameerali.kolothum.thodi@huawei.com>,
	<thunder.leizhen@huawei.com>, <christophe.jaillet@wanadoo.fr>,
	<yangyingliang@huawei.com>, <jon@solid-run.com>,
	<iommu@lists.linux.dev>, <linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-arm-msm@vger.kernel.org>,
	<linux-mediatek@lists.infradead.org>,
	<linux-rockchip@lists.infradead.org>,
	<linux-tegra@vger.kernel.org>,
	<virtualization@lists.linux-foundation.org>
Subject: [PATCH 2/5] iommu/amd: Drop unnecessary checks in amd_iommu_attach_device()
Date: Tue, 13 Sep 2022 01:24:45 -0700	[thread overview]
Message-ID: <20220913082448.31120-3-nicolinc@nvidia.com> (raw)
In-Reply-To: <20220913082448.31120-1-nicolinc@nvidia.com>

The same checks are done in amd_iommu_probe_device(). If any of them fails
there, then the device won't get a group, so there's no way for it to even
reach amd_iommu_attach_device any more.

Suggested-by: Robin Murphy <robin.murphy@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
 drivers/iommu/amd/iommu.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 828672a46a3d..930d9946b9f7 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2135,21 +2135,13 @@ static void amd_iommu_detach_device(struct iommu_domain *dom,
 static int amd_iommu_attach_device(struct iommu_domain *dom,
 				   struct device *dev)
 {
+	struct iommu_dev_data *dev_data = dev_iommu_priv_get(dev);
 	struct protection_domain *domain = to_pdomain(dom);
-	struct iommu_dev_data *dev_data;
-	struct amd_iommu *iommu;
+	struct amd_iommu *iommu = rlookup_amd_iommu(dev);
 	int ret;
 
-	if (!check_device(dev))
-		return -EINVAL;
-
-	dev_data = dev_iommu_priv_get(dev);
 	dev_data->defer_attach = false;
 
-	iommu = rlookup_amd_iommu(dev);
-	if (!iommu)
-		return -EINVAL;
-
 	if (dev_data->domain)
 		detach_device(dev);
 
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
From: Nicolin Chen <nicolinc@nvidia.com>
To: <joro@8bytes.org>, <suravee.suthikulpanit@amd.com>,
	<will@kernel.org>, <robin.murphy@arm.com>, <robdclark@gmail.com>,
	<dwmw2@infradead.org>, <baolu.lu@linux.intel.com>,
	<agross@kernel.org>, <bjorn.andersson@linaro.org>,
	<konrad.dybcio@somainline.org>, <matthias.bgg@gmail.com>,
	<heiko@sntech.de>, <orsonzhai@gmail.com>,
	<baolin.wang@linux.alibaba.com>, <zhang.lyra@gmail.com>,
	<thierry.reding@gmail.com>, <jean-philippe@linaro.org>,
	<jgg@nvidia.com>, <sricharan@codeaurora.org>
Cc: <yong.wu@mediatek.com>, <vdumpa@nvidia.com>,
	<jonathanh@nvidia.com>, <tglx@linutronix.de>,
	<shameerali.kolothum.thodi@huawei.com>,
	<thunder.leizhen@huawei.com>, <christophe.jaillet@wanadoo.fr>,
	<yangyingliang@huawei.com>, <jon@solid-run.com>,
	<iommu@lists.linux.dev>, <linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-arm-msm@vger.kernel.org>,
	<linux-mediatek@lists.infradead.org>,
	<linux-rockchip@lists.infradead.org>,
	<linux-tegra@vger.kernel.org>,
	<virtualization@lists.linux-foundation.org>
Subject: [PATCH 2/5] iommu/amd: Drop unnecessary checks in amd_iommu_attach_device()
Date: Tue, 13 Sep 2022 01:24:45 -0700	[thread overview]
Message-ID: <20220913082448.31120-3-nicolinc@nvidia.com> (raw)
In-Reply-To: <20220913082448.31120-1-nicolinc@nvidia.com>

The same checks are done in amd_iommu_probe_device(). If any of them fails
there, then the device won't get a group, so there's no way for it to even
reach amd_iommu_attach_device any more.

Suggested-by: Robin Murphy <robin.murphy@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
 drivers/iommu/amd/iommu.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 828672a46a3d..930d9946b9f7 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2135,21 +2135,13 @@ static void amd_iommu_detach_device(struct iommu_domain *dom,
 static int amd_iommu_attach_device(struct iommu_domain *dom,
 				   struct device *dev)
 {
+	struct iommu_dev_data *dev_data = dev_iommu_priv_get(dev);
 	struct protection_domain *domain = to_pdomain(dom);
-	struct iommu_dev_data *dev_data;
-	struct amd_iommu *iommu;
+	struct amd_iommu *iommu = rlookup_amd_iommu(dev);
 	int ret;
 
-	if (!check_device(dev))
-		return -EINVAL;
-
-	dev_data = dev_iommu_priv_get(dev);
 	dev_data->defer_attach = false;
 
-	iommu = rlookup_amd_iommu(dev);
-	if (!iommu)
-		return -EINVAL;
-
 	if (dev_data->domain)
 		detach_device(dev);
 
-- 
2.17.1


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

WARNING: multiple messages have this Message-ID (diff)
From: Nicolin Chen <nicolinc@nvidia.com>
To: <joro@8bytes.org>, <suravee.suthikulpanit@amd.com>,
	<will@kernel.org>, <robin.murphy@arm.com>, <robdclark@gmail.com>,
	<dwmw2@infradead.org>, <baolu.lu@linux.intel.com>,
	<agross@kernel.org>, <bjorn.andersson@linaro.org>,
	<konrad.dybcio@somainline.org>, <matthias.bgg@gmail.com>,
	<heiko@sntech.de>, <orsonzhai@gmail.com>,
	<baolin.wang@linux.alibaba.com>, <zhang.lyra@gmail.com>,
	<thierry.reding@gmail.com>, <jean-philippe@linaro.org>,
	<jgg@nvidia.com>, <sricharan@codeaurora.org>
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	yangyingliang@huawei.com, jon@solid-run.com,
	iommu@lists.linux.dev, shameerali.kolothum.thodi@huawei.com,
	jonathanh@nvidia.com, linux-rockchip@lists.infradead.org,
	christophe.jaillet@wanadoo.fr,
	linux-arm-kernel@lists.infradead.org, thunder.leizhen@huawei.com,
	linux-tegra@vger.kernel.org, linux-mediatek@lists.infradead.org,
	tglx@linutronix.de, virtualization@lists.linux-foundation.org,
	yong.wu@mediatek.com
Subject: [PATCH 2/5] iommu/amd: Drop unnecessary checks in amd_iommu_attach_device()
Date: Tue, 13 Sep 2022 01:24:45 -0700	[thread overview]
Message-ID: <20220913082448.31120-3-nicolinc@nvidia.com> (raw)
In-Reply-To: <20220913082448.31120-1-nicolinc@nvidia.com>

The same checks are done in amd_iommu_probe_device(). If any of them fails
there, then the device won't get a group, so there's no way for it to even
reach amd_iommu_attach_device any more.

Suggested-by: Robin Murphy <robin.murphy@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
 drivers/iommu/amd/iommu.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 828672a46a3d..930d9946b9f7 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2135,21 +2135,13 @@ static void amd_iommu_detach_device(struct iommu_domain *dom,
 static int amd_iommu_attach_device(struct iommu_domain *dom,
 				   struct device *dev)
 {
+	struct iommu_dev_data *dev_data = dev_iommu_priv_get(dev);
 	struct protection_domain *domain = to_pdomain(dom);
-	struct iommu_dev_data *dev_data;
-	struct amd_iommu *iommu;
+	struct amd_iommu *iommu = rlookup_amd_iommu(dev);
 	int ret;
 
-	if (!check_device(dev))
-		return -EINVAL;
-
-	dev_data = dev_iommu_priv_get(dev);
 	dev_data->defer_attach = false;
 
-	iommu = rlookup_amd_iommu(dev);
-	if (!iommu)
-		return -EINVAL;
-
 	if (dev_data->domain)
 		detach_device(dev);
 
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2022-09-13  8:25 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-13  8:24 [PATCH 0/5] iommu: Define EINVAL as device/domain incompatibility Nicolin Chen
2022-09-13  8:24 ` Nicolin Chen
2022-09-13  8:24 ` Nicolin Chen
2022-09-13  8:24 ` [PATCH 1/5] iommu/msm: Add missing __disable_clocks calls Nicolin Chen
2022-09-13  8:24   ` Nicolin Chen
2022-09-13  8:24   ` Nicolin Chen
2022-09-13  8:24 ` Nicolin Chen [this message]
2022-09-13  8:24   ` [PATCH 2/5] iommu/amd: Drop unnecessary checks in amd_iommu_attach_device() Nicolin Chen
2022-09-13  8:24   ` Nicolin Chen
2022-09-13  8:24 ` [PATCH 3/5] iommu: Add return errno rules to ->attach_dev ops Nicolin Chen
2022-09-13  8:24   ` Nicolin Chen
2022-09-13  8:24   ` Nicolin Chen
2022-09-13 18:41   ` Jeff Johnson
2022-09-13 18:41     ` Jeff Johnson
2022-09-13 18:41     ` Jeff Johnson
2022-09-13 20:00     ` Nicolin Chen
2022-09-13 20:00       ` Nicolin Chen
2022-09-13 20:00       ` Nicolin Chen
2022-09-13  8:24 ` [PATCH 4/5] iommu: Regulate errno in ->attach_dev callback functions Nicolin Chen
2022-09-13  8:24   ` Nicolin Chen
2022-09-13  8:24   ` Nicolin Chen
2022-09-13 12:27   ` Jean-Philippe Brucker
2022-09-13 12:27     ` Jean-Philippe Brucker
2022-09-13 12:27     ` Jean-Philippe Brucker
2022-09-13 12:27     ` Jean-Philippe Brucker
2022-09-13 20:14     ` Nicolin Chen
2022-09-13 20:14       ` Nicolin Chen
2022-09-13 20:14       ` Nicolin Chen
2022-09-14  9:11     ` Jason Gunthorpe
2022-09-14  9:11       ` Jason Gunthorpe
2022-09-14  9:11       ` Jason Gunthorpe
2022-09-14  9:49       ` Jean-Philippe Brucker
2022-09-14  9:49         ` Jean-Philippe Brucker
2022-09-14  9:49         ` Jean-Philippe Brucker
2022-09-14  9:49         ` Jean-Philippe Brucker
2022-09-14 17:58         ` Nicolin Chen
2022-09-14 17:58           ` Nicolin Chen
2022-09-14 17:58           ` Nicolin Chen
2022-09-14 19:53           ` Robin Murphy
2022-09-14 19:53             ` Robin Murphy
2022-09-14 19:53             ` Robin Murphy
2022-09-14 19:53             ` Robin Murphy
2022-09-14 20:55             ` Nicolin Chen
2022-09-14 20:55               ` Nicolin Chen
2022-09-14 20:55               ` Nicolin Chen
2022-09-13  8:24 ` [PATCH 5/5] iommu: Use EINVAL for incompatible device/domain in ->attach_dev Nicolin Chen
2022-09-13  8:24   ` Nicolin Chen
2022-09-13  8:24   ` Nicolin Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220913082448.31120-3-nicolinc@nvidia.com \
    --to=nicolinc@nvidia.com \
    --cc=agross@kernel.org \
    --cc=baolin.wang@linux.alibaba.com \
    --cc=baolu.lu@linux.intel.com \
    --cc=bjorn.andersson@linaro.org \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=dwmw2@infradead.org \
    --cc=heiko@sntech.de \
    --cc=iommu@lists.linux.dev \
    --cc=jean-philippe@linaro.org \
    --cc=jgg@nvidia.com \
    --cc=jon@solid-run.com \
    --cc=jonathanh@nvidia.com \
    --cc=joro@8bytes.org \
    --cc=konrad.dybcio@somainline.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=matthias.bgg@gmail.com \
    --cc=orsonzhai@gmail.com \
    --cc=robdclark@gmail.com \
    --cc=robin.murphy@arm.com \
    --cc=shameerali.kolothum.thodi@huawei.com \
    --cc=sricharan@codeaurora.org \
    --cc=suravee.suthikulpanit@amd.com \
    --cc=tglx@linutronix.de \
    --cc=thierry.reding@gmail.com \
    --cc=thunder.leizhen@huawei.com \
    --cc=vdumpa@nvidia.com \
    --cc=virtualization@lists.linux-foundation.org \
    --cc=will@kernel.org \
    --cc=yangyingliang@huawei.com \
    --cc=yong.wu@mediatek.com \
    --cc=zhang.lyra@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.