From: Tom Murphy <tmurphy@arista.com>
To: iommu@lists.linux-foundation.org
Cc: dima@arista.com, jamessewart@arista.com, murphyt7@tcd.ie,
Tom Murphy <tmurphy@arista.com>, Joerg Roedel <joro@8bytes.org>,
Will Deacon <will.deacon@arm.com>,
Robin Murphy <robin.murphy@arm.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Rob Clark <robdclark@gmail.com>,
Andy Gross <andy.gross@linaro.org>,
David Brown <david.brown@linaro.org>,
Heiko Stuebner <heiko@sntech.de>,
Thomas Gleixner <tglx@linutronix.de>,
Marc Zyngier <marc.zyngier@arm.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org,
linux-mediatek@lists.infradead.org,
linux-arm-msm@vger.kernel.org, linux-rockchi
Subject: [PATCH 9/9] iommu/amd: Add allocated domain to global list earlier
Date: Thu, 11 Apr 2019 19:47:38 +0100 [thread overview]
Message-ID: <20190411184741.27540-10-tmurphy@arista.com> (raw)
In-Reply-To: <20190411184741.27540-1-tmurphy@arista.com>
dma_ops_domain_free() expects domain to be in a global list.
Arguably, could be called before protection_domain_init().
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Tom Murphy <tmurphy@arista.com>
---
drivers/iommu/amd_iommu.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 02b351834a3b..bfb021d656aa 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1801,8 +1801,12 @@ static struct protection_domain *dma_ops_domain_alloc(void)
if (!domain)
return NULL;
- if (protection_domain_init(domain))
- goto free_domain;
+ if (protection_domain_init(domain)) {
+ kfree(domain);
+ return NULL;
+ }
+
+ add_domain_to_list(domain);
domain->mode = PAGE_MODE_3_LEVEL;
domain->pt_root = (void *)get_zeroed_page(GFP_KERNEL);
@@ -1824,8 +1828,6 @@ static struct protection_domain *dma_ops_domain_alloc(void)
/* Initialize reserved ranges */
iommu_dma_copy_reserved_iova(&reserved_iova_ranges, &domain->domain);
- add_domain_to_list(domain);
-
return domain;
free_cookie:
--
2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Tom Murphy <tmurphy@arista.com>
To: iommu@lists.linux-foundation.org
Cc: dima@arista.com, jamessewart@arista.com, murphyt7@tcd.ie,
Tom Murphy <tmurphy@arista.com>, Joerg Roedel <joro@8bytes.org>,
Will Deacon <will.deacon@arm.com>,
Robin Murphy <robin.murphy@arm.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Rob Clark <robdclark@gmail.com>,
Andy Gross <andy.gross@linaro.org>,
David Brown <david.brown@linaro.org>,
Heiko Stuebner <heiko@sntech.de>,
Thomas Gleixner <tglx@linutronix.de>,
Marc Zyngier <marc.zyngier@arm.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org,
linux-mediatek@lists.infradead.org,
linux-arm-msm@vger.kernel.org,
linux-rockchip@lists.infradead.org
Subject: [PATCH 9/9] iommu/amd: Add allocated domain to global list earlier
Date: Thu, 11 Apr 2019 19:47:38 +0100 [thread overview]
Message-ID: <20190411184741.27540-10-tmurphy@arista.com> (raw)
Message-ID: <20190411184738.wNjIVrzD9ithllQsF-p4UObQdTp1073cDMZaIrAewJM@z> (raw)
In-Reply-To: <20190411184741.27540-1-tmurphy@arista.com>
dma_ops_domain_free() expects domain to be in a global list.
Arguably, could be called before protection_domain_init().
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Tom Murphy <tmurphy@arista.com>
---
drivers/iommu/amd_iommu.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 02b351834a3b..bfb021d656aa 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1801,8 +1801,12 @@ static struct protection_domain *dma_ops_domain_alloc(void)
if (!domain)
return NULL;
- if (protection_domain_init(domain))
- goto free_domain;
+ if (protection_domain_init(domain)) {
+ kfree(domain);
+ return NULL;
+ }
+
+ add_domain_to_list(domain);
domain->mode = PAGE_MODE_3_LEVEL;
domain->pt_root = (void *)get_zeroed_page(GFP_KERNEL);
@@ -1824,8 +1828,6 @@ static struct protection_domain *dma_ops_domain_alloc(void)
/* Initialize reserved ranges */
iommu_dma_copy_reserved_iova(&reserved_iova_ranges, &domain->domain);
- add_domain_to_list(domain);
-
return domain;
free_cookie:
--
2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Tom Murphy via iommu <iommu@lists.linux-foundation.org>
To: iommu@lists.linux-foundation.org
Cc: Heiko Stuebner <heiko@sntech.de>,
Will Deacon <will.deacon@arm.com>,
David Brown <david.brown@linaro.org>,
linux-samsung-soc@vger.kernel.org, dima@arista.com,
Krzysztof Kozlowski <krzk@kernel.org>,
linux-rockchip@lists.infradead.org, Kukjin Kim <kgene@kernel.org>,
Andy Gross <andy.gross@linaro.org>,
Marc Zyngier <marc.zyngier@arm.com>,
linux-arm-msm@vger.kernel.org,
linux-mediatek@lists.infradead.org,
Matthias Brugger <matthias.bgg@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org,
Tom Murphy <tmurphy@arista.com>,
linux-kernel@vger.kernel.org, murphyt7@tcd.ie,
Robin Murphy <robin.murphy@arm.com>
Subject: [PATCH 9/9] iommu/amd: Add allocated domain to global list earlier
Date: Thu, 11 Apr 2019 19:47:38 +0100 [thread overview]
Message-ID: <20190411184741.27540-10-tmurphy@arista.com> (raw)
Message-ID: <20190411184738.aGNKqN8KYPEaPjJcfBpQQO-SVy0GdsOLW_S8nIeYz3c@z> (raw)
In-Reply-To: <20190411184741.27540-1-tmurphy@arista.com>
dma_ops_domain_free() expects domain to be in a global list.
Arguably, could be called before protection_domain_init().
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Tom Murphy <tmurphy@arista.com>
---
drivers/iommu/amd_iommu.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 02b351834a3b..bfb021d656aa 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1801,8 +1801,12 @@ static struct protection_domain *dma_ops_domain_alloc(void)
if (!domain)
return NULL;
- if (protection_domain_init(domain))
- goto free_domain;
+ if (protection_domain_init(domain)) {
+ kfree(domain);
+ return NULL;
+ }
+
+ add_domain_to_list(domain);
domain->mode = PAGE_MODE_3_LEVEL;
domain->pt_root = (void *)get_zeroed_page(GFP_KERNEL);
@@ -1824,8 +1828,6 @@ static struct protection_domain *dma_ops_domain_alloc(void)
/* Initialize reserved ranges */
iommu_dma_copy_reserved_iova(&reserved_iova_ranges, &domain->domain);
- add_domain_to_list(domain);
-
return domain;
free_cookie:
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
WARNING: multiple messages have this Message-ID (diff)
From: Tom Murphy <tmurphy@arista.com>
To: iommu@lists.linux-foundation.org
Cc: Heiko Stuebner <heiko@sntech.de>,
jamessewart@arista.com, Will Deacon <will.deacon@arm.com>,
David Brown <david.brown@linaro.org>,
Marek Szyprowski <m.szyprowski@samsung.com>,
linux-samsung-soc@vger.kernel.org, dima@arista.com,
Joerg Roedel <joro@8bytes.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
linux-rockchip@lists.infradead.org, Kukjin Kim <kgene@kernel.org>,
Andy Gross <andy.gross@linaro.org>,
Marc Zyngier <marc.zyngier@arm.com>,
linux-arm-msm@vger.kernel.org,
linux-mediatek@lists.infradead.org,
Matthias Brugger <matthias.bgg@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org,
Tom Murphy <tmurphy@arista.com>,
linux-kernel@vger.kernel.org, murphyt7@tcd.ie,
Rob Clark <robdclark@gmail.com>,
Robin Murphy <robin.murphy@arm.com>
Subject: [PATCH 9/9] iommu/amd: Add allocated domain to global list earlier
Date: Thu, 11 Apr 2019 19:47:38 +0100 [thread overview]
Message-ID: <20190411184741.27540-10-tmurphy@arista.com> (raw)
In-Reply-To: <20190411184741.27540-1-tmurphy@arista.com>
dma_ops_domain_free() expects domain to be in a global list.
Arguably, could be called before protection_domain_init().
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Tom Murphy <tmurphy@arista.com>
---
drivers/iommu/amd_iommu.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 02b351834a3b..bfb021d656aa 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1801,8 +1801,12 @@ static struct protection_domain *dma_ops_domain_alloc(void)
if (!domain)
return NULL;
- if (protection_domain_init(domain))
- goto free_domain;
+ if (protection_domain_init(domain)) {
+ kfree(domain);
+ return NULL;
+ }
+
+ add_domain_to_list(domain);
domain->mode = PAGE_MODE_3_LEVEL;
domain->pt_root = (void *)get_zeroed_page(GFP_KERNEL);
@@ -1824,8 +1828,6 @@ static struct protection_domain *dma_ops_domain_alloc(void)
/* Initialize reserved ranges */
iommu_dma_copy_reserved_iova(&reserved_iova_ranges, &domain->domain);
- add_domain_to_list(domain);
-
return domain;
free_cookie:
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-04-11 18:47 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-11 18:47 [PATCH 0/9] iommu/amd: Convert the AMD iommu driver to the dma-iommu api Tom Murphy
2019-04-11 18:47 ` Tom Murphy
2019-04-11 18:47 ` Tom Murphy via iommu
2019-04-11 18:47 ` Tom Murphy
2019-04-11 18:47 ` [PATCH 1/9] iommu/dma-iommu: Add iommu_map_atomic Tom Murphy
2019-04-11 18:47 ` Tom Murphy
2019-04-11 18:47 ` Tom Murphy via iommu
2019-04-11 18:47 ` Tom Murphy
[not found] ` <20190411184741.27540-2-tmurphy-nzgTgzXrdUbQT0dZR+AlfA@public.gmane.org>
2019-04-15 6:30 ` Christoph Hellwig
2019-04-15 6:30 ` Christoph Hellwig
2019-04-15 6:30 ` Christoph Hellwig
2019-04-15 6:30 ` Christoph Hellwig
2019-04-11 18:47 ` [PATCH 2/9] iommu/dma-iommu: Add function to flush any cached not present IOTLB entries Tom Murphy
2019-04-11 18:47 ` Tom Murphy
2019-04-11 18:47 ` Tom Murphy via iommu
2019-04-11 18:47 ` Tom Murphy
2019-04-16 14:00 ` Robin Murphy
2019-04-16 14:00 ` Robin Murphy
2019-04-16 14:00 ` Robin Murphy
[not found] ` <82ce70dc-b370-3bb0-bce8-2d32db4d6a0d-5wv7dgnIgG8@public.gmane.org>
2019-04-16 16:40 ` Tom Murphy via iommu
2019-04-16 16:40 ` Tom Murphy
2019-04-16 16:40 ` Tom Murphy via iommu
2019-04-16 16:40 ` Tom Murphy
2019-04-11 18:47 ` [PATCH 3/9] iommu/dma-iommu: Add iommu_dma_copy_reserved_iova, iommu_dma_apply_resv_region to the dma-iommu api Tom Murphy
2019-04-11 18:47 ` Tom Murphy
2019-04-11 18:47 ` Tom Murphy via iommu
2019-04-11 18:47 ` Tom Murphy
[not found] ` <20190411184741.27540-4-tmurphy-nzgTgzXrdUbQT0dZR+AlfA@public.gmane.org>
2019-04-15 6:31 ` Christoph Hellwig
2019-04-15 6:31 ` Christoph Hellwig
2019-04-15 6:31 ` Christoph Hellwig
2019-04-15 6:31 ` Christoph Hellwig
2019-04-16 13:22 ` Tom Murphy
2019-04-16 13:22 ` Tom Murphy
2019-04-16 13:22 ` Tom Murphy via iommu
2019-04-16 13:37 ` Robin Murphy
2019-04-16 13:37 ` Robin Murphy
2019-04-16 13:37 ` Robin Murphy
2019-04-11 18:47 ` [PATCH 4/9] iommu/dma-iommu: Add iommu_dma_map_page_coherent Tom Murphy
2019-04-11 18:47 ` Tom Murphy
2019-04-11 18:47 ` Tom Murphy via iommu
2019-04-11 18:47 ` Tom Murphy
2019-04-15 6:33 ` Christoph Hellwig
2019-04-15 6:33 ` Christoph Hellwig
2019-04-15 6:33 ` Christoph Hellwig
2019-04-11 18:47 ` [PATCH 5/9] iommu/amd: Implement .flush_np_cache Tom Murphy
2019-04-11 18:47 ` Tom Murphy
2019-04-11 18:47 ` Tom Murphy via iommu
2019-04-11 18:47 ` Tom Murphy
[not found] ` <20190411184741.27540-6-tmurphy-nzgTgzXrdUbQT0dZR+AlfA@public.gmane.org>
2019-04-15 6:33 ` Christoph Hellwig
2019-04-15 6:33 ` Christoph Hellwig
2019-04-15 6:33 ` Christoph Hellwig
2019-04-15 6:33 ` Christoph Hellwig
2019-04-15 18:18 ` Tom Murphy
2019-04-15 18:18 ` Tom Murphy
2019-04-15 18:18 ` Tom Murphy via iommu
2019-04-11 18:47 ` [PATCH 6/9] iommu/amd: Implement map_atomic Tom Murphy
2019-04-11 18:47 ` Tom Murphy
2019-04-11 18:47 ` Tom Murphy via iommu
2019-04-11 18:47 ` Tom Murphy
2019-04-16 14:13 ` Robin Murphy
2019-04-16 14:13 ` Robin Murphy
2019-04-16 14:13 ` Robin Murphy
2019-04-11 18:47 ` [PATCH 7/9] iommu/amd: Use the dma-iommu api Tom Murphy
2019-04-11 18:47 ` Tom Murphy
2019-04-11 18:47 ` Tom Murphy via iommu
2019-04-11 18:47 ` Tom Murphy
2019-04-11 18:47 ` [PATCH 8/9] iommu/amd: Clean up unused functions Tom Murphy
2019-04-11 18:47 ` Tom Murphy
2019-04-11 18:47 ` Tom Murphy via iommu
2019-04-11 18:47 ` Tom Murphy
[not found] ` <20190411184741.27540-9-tmurphy-nzgTgzXrdUbQT0dZR+AlfA@public.gmane.org>
2019-04-15 6:22 ` Christoph Hellwig
2019-04-15 6:22 ` Christoph Hellwig
2019-04-15 6:22 ` Christoph Hellwig
2019-04-15 6:22 ` Christoph Hellwig
2019-04-11 18:47 ` Tom Murphy [this message]
2019-04-11 18:47 ` [PATCH 9/9] iommu/amd: Add allocated domain to global list earlier Tom Murphy
2019-04-11 18:47 ` Tom Murphy via iommu
2019-04-11 18:47 ` Tom Murphy
[not found] ` <20190411184741.27540-10-tmurphy-nzgTgzXrdUbQT0dZR+AlfA@public.gmane.org>
2019-04-15 6:23 ` Christoph Hellwig
2019-04-15 6:23 ` Christoph Hellwig
2019-04-15 6:23 ` Christoph Hellwig
2019-04-15 6:23 ` Christoph Hellwig
2019-04-15 18:06 ` Tom Murphy
2019-04-15 18:06 ` Tom Murphy
2019-04-15 18:06 ` Tom Murphy via iommu
[not found] ` <20190411184741.27540-1-tmurphy-nzgTgzXrdUbQT0dZR+AlfA@public.gmane.org>
2019-04-15 6:18 ` [PATCH 0/9] iommu/amd: Convert the AMD iommu driver to the dma-iommu api Christoph Hellwig
2019-04-15 6:18 ` Christoph Hellwig
2019-04-15 6:18 ` Christoph Hellwig
2019-04-15 6:18 ` Christoph Hellwig
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=20190411184741.27540-10-tmurphy@arista.com \
--to=tmurphy@arista.com \
--cc=andy.gross@linaro.org \
--cc=david.brown@linaro.org \
--cc=dima@arista.com \
--cc=heiko@sntech.de \
--cc=iommu@lists.linux-foundation.org \
--cc=jamessewart@arista.com \
--cc=joro@8bytes.org \
--cc=kgene@kernel.org \
--cc=krzk@kernel.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-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=marc.zyngier@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=murphyt7@tcd.ie \
--cc=robdclark@gmail.com \
--cc=robin.murphy@arm.com \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.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.