From: Lu Baolu <baolu.lu@linux.intel.com> To: Bartosz Golaszewski <brgl@bgdev.pl>, David Woodhouse <dwmw2@infradead.org>, Joerg Roedel <joro@8bytes.org> Cc: baolu.lu@linux.intel.com, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski <bgolaszewski@baylibre.com> Subject: Re: [PATCH next] iommu: intel: don't dereference iommu_device if IOMMU_API is not built Date: Wed, 14 Oct 2020 08:42:57 +0800 [thread overview] Message-ID: <abd717c9-9eaa-d4bb-3fd8-ff7250d97ab7@linux.intel.com> (raw) In-Reply-To: <20201013073055.11262-1-brgl@bgdev.pl> On 10/13/20 3:30 PM, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > Since commit c40aaaac1018 ("iommu/vt-d: Gracefully handle DMAR units > with no supported address widths") dmar.c needs struct iommu_device to > be selected. We can drop this dependency by not dereferencing struct > iommu_device if IOMMU_API is not selected and by reusing the information > stored in iommu->drhd->ignored instead. > > This fixes the following build error when IOMMU_API is not selected: > > drivers/iommu/intel/dmar.c: In function ‘free_iommu’: > drivers/iommu/intel/dmar.c:1139:41: error: ‘struct iommu_device’ has no member named ‘ops’ > 1139 | if (intel_iommu_enabled && iommu->iommu.ops) { > ^ > > Fixes: c40aaaac1018 ("iommu/vt-d: Gracefully handle DMAR units with no supported address widths") > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> With commit title adjusted to "iommu/vt-d: Don't dereference iommu_device if IOMMU_API is not built", Acked-by: Lu Baolu <baolu.lu@linux.intel.com> Best regards, baolu > --- > drivers/iommu/intel/dmar.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c > index 2d70d56d8e0d..404b40af31cb 100644 > --- a/drivers/iommu/intel/dmar.c > +++ b/drivers/iommu/intel/dmar.c > @@ -1136,7 +1136,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) > > static void free_iommu(struct intel_iommu *iommu) > { > - if (intel_iommu_enabled && iommu->iommu.ops) { > + if (intel_iommu_enabled && !iommu->drhd->ignored) { > iommu_device_unregister(&iommu->iommu); > iommu_device_sysfs_remove(&iommu->iommu); > } >
WARNING: multiple messages have this Message-ID (diff)
From: Lu Baolu <baolu.lu@linux.intel.com> To: Bartosz Golaszewski <brgl@bgdev.pl>, David Woodhouse <dwmw2@infradead.org>, Joerg Roedel <joro@8bytes.org> Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH next] iommu: intel: don't dereference iommu_device if IOMMU_API is not built Date: Wed, 14 Oct 2020 08:42:57 +0800 [thread overview] Message-ID: <abd717c9-9eaa-d4bb-3fd8-ff7250d97ab7@linux.intel.com> (raw) In-Reply-To: <20201013073055.11262-1-brgl@bgdev.pl> On 10/13/20 3:30 PM, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > Since commit c40aaaac1018 ("iommu/vt-d: Gracefully handle DMAR units > with no supported address widths") dmar.c needs struct iommu_device to > be selected. We can drop this dependency by not dereferencing struct > iommu_device if IOMMU_API is not selected and by reusing the information > stored in iommu->drhd->ignored instead. > > This fixes the following build error when IOMMU_API is not selected: > > drivers/iommu/intel/dmar.c: In function ‘free_iommu’: > drivers/iommu/intel/dmar.c:1139:41: error: ‘struct iommu_device’ has no member named ‘ops’ > 1139 | if (intel_iommu_enabled && iommu->iommu.ops) { > ^ > > Fixes: c40aaaac1018 ("iommu/vt-d: Gracefully handle DMAR units with no supported address widths") > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> With commit title adjusted to "iommu/vt-d: Don't dereference iommu_device if IOMMU_API is not built", Acked-by: Lu Baolu <baolu.lu@linux.intel.com> Best regards, baolu > --- > drivers/iommu/intel/dmar.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c > index 2d70d56d8e0d..404b40af31cb 100644 > --- a/drivers/iommu/intel/dmar.c > +++ b/drivers/iommu/intel/dmar.c > @@ -1136,7 +1136,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) > > static void free_iommu(struct intel_iommu *iommu) > { > - if (intel_iommu_enabled && iommu->iommu.ops) { > + if (intel_iommu_enabled && !iommu->drhd->ignored) { > iommu_device_unregister(&iommu->iommu); > iommu_device_sysfs_remove(&iommu->iommu); > } > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-10-14 0:49 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-13 7:30 [PATCH next] iommu: intel: don't dereference iommu_device if IOMMU_API is not built Bartosz Golaszewski 2020-10-13 7:30 ` Bartosz Golaszewski 2020-10-13 9:16 ` David Woodhouse 2020-10-13 9:16 ` David Woodhouse 2020-10-14 0:42 ` Lu Baolu [this message] 2020-10-14 0:42 ` Lu Baolu 2020-10-14 7:18 ` Bartosz Golaszewski 2020-10-14 7:18 ` Bartosz Golaszewski 2020-10-14 7:25 ` Lu Baolu 2020-10-14 7:25 ` Lu Baolu 2020-10-14 12:57 ` Joerg Roedel 2020-10-14 12:57 ` Joerg Roedel 2020-10-17 10:27 ` David Woodhouse 2020-10-17 10:27 ` David Woodhouse 2020-10-19 12:07 ` Joerg Roedel 2020-10-19 12:07 ` Joerg Roedel
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=abd717c9-9eaa-d4bb-3fd8-ff7250d97ab7@linux.intel.com \ --to=baolu.lu@linux.intel.com \ --cc=bgolaszewski@baylibre.com \ --cc=brgl@bgdev.pl \ --cc=dwmw2@infradead.org \ --cc=iommu@lists.linux-foundation.org \ --cc=joro@8bytes.org \ --cc=linux-kernel@vger.kernel.org \ /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: linkBe 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.