From: Oded Gabbay <oded.gabbay@amd.com>
To: David Airlie <airlied@linux.ie>,
Alex Deucher <alexander.deucher@amd.com>,
Jerome Glisse <j.glisse@gmail.com>
Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
"John Bridgman" <John.Bridgman@amd.com>,
"Andrew Lewycky" <Andrew.Lewycky@amd.com>,
"Joerg Roedel" <joro@8bytes.org>,
"Oded Gabbay" <oded.gabbay@amd.com>,
"Christian König" <christian.koenig@amd.com>
Subject: [PATCH v4 11/23] amdkfd: Add binding/unbinding calls to amd_iommu driver
Date: Wed, 24 Sep 2014 23:45:25 +0300 [thread overview]
Message-ID: <1411591537-31636-12-git-send-email-oded.gabbay@amd.com> (raw)
In-Reply-To: <1411591537-31636-1-git-send-email-oded.gabbay@amd.com>
This patch adds the functions to bind and unbind pasid
from a device through the amd_iommu driver.
The unbind function is called when the mm_struct of the
process is released.
The bind function is not called here because it is called
only in the IOCTLs which are not yet implemented at this
stage of the patchset.
Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
---
drivers/gpu/drm/radeon/amdkfd/kfd_device.c | 86 ++++++++++++++++++++++++++++-
drivers/gpu/drm/radeon/amdkfd/kfd_priv.h | 1 +
drivers/gpu/drm/radeon/amdkfd/kfd_process.c | 12 ++++
3 files changed, 98 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/radeon/amdkfd/kfd_device.c b/drivers/gpu/drm/radeon/amdkfd/kfd_device.c
index 8e2b075..ce90592 100644
--- a/drivers/gpu/drm/radeon/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/radeon/amdkfd/kfd_device.c
@@ -98,6 +98,63 @@ struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, struct pci_dev *pdev)
return kfd;
}
+static bool device_iommu_pasid_init(struct kfd_dev *kfd)
+{
+ const u32 required_iommu_flags = AMD_IOMMU_DEVICE_FLAG_ATS_SUP | AMD_IOMMU_DEVICE_FLAG_PRI_SUP
+ | AMD_IOMMU_DEVICE_FLAG_PASID_SUP;
+
+ struct amd_iommu_device_info iommu_info;
+ unsigned int pasid_limit;
+ int err;
+
+ err = amd_iommu_device_info(kfd->pdev, &iommu_info);
+ if (err < 0) {
+ dev_err(kfd_device, "error getting iommu info. is the iommu enabled?\n");
+ return false;
+ }
+
+ if ((iommu_info.flags & required_iommu_flags) != required_iommu_flags) {
+ dev_err(kfd_device, "error required iommu flags ats(%i), pri(%i), pasid(%i)\n",
+ (iommu_info.flags & AMD_IOMMU_DEVICE_FLAG_ATS_SUP) != 0,
+ (iommu_info.flags & AMD_IOMMU_DEVICE_FLAG_PRI_SUP) != 0,
+ (iommu_info.flags & AMD_IOMMU_DEVICE_FLAG_PASID_SUP) != 0);
+ return false;
+ }
+
+ pasid_limit = min_t(unsigned int,
+ (unsigned int)1 << kfd->device_info->max_pasid_bits,
+ iommu_info.max_pasids);
+ /*
+ * last pasid is used for kernel queues doorbells
+ * in the future the last pasid might be used for a kernel thread.
+ */
+ pasid_limit = min_t(unsigned int,
+ pasid_limit,
+ kfd->doorbell_process_limit - 1);
+
+ err = amd_iommu_init_device(kfd->pdev, pasid_limit);
+ if (err < 0) {
+ dev_err(kfd_device, "error initializing iommu device\n");
+ return false;
+ }
+
+ if (!kfd_set_pasid_limit(pasid_limit)) {
+ dev_err(kfd_device, "error setting pasid limit\n");
+ amd_iommu_free_device(kfd->pdev);
+ return false;
+ }
+
+ return true;
+}
+
+static void iommu_pasid_shutdown_callback(struct pci_dev *pdev, int pasid)
+{
+ struct kfd_dev *dev = kfd_device_by_pci_dev(pdev);
+
+ if (dev)
+ kfd_unbind_process_from_device(dev, pasid);
+}
+
bool kgd2kfd_device_init(struct kfd_dev *kfd,
const struct kgd2kfd_shared_resources *gpu_resources)
{
@@ -129,6 +186,13 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
goto kfd_topology_add_device_error;
}
+ if (!device_iommu_pasid_init(kfd)) {
+ dev_err(kfd_device,
+ "Error initializing iommuv2 for device (%x:%x)\n",
+ kfd->pdev->vendor, kfd->pdev->device);
+ goto device_iommu_pasid_error;
+ }
+ amd_iommu_set_invalidate_ctx_cb(kfd->pdev, iommu_pasid_shutdown_callback);
kfd->init_complete = true;
dev_info(kfd_device, "added device (%x:%x)\n", kfd->pdev->vendor,
@@ -136,6 +200,8 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
goto out;
+device_iommu_pasid_error:
+ kfd_topology_remove_device(kfd);
kfd_topology_add_device_error:
kfd2kgd->fini_sa_manager(kfd->kgd);
dev_err(kfd_device,
@@ -147,7 +213,10 @@ out:
void kgd2kfd_device_exit(struct kfd_dev *kfd)
{
- kfd_topology_remove_device(kfd);
+ if (kfd->init_complete) {
+ amd_iommu_free_device(kfd->pdev);
+ kfd_topology_remove_device(kfd);
+ }
kfree(kfd);
}
@@ -155,12 +224,27 @@ void kgd2kfd_device_exit(struct kfd_dev *kfd)
void kgd2kfd_suspend(struct kfd_dev *kfd)
{
BUG_ON(kfd == NULL);
+
+ if (kfd->init_complete)
+ amd_iommu_free_device(kfd->pdev);
}
int kgd2kfd_resume(struct kfd_dev *kfd)
{
+ unsigned int pasid_limit;
+ int err;
+
BUG_ON(kfd == NULL);
+ pasid_limit = kfd_get_pasid_limit();
+
+ if (kfd->init_complete) {
+ err = amd_iommu_init_device(kfd->pdev, pasid_limit);
+ if (err < 0)
+ return -ENXIO;
+ amd_iommu_set_invalidate_ctx_cb(kfd->pdev, iommu_pasid_shutdown_callback);
+ }
+
return 0;
}
diff --git a/drivers/gpu/drm/radeon/amdkfd/kfd_priv.h b/drivers/gpu/drm/radeon/amdkfd/kfd_priv.h
index 43f4bd4..b55b1cb 100644
--- a/drivers/gpu/drm/radeon/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/radeon/amdkfd/kfd_priv.h
@@ -188,6 +188,7 @@ struct kfd_process {
struct kfd_process *kfd_create_process(const struct task_struct *);
struct kfd_process *kfd_get_process(const struct task_struct *);
+void kfd_unbind_process_from_device(struct kfd_dev *dev, unsigned int pasid);
struct kfd_process_device *kfd_get_process_device_data(struct kfd_dev *dev,
struct kfd_process *p,
int create_pdd);
diff --git a/drivers/gpu/drm/radeon/amdkfd/kfd_process.c b/drivers/gpu/drm/radeon/amdkfd/kfd_process.c
index c95fd93..66a91b9 100644
--- a/drivers/gpu/drm/radeon/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/radeon/amdkfd/kfd_process.c
@@ -24,6 +24,7 @@
#include <linux/log2.h>
#include <linux/sched.h>
#include <linux/slab.h>
+#include <linux/amd-iommu.h>
#include <linux/notifier.h>
struct mm_struct;
@@ -153,6 +154,7 @@ static void kfd_process_notifier_release(struct mmu_notifier *mn,
mutex_lock(&p->mutex);
list_for_each_entry_safe(pdd, temp, &p->per_device_data, per_device_list) {
+ amd_iommu_unbind_pasid(pdd->dev->pdev, p->pasid);
list_del(&pdd->per_device_list);
kfree(pdd);
}
@@ -258,6 +260,7 @@ struct kfd_process_device *kfd_bind_process_to_device(struct kfd_dev *dev,
struct kfd_process *p)
{
struct kfd_process_device *pdd = kfd_get_process_device_data(dev, p, 1);
+ int err;
if (pdd == NULL)
return ERR_PTR(-ENOMEM);
@@ -265,6 +268,15 @@ struct kfd_process_device *kfd_bind_process_to_device(struct kfd_dev *dev,
if (pdd->bound)
return pdd;
+ err = amd_iommu_bind_pasid(dev->pdev, p->pasid, p->lead_thread);
+ if (err < 0)
+ return ERR_PTR(err);
+
+ if (err < 0) {
+ amd_iommu_unbind_pasid(dev->pdev, p->pasid);
+ return ERR_PTR(err);
+ }
+
pdd->bound = true;
return pdd;
--
1.9.1
next prev parent reply other threads:[~2014-09-24 21:03 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-24 20:45 [PATCH v4 00/23] AMDKFD Kernel Driver Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 01/23] drm/radeon: reduce number of free VMIDs and pipes in KV Oded Gabbay
2014-10-14 16:50 ` Alex Deucher
2014-09-24 20:45 ` [PATCH v4 02/23] drm/radeon/cik: Don't touch int of pipes 1-7 Oded Gabbay
2014-10-14 16:51 ` Alex Deucher
2014-09-24 20:45 ` [PATCH v4 03/23] drm/radeon: Report doorbell configuration to amdkfd Oded Gabbay
2014-10-14 16:52 ` Alex Deucher
2014-09-24 20:45 ` [PATCH v4 04/23] drm/radeon: adding synchronization for GRBM GFX Oded Gabbay
2014-10-14 16:53 ` Alex Deucher
2014-09-24 20:45 ` [PATCH v4 05/23] drm/radeon: Add radeon <--> amdkfd interface Oded Gabbay
2014-09-25 18:51 ` Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 06/23] Update MAINTAINERS and CREDITS files with amdkfd info Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 07/23] amdkfd: Add IOCTL set definitions of amdkfd Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 08/23] amdkfd: Add amdkfd skeleton driver Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 09/23] amdkfd: Add topology module to amdkfd Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 10/23] amdkfd: Add basic modules " Oded Gabbay
2014-09-24 20:45 ` Oded Gabbay [this message]
2014-09-24 20:45 ` [PATCH v4 12/23] amdkfd: Add queue module Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 13/23] amdkfd: Add mqd_manager module Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 14/23] amdkfd: Add kernel queue module Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 15/23] amdkfd: Add module parameter of scheduling policy Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 16/23] amdkfd: Add packet manager module Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 17/23] amdkfd: Add process queue " Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 18/23] amdkfd: Add device " Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 19/23] amdkfd: Add interrupt handling module Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 20/23] amdkfd: Implement the create/destroy/update queue IOCTLs Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 21/23] amdkfd: Implement the Set Memory Policy IOCTL Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 22/23] amdkfd: Implement the Get Clock Counters IOCTL Oded Gabbay
2014-09-24 20:45 ` [PATCH v4 23/23] amdkfd: Implement the Get Process Aperture IOCTL Oded Gabbay
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=1411591537-31636-12-git-send-email-oded.gabbay@amd.com \
--to=oded.gabbay@amd.com \
--cc=Andrew.Lewycky@amd.com \
--cc=John.Bridgman@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=j.glisse@gmail.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome