From: Jerome Glisse <j.glisse@gmail.com>
To: Oded Gabbay <oded.gabbay@gmail.com>
Cc: Andrew Lewycky <Andrew.Lewycky@amd.com>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
Alex Deucher <alexander.deucher@amd.com>
Subject: Re: [PATCH 15/83] hsa/radeon: Add interrupt handling module
Date: Fri, 11 Jul 2014 15:57:19 -0400 [thread overview]
Message-ID: <20140711195717.GQ1870@gmail.com> (raw)
In-Reply-To: <1405029027-6085-14-git-send-email-oded.gabbay@amd.com>
On Fri, Jul 11, 2014 at 12:50:15AM +0300, Oded Gabbay wrote:
> This patch adds the interrupt handling module, in kfd_interrupt.c,
> and its related members in different data structures to the KFD
> driver.
>
> The KFD interrupt module maintains an internal interrupt ring per kfd
> device. The internal interrupt ring contains interrupts that needs further
> handling.The extra handling is deferred to a later time through a workqueue.
>
> There's no acknowledgment for the interrupts we use. The hardware simply queues a new interrupt each time without waiting.
>
> The fixed-size internal queue means that it's possible for us to lose interrupts because we have no back-pressure to the hardware.
>
> Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
> ---
> drivers/gpu/hsa/radeon/Makefile | 2 +-
> drivers/gpu/hsa/radeon/kfd_device.c | 1 +
> drivers/gpu/hsa/radeon/kfd_interrupt.c | 179 +++++++++++++++++++++++++++++++++
> drivers/gpu/hsa/radeon/kfd_priv.h | 18 ++++
> drivers/gpu/hsa/radeon/kfd_scheduler.h | 3 +
> 5 files changed, 202 insertions(+), 1 deletion(-)
> create mode 100644 drivers/gpu/hsa/radeon/kfd_interrupt.c
>
> diff --git a/drivers/gpu/hsa/radeon/Makefile b/drivers/gpu/hsa/radeon/Makefile
> index 28da10c..5422e6a 100644
> --- a/drivers/gpu/hsa/radeon/Makefile
> +++ b/drivers/gpu/hsa/radeon/Makefile
> @@ -5,6 +5,6 @@
> radeon_kfd-y := kfd_module.o kfd_device.o kfd_chardev.o \
> kfd_pasid.o kfd_topology.o kfd_process.o \
> kfd_doorbell.o kfd_sched_cik_static.o kfd_registers.o \
> - kfd_vidmem.o
> + kfd_vidmem.o kfd_interrupt.o
>
> obj-$(CONFIG_HSA_RADEON) += radeon_kfd.o
> diff --git a/drivers/gpu/hsa/radeon/kfd_device.c b/drivers/gpu/hsa/radeon/kfd_device.c
> index 465c822..b2d2861 100644
> --- a/drivers/gpu/hsa/radeon/kfd_device.c
> +++ b/drivers/gpu/hsa/radeon/kfd_device.c
> @@ -30,6 +30,7 @@
> static const struct kfd_device_info bonaire_device_info = {
> .scheduler_class = &radeon_kfd_cik_static_scheduler_class,
> .max_pasid_bits = 16,
> + .ih_ring_entry_size = 4 * sizeof(uint32_t)
> };
>
> struct kfd_deviceid {
> diff --git a/drivers/gpu/hsa/radeon/kfd_interrupt.c b/drivers/gpu/hsa/radeon/kfd_interrupt.c
> new file mode 100644
> index 0000000..2179780
> --- /dev/null
> +++ b/drivers/gpu/hsa/radeon/kfd_interrupt.c
> @@ -0,0 +1,179 @@
> +/*
> + * Copyright 2014 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +/*
> + * KFD Interrupts.
> + *
> + * AMD GPUs deliver interrupts by pushing an interrupt description onto the
> + * interrupt ring and then sending an interrupt. KGD receives the interrupt
> + * in ISR and sends us a pointer to each new entry on the interrupt ring.
> + *
> + * We generally can't process interrupt-signaled events from ISR, so we call
> + * out to each interrupt client module (currently only the scheduler) to ask if
> + * each interrupt is interesting. If they return true, then it requires further
> + * processing so we copy it to an internal interrupt ring and call each
> + * interrupt client again from a work-queue.
> + *
> + * There's no acknowledgment for the interrupts we use. The hardware simply
> + * queues a new interrupt each time without waiting.
> + *
> + * The fixed-size internal queue means that it's possible for us to lose
> + * interrupts because we have no back-pressure to the hardware.
> + */
> +
> +#include <linux/slab.h>
> +#include <linux/device.h>
> +#include "kfd_priv.h"
> +#include "kfd_scheduler.h"
> +
> +#define KFD_INTERRUPT_RING_SIZE 256
> +
> +static void interrupt_wq(struct work_struct *);
> +
> +int
> +radeon_kfd_interrupt_init(struct kfd_dev *kfd)
> +{
> + void *interrupt_ring = kmalloc_array(KFD_INTERRUPT_RING_SIZE,
> + kfd->device_info->ih_ring_entry_size,
> + GFP_KERNEL);
> + if (!interrupt_ring)
> + return -ENOMEM;
> +
> + kfd->interrupt_ring = interrupt_ring;
> + kfd->interrupt_ring_size =
> + KFD_INTERRUPT_RING_SIZE * kfd->device_info->ih_ring_entry_size;
> + atomic_set(&kfd->interrupt_ring_wptr, 0);
> + atomic_set(&kfd->interrupt_ring_rptr, 0);
> +
> + spin_lock_init(&kfd->interrupt_lock);
> +
> + INIT_WORK(&kfd->interrupt_work, interrupt_wq);
> +
> + kfd->interrupts_active = true;
> +
> + /*
> + * After this function returns, the interrupt will be enabled. This
> + * barrier ensures that the interrupt running on a different processor
> + * sees all the above writes.
> + */
> + smp_wmb();
> +
> + return 0;
> +}
> +
> +void
> +radeon_kfd_interrupt_exit(struct kfd_dev *kfd)
> +{
> + /*
> + * Stop the interrupt handler from writing to the ring and scheduling
> + * workqueue items. The spinlock ensures that any interrupt running
> + * after we have unlocked sees interrupts_active = false.
> + */
> + unsigned long flags;
> +
> + spin_lock_irqsave(&kfd->interrupt_lock, flags);
> + kfd->interrupts_active = false;
> + spin_unlock_irqrestore(&kfd->interrupt_lock, flags);
> +
> + /*
> + * Flush_scheduled_work ensures that there are no outstanding work-queue
> + * items that will access interrupt_ring. New work items can't be
> + * created because we stopped interrupt handling above.
> + */
> + flush_scheduled_work();
> +
> + kfree(kfd->interrupt_ring);
> +}
> +
> +/*
> + * This assumes that it can't be called concurrently with itself
> + * but only with dequeue_ih_ring_entry.
> + */
> +static bool
> +enqueue_ih_ring_entry(struct kfd_dev *kfd, const void *ih_ring_entry)
> +{
> + unsigned int rptr = atomic_read(&kfd->interrupt_ring_rptr);
> + unsigned int wptr = atomic_read(&kfd->interrupt_ring_wptr);
> +
> + if ((rptr - wptr) % kfd->interrupt_ring_size == kfd->device_info->ih_ring_entry_size) {
> + /* This is very bad, the system is likely to hang. */
> + dev_err_ratelimited(radeon_kfd_chardev(),
> + "Interrupt ring overflow, dropping interrupt.\n");
Why is it that bad ? What are those interrupt use for ? I would assume that
worst case some queue do not see there job progressing but isn't there is a
way for them to manualy pull information after some time out ?
Because afaict there is way to trigger interrupt from shader and i assume
those can reach this hsa code and thus rogue userspace can irq bomb hsa.
Hence i would like to understand what could go wrong.
Cheers,
Jérôme
> + return false;
> + }
> +
> + memcpy(kfd->interrupt_ring + wptr, ih_ring_entry, kfd->device_info->ih_ring_entry_size);
> + wptr = (wptr + kfd->device_info->ih_ring_entry_size) % kfd->interrupt_ring_size;
> + smp_wmb(); /* Ensure memcpy'd data is visible before wptr update. */
> + atomic_set(&kfd->interrupt_ring_wptr, wptr);
> +
> + return true;
> +}
> +
> +/*
> + * This assumes that it can't be called concurrently with itself
> + * but only with enqueue_ih_ring_entry.
> + */
> +static bool
> +dequeue_ih_ring_entry(struct kfd_dev *kfd, void *ih_ring_entry)
> +{
> + /*
> + * Assume that wait queues have an implicit barrier, i.e. anything that
> + * happened in the ISR before it queued work is visible.
> + */
> +
> + unsigned int wptr = atomic_read(&kfd->interrupt_ring_wptr);
> + unsigned int rptr = atomic_read(&kfd->interrupt_ring_rptr);
> +
> + if (rptr == wptr)
> + return false;
> +
> + memcpy(ih_ring_entry, kfd->interrupt_ring + rptr, kfd->device_info->ih_ring_entry_size);
> + rptr = (rptr + kfd->device_info->ih_ring_entry_size) % kfd->interrupt_ring_size;
> + smp_mb(); /* Ensure the rptr write update is not visible until memcpy has finished reading. */
> + atomic_set(&kfd->interrupt_ring_rptr, rptr);
> +
> + return true;
> +}
> +
> +static void interrupt_wq(struct work_struct *work)
> +{
> + struct kfd_dev *dev = container_of(work, struct kfd_dev, interrupt_work);
> +
> + uint32_t ih_ring_entry[DIV_ROUND_UP(dev->device_info->ih_ring_entry_size, sizeof(uint32_t))];
> +
> + while (dequeue_ih_ring_entry(dev, ih_ring_entry))
> + dev->device_info->scheduler_class->interrupt_wq(dev->scheduler, ih_ring_entry);
> +}
> +
> +/* This is called directly from KGD at ISR. */
> +void kgd2kfd_interrupt(struct kfd_dev *kfd, const void *ih_ring_entry)
> +{
> + spin_lock(&kfd->interrupt_lock);
> +
> + if (kfd->interrupts_active
> + && kfd->device_info->scheduler_class->interrupt_isr(kfd->scheduler, ih_ring_entry)
> + && enqueue_ih_ring_entry(kfd, ih_ring_entry))
> + schedule_work(&kfd->interrupt_work);
> +
> + spin_unlock(&kfd->interrupt_lock);
> +}
> diff --git a/drivers/gpu/hsa/radeon/kfd_priv.h b/drivers/gpu/hsa/radeon/kfd_priv.h
> index 1d1dbcf..5b6611f 100644
> --- a/drivers/gpu/hsa/radeon/kfd_priv.h
> +++ b/drivers/gpu/hsa/radeon/kfd_priv.h
> @@ -28,6 +28,9 @@
> #include <linux/mutex.h>
> #include <linux/radeon_kfd.h>
> #include <linux/types.h>
> +#include <linux/atomic.h>
> +#include <linux/workqueue.h>
> +#include <linux/spinlock.h>
>
> struct kfd_scheduler_class;
>
> @@ -63,6 +66,7 @@ typedef u32 doorbell_t;
> struct kfd_device_info {
> const struct kfd_scheduler_class *scheduler_class;
> unsigned int max_pasid_bits;
> + size_t ih_ring_entry_size;
> };
>
> struct kfd_dev {
> @@ -90,6 +94,15 @@ struct kfd_dev {
> struct kgd2kfd_shared_resources shared_resources;
>
> struct kfd_scheduler *scheduler;
> +
> + /* Interrupts of interest to KFD are copied from the HW ring into a SW ring. */
> + bool interrupts_active;
> + void *interrupt_ring;
> + size_t interrupt_ring_size;
> + atomic_t interrupt_ring_rptr;
> + atomic_t interrupt_ring_wptr;
> + struct work_struct interrupt_work;
> + spinlock_t interrupt_lock;
> };
>
> /* KGD2KFD callbacks */
> @@ -229,4 +242,9 @@ struct kfd_dev *radeon_kfd_device_by_pci_dev(const struct pci_dev *pdev);
> void radeon_kfd_write_reg(struct kfd_dev *dev, uint32_t reg, uint32_t value);
> uint32_t radeon_kfd_read_reg(struct kfd_dev *dev, uint32_t reg);
>
> +/* Interrupts */
> +int radeon_kfd_interrupt_init(struct kfd_dev *dev);
> +void radeon_kfd_interrupt_exit(struct kfd_dev *dev);
> +void kgd2kfd_interrupt(struct kfd_dev *dev, const void *ih_ring_entry);
> +
> #endif
> diff --git a/drivers/gpu/hsa/radeon/kfd_scheduler.h b/drivers/gpu/hsa/radeon/kfd_scheduler.h
> index 48a032f..e5a93c4 100644
> --- a/drivers/gpu/hsa/radeon/kfd_scheduler.h
> +++ b/drivers/gpu/hsa/radeon/kfd_scheduler.h
> @@ -55,6 +55,9 @@ struct kfd_scheduler_class {
> unsigned int doorbell);
>
> void (*destroy_queue)(struct kfd_scheduler *, struct kfd_scheduler_queue *);
> +
> + bool (*interrupt_isr)(struct kfd_scheduler *, const void *ih_ring_entry);
> + void (*interrupt_wq)(struct kfd_scheduler *, const void *ih_ring_entry);
> };
>
> extern const struct kfd_scheduler_class radeon_kfd_cik_static_scheduler_class;
> --
> 1.9.1
>
WARNING: multiple messages have this Message-ID (diff)
From: Jerome Glisse <j.glisse@gmail.com>
To: Oded Gabbay <oded.gabbay@gmail.com>
Cc: David Airlie <airlied@linux.ie>,
Alex Deucher <alexander.deucher@amd.com>,
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>
Subject: Re: [PATCH 15/83] hsa/radeon: Add interrupt handling module
Date: Fri, 11 Jul 2014 15:57:19 -0400 [thread overview]
Message-ID: <20140711195717.GQ1870@gmail.com> (raw)
In-Reply-To: <1405029027-6085-14-git-send-email-oded.gabbay@amd.com>
On Fri, Jul 11, 2014 at 12:50:15AM +0300, Oded Gabbay wrote:
> This patch adds the interrupt handling module, in kfd_interrupt.c,
> and its related members in different data structures to the KFD
> driver.
>
> The KFD interrupt module maintains an internal interrupt ring per kfd
> device. The internal interrupt ring contains interrupts that needs further
> handling.The extra handling is deferred to a later time through a workqueue.
>
> There's no acknowledgment for the interrupts we use. The hardware simply queues a new interrupt each time without waiting.
>
> The fixed-size internal queue means that it's possible for us to lose interrupts because we have no back-pressure to the hardware.
>
> Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
> ---
> drivers/gpu/hsa/radeon/Makefile | 2 +-
> drivers/gpu/hsa/radeon/kfd_device.c | 1 +
> drivers/gpu/hsa/radeon/kfd_interrupt.c | 179 +++++++++++++++++++++++++++++++++
> drivers/gpu/hsa/radeon/kfd_priv.h | 18 ++++
> drivers/gpu/hsa/radeon/kfd_scheduler.h | 3 +
> 5 files changed, 202 insertions(+), 1 deletion(-)
> create mode 100644 drivers/gpu/hsa/radeon/kfd_interrupt.c
>
> diff --git a/drivers/gpu/hsa/radeon/Makefile b/drivers/gpu/hsa/radeon/Makefile
> index 28da10c..5422e6a 100644
> --- a/drivers/gpu/hsa/radeon/Makefile
> +++ b/drivers/gpu/hsa/radeon/Makefile
> @@ -5,6 +5,6 @@
> radeon_kfd-y := kfd_module.o kfd_device.o kfd_chardev.o \
> kfd_pasid.o kfd_topology.o kfd_process.o \
> kfd_doorbell.o kfd_sched_cik_static.o kfd_registers.o \
> - kfd_vidmem.o
> + kfd_vidmem.o kfd_interrupt.o
>
> obj-$(CONFIG_HSA_RADEON) += radeon_kfd.o
> diff --git a/drivers/gpu/hsa/radeon/kfd_device.c b/drivers/gpu/hsa/radeon/kfd_device.c
> index 465c822..b2d2861 100644
> --- a/drivers/gpu/hsa/radeon/kfd_device.c
> +++ b/drivers/gpu/hsa/radeon/kfd_device.c
> @@ -30,6 +30,7 @@
> static const struct kfd_device_info bonaire_device_info = {
> .scheduler_class = &radeon_kfd_cik_static_scheduler_class,
> .max_pasid_bits = 16,
> + .ih_ring_entry_size = 4 * sizeof(uint32_t)
> };
>
> struct kfd_deviceid {
> diff --git a/drivers/gpu/hsa/radeon/kfd_interrupt.c b/drivers/gpu/hsa/radeon/kfd_interrupt.c
> new file mode 100644
> index 0000000..2179780
> --- /dev/null
> +++ b/drivers/gpu/hsa/radeon/kfd_interrupt.c
> @@ -0,0 +1,179 @@
> +/*
> + * Copyright 2014 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +/*
> + * KFD Interrupts.
> + *
> + * AMD GPUs deliver interrupts by pushing an interrupt description onto the
> + * interrupt ring and then sending an interrupt. KGD receives the interrupt
> + * in ISR and sends us a pointer to each new entry on the interrupt ring.
> + *
> + * We generally can't process interrupt-signaled events from ISR, so we call
> + * out to each interrupt client module (currently only the scheduler) to ask if
> + * each interrupt is interesting. If they return true, then it requires further
> + * processing so we copy it to an internal interrupt ring and call each
> + * interrupt client again from a work-queue.
> + *
> + * There's no acknowledgment for the interrupts we use. The hardware simply
> + * queues a new interrupt each time without waiting.
> + *
> + * The fixed-size internal queue means that it's possible for us to lose
> + * interrupts because we have no back-pressure to the hardware.
> + */
> +
> +#include <linux/slab.h>
> +#include <linux/device.h>
> +#include "kfd_priv.h"
> +#include "kfd_scheduler.h"
> +
> +#define KFD_INTERRUPT_RING_SIZE 256
> +
> +static void interrupt_wq(struct work_struct *);
> +
> +int
> +radeon_kfd_interrupt_init(struct kfd_dev *kfd)
> +{
> + void *interrupt_ring = kmalloc_array(KFD_INTERRUPT_RING_SIZE,
> + kfd->device_info->ih_ring_entry_size,
> + GFP_KERNEL);
> + if (!interrupt_ring)
> + return -ENOMEM;
> +
> + kfd->interrupt_ring = interrupt_ring;
> + kfd->interrupt_ring_size =
> + KFD_INTERRUPT_RING_SIZE * kfd->device_info->ih_ring_entry_size;
> + atomic_set(&kfd->interrupt_ring_wptr, 0);
> + atomic_set(&kfd->interrupt_ring_rptr, 0);
> +
> + spin_lock_init(&kfd->interrupt_lock);
> +
> + INIT_WORK(&kfd->interrupt_work, interrupt_wq);
> +
> + kfd->interrupts_active = true;
> +
> + /*
> + * After this function returns, the interrupt will be enabled. This
> + * barrier ensures that the interrupt running on a different processor
> + * sees all the above writes.
> + */
> + smp_wmb();
> +
> + return 0;
> +}
> +
> +void
> +radeon_kfd_interrupt_exit(struct kfd_dev *kfd)
> +{
> + /*
> + * Stop the interrupt handler from writing to the ring and scheduling
> + * workqueue items. The spinlock ensures that any interrupt running
> + * after we have unlocked sees interrupts_active = false.
> + */
> + unsigned long flags;
> +
> + spin_lock_irqsave(&kfd->interrupt_lock, flags);
> + kfd->interrupts_active = false;
> + spin_unlock_irqrestore(&kfd->interrupt_lock, flags);
> +
> + /*
> + * Flush_scheduled_work ensures that there are no outstanding work-queue
> + * items that will access interrupt_ring. New work items can't be
> + * created because we stopped interrupt handling above.
> + */
> + flush_scheduled_work();
> +
> + kfree(kfd->interrupt_ring);
> +}
> +
> +/*
> + * This assumes that it can't be called concurrently with itself
> + * but only with dequeue_ih_ring_entry.
> + */
> +static bool
> +enqueue_ih_ring_entry(struct kfd_dev *kfd, const void *ih_ring_entry)
> +{
> + unsigned int rptr = atomic_read(&kfd->interrupt_ring_rptr);
> + unsigned int wptr = atomic_read(&kfd->interrupt_ring_wptr);
> +
> + if ((rptr - wptr) % kfd->interrupt_ring_size == kfd->device_info->ih_ring_entry_size) {
> + /* This is very bad, the system is likely to hang. */
> + dev_err_ratelimited(radeon_kfd_chardev(),
> + "Interrupt ring overflow, dropping interrupt.\n");
Why is it that bad ? What are those interrupt use for ? I would assume that
worst case some queue do not see there job progressing but isn't there is a
way for them to manualy pull information after some time out ?
Because afaict there is way to trigger interrupt from shader and i assume
those can reach this hsa code and thus rogue userspace can irq bomb hsa.
Hence i would like to understand what could go wrong.
Cheers,
Jérôme
> + return false;
> + }
> +
> + memcpy(kfd->interrupt_ring + wptr, ih_ring_entry, kfd->device_info->ih_ring_entry_size);
> + wptr = (wptr + kfd->device_info->ih_ring_entry_size) % kfd->interrupt_ring_size;
> + smp_wmb(); /* Ensure memcpy'd data is visible before wptr update. */
> + atomic_set(&kfd->interrupt_ring_wptr, wptr);
> +
> + return true;
> +}
> +
> +/*
> + * This assumes that it can't be called concurrently with itself
> + * but only with enqueue_ih_ring_entry.
> + */
> +static bool
> +dequeue_ih_ring_entry(struct kfd_dev *kfd, void *ih_ring_entry)
> +{
> + /*
> + * Assume that wait queues have an implicit barrier, i.e. anything that
> + * happened in the ISR before it queued work is visible.
> + */
> +
> + unsigned int wptr = atomic_read(&kfd->interrupt_ring_wptr);
> + unsigned int rptr = atomic_read(&kfd->interrupt_ring_rptr);
> +
> + if (rptr == wptr)
> + return false;
> +
> + memcpy(ih_ring_entry, kfd->interrupt_ring + rptr, kfd->device_info->ih_ring_entry_size);
> + rptr = (rptr + kfd->device_info->ih_ring_entry_size) % kfd->interrupt_ring_size;
> + smp_mb(); /* Ensure the rptr write update is not visible until memcpy has finished reading. */
> + atomic_set(&kfd->interrupt_ring_rptr, rptr);
> +
> + return true;
> +}
> +
> +static void interrupt_wq(struct work_struct *work)
> +{
> + struct kfd_dev *dev = container_of(work, struct kfd_dev, interrupt_work);
> +
> + uint32_t ih_ring_entry[DIV_ROUND_UP(dev->device_info->ih_ring_entry_size, sizeof(uint32_t))];
> +
> + while (dequeue_ih_ring_entry(dev, ih_ring_entry))
> + dev->device_info->scheduler_class->interrupt_wq(dev->scheduler, ih_ring_entry);
> +}
> +
> +/* This is called directly from KGD at ISR. */
> +void kgd2kfd_interrupt(struct kfd_dev *kfd, const void *ih_ring_entry)
> +{
> + spin_lock(&kfd->interrupt_lock);
> +
> + if (kfd->interrupts_active
> + && kfd->device_info->scheduler_class->interrupt_isr(kfd->scheduler, ih_ring_entry)
> + && enqueue_ih_ring_entry(kfd, ih_ring_entry))
> + schedule_work(&kfd->interrupt_work);
> +
> + spin_unlock(&kfd->interrupt_lock);
> +}
> diff --git a/drivers/gpu/hsa/radeon/kfd_priv.h b/drivers/gpu/hsa/radeon/kfd_priv.h
> index 1d1dbcf..5b6611f 100644
> --- a/drivers/gpu/hsa/radeon/kfd_priv.h
> +++ b/drivers/gpu/hsa/radeon/kfd_priv.h
> @@ -28,6 +28,9 @@
> #include <linux/mutex.h>
> #include <linux/radeon_kfd.h>
> #include <linux/types.h>
> +#include <linux/atomic.h>
> +#include <linux/workqueue.h>
> +#include <linux/spinlock.h>
>
> struct kfd_scheduler_class;
>
> @@ -63,6 +66,7 @@ typedef u32 doorbell_t;
> struct kfd_device_info {
> const struct kfd_scheduler_class *scheduler_class;
> unsigned int max_pasid_bits;
> + size_t ih_ring_entry_size;
> };
>
> struct kfd_dev {
> @@ -90,6 +94,15 @@ struct kfd_dev {
> struct kgd2kfd_shared_resources shared_resources;
>
> struct kfd_scheduler *scheduler;
> +
> + /* Interrupts of interest to KFD are copied from the HW ring into a SW ring. */
> + bool interrupts_active;
> + void *interrupt_ring;
> + size_t interrupt_ring_size;
> + atomic_t interrupt_ring_rptr;
> + atomic_t interrupt_ring_wptr;
> + struct work_struct interrupt_work;
> + spinlock_t interrupt_lock;
> };
>
> /* KGD2KFD callbacks */
> @@ -229,4 +242,9 @@ struct kfd_dev *radeon_kfd_device_by_pci_dev(const struct pci_dev *pdev);
> void radeon_kfd_write_reg(struct kfd_dev *dev, uint32_t reg, uint32_t value);
> uint32_t radeon_kfd_read_reg(struct kfd_dev *dev, uint32_t reg);
>
> +/* Interrupts */
> +int radeon_kfd_interrupt_init(struct kfd_dev *dev);
> +void radeon_kfd_interrupt_exit(struct kfd_dev *dev);
> +void kgd2kfd_interrupt(struct kfd_dev *dev, const void *ih_ring_entry);
> +
> #endif
> diff --git a/drivers/gpu/hsa/radeon/kfd_scheduler.h b/drivers/gpu/hsa/radeon/kfd_scheduler.h
> index 48a032f..e5a93c4 100644
> --- a/drivers/gpu/hsa/radeon/kfd_scheduler.h
> +++ b/drivers/gpu/hsa/radeon/kfd_scheduler.h
> @@ -55,6 +55,9 @@ struct kfd_scheduler_class {
> unsigned int doorbell);
>
> void (*destroy_queue)(struct kfd_scheduler *, struct kfd_scheduler_queue *);
> +
> + bool (*interrupt_isr)(struct kfd_scheduler *, const void *ih_ring_entry);
> + void (*interrupt_wq)(struct kfd_scheduler *, const void *ih_ring_entry);
> };
>
> extern const struct kfd_scheduler_class radeon_kfd_cik_static_scheduler_class;
> --
> 1.9.1
>
next prev parent reply other threads:[~2014-07-11 19:57 UTC|newest]
Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-10 21:50 [PATCH 02/83] drm/radeon: reduce number of free VMIDs and pipes in KV Oded Gabbay
2014-07-10 21:50 ` [PATCH 03/83] drm/radeon: Report doorbell configuration to kfd Oded Gabbay
2014-07-11 16:16 ` Jerome Glisse
2014-07-11 16:16 ` Jerome Glisse
2014-07-10 21:50 ` [PATCH 04/83] drm/radeon: Add radeon <--> kfd interface Oded Gabbay
2014-07-10 22:38 ` Joe Perches
2014-07-10 22:38 ` Joe Perches
2014-07-11 16:24 ` Jerome Glisse
2014-07-11 16:24 ` Jerome Glisse
2014-07-17 11:55 ` Oded Gabbay
2014-07-10 21:50 ` [PATCH 05/83] drm/radeon: Add kfd-->kgd interface to get virtual ram size Oded Gabbay
2014-07-11 16:27 ` Jerome Glisse
2014-07-11 16:27 ` Jerome Glisse
2014-07-10 21:50 ` [PATCH 06/83] drm/radeon: Add kfd-->kgd interfaces of memory allocation/mapping Oded Gabbay
2014-07-11 16:32 ` Jerome Glisse
2014-07-11 16:32 ` Jerome Glisse
2014-07-10 21:50 ` [PATCH 07/83] drm/radeon: Add kfd-->kgd interface of locking srbm_gfx_cntl register Oded Gabbay
2014-07-11 16:34 ` Jerome Glisse
2014-07-11 16:34 ` Jerome Glisse
2014-07-11 17:48 ` Bridgman, John
2014-07-11 17:48 ` Bridgman, John
2014-07-12 0:36 ` Bridgman, John
2014-07-12 0:36 ` Bridgman, John
2014-07-12 0:37 ` Bridgman, John
2014-07-12 0:37 ` Bridgman, John
2014-07-10 21:50 ` [PATCH 08/83] drm/radeon: Add calls to initialize and finalize kfd from radeon Oded Gabbay
2014-07-11 16:36 ` Jerome Glisse
2014-07-11 16:36 ` Jerome Glisse
2014-07-17 11:57 ` Oded Gabbay
2014-07-17 11:57 ` Oded Gabbay
2014-07-17 12:29 ` Christian König
2014-07-17 12:29 ` Christian König
2014-07-17 12:30 ` Oded Gabbay
2014-07-17 12:30 ` Oded Gabbay
2014-07-17 12:45 ` Christian König
2014-07-17 13:31 ` Daniel Vetter
2014-07-17 13:31 ` Daniel Vetter
2014-07-10 21:50 ` [PATCH 09/83] hsa/radeon: Add code base of hsa driver for AMD's GPUs Oded Gabbay
2014-07-11 17:04 ` Jerome Glisse
2014-07-11 17:04 ` Jerome Glisse
2014-07-11 17:28 ` Joe Perches
2014-07-11 17:28 ` Joe Perches
2014-07-17 11:51 ` Oded Gabbay
2014-07-17 11:51 ` Oded Gabbay
2014-07-11 17:40 ` Daniel Vetter
2014-07-11 17:40 ` Daniel Vetter
2014-07-11 18:02 ` Bridgman, John
2014-07-11 18:02 ` Bridgman, John
2014-07-11 18:10 ` Jerome Glisse
2014-07-11 18:10 ` Jerome Glisse
2014-07-11 18:46 ` Bridgman, John
2014-07-11 18:46 ` Bridgman, John
2014-07-11 18:51 ` Jerome Glisse
2014-07-11 18:51 ` Jerome Glisse
2014-07-11 18:56 ` Bridgman, John
2014-07-11 18:56 ` Bridgman, John
2014-07-11 19:22 ` Jerome Glisse
2014-07-11 19:22 ` Jerome Glisse
2014-07-11 19:38 ` Joe Perches
2014-07-11 19:38 ` Joe Perches
2014-07-17 11:51 ` Oded Gabbay
2014-07-17 11:51 ` Oded Gabbay
2014-07-10 21:50 ` [PATCH 10/83] hsa/radeon: Add initialization and unmapping of doorbell aperture Oded Gabbay
2014-07-10 21:50 ` [PATCH 11/83] hsa/radeon: Add scheduler code Oded Gabbay
2014-07-11 18:25 ` Jerome Glisse
2014-07-11 18:25 ` Jerome Glisse
2014-07-17 11:57 ` Oded Gabbay
2014-07-17 11:57 ` Oded Gabbay
2014-07-10 21:50 ` [PATCH 12/83] hsa/radeon: Add kfd mmap handler Oded Gabbay
2014-07-11 18:47 ` Jerome Glisse
2014-07-11 18:47 ` Jerome Glisse
2014-07-10 21:50 ` [PATCH 13/83] hsa/radeon: Add 2 new IOCTL to kfd, CREATE_QUEUE and DESTROY_QUEUE Oded Gabbay
2014-07-11 19:19 ` Jerome Glisse
2014-07-11 19:19 ` Jerome Glisse
2014-07-11 21:01 ` Jerome Glisse
2014-07-11 21:01 ` Jerome Glisse
2014-07-11 21:42 ` Dave Airlie
2014-07-11 21:42 ` Dave Airlie
2014-07-14 7:33 ` Gabbay, Oded
2014-07-14 7:33 ` Gabbay, Oded
2014-07-10 21:50 ` [PATCH 14/83] hsa/radeon: Update MAINTAINERS and CREDITS files Oded Gabbay
2014-07-10 21:50 ` [PATCH 15/83] hsa/radeon: Add interrupt handling module Oded Gabbay
2014-07-11 19:57 ` Jerome Glisse [this message]
2014-07-11 19:57 ` Jerome Glisse
2014-07-10 21:50 ` [PATCH 16/83] hsa/radeon: Add the isr function of the KFD scehduler Oded Gabbay
2014-07-10 21:50 ` [PATCH 17/83] hsa/radeon: Handle deactivation of queues using interrupts Oded Gabbay
2014-07-10 21:50 ` [PATCH 18/83] hsa/radeon: Enable interrupts in KFD scheduler Oded Gabbay
2014-07-10 21:50 ` [PATCH 19/83] hsa/radeon: Enable/Disable KFD interrupt module Oded Gabbay
2014-07-10 21:50 ` [PATCH 20/83] hsa/radeon: Add interrupt callback function to kgd2kfd interface Oded Gabbay
2014-07-10 21:50 ` [PATCH 21/83] hsa/radeon: Add kgd-->kfd interfaces for suspend and resume Oded Gabbay
2014-07-10 21:50 ` [PATCH 22/83] drm/radeon: Add calls to suspend and resume of kfd driver Oded Gabbay
2014-07-10 21:50 ` [PATCH 23/83] drm/radeon/cik: Don't touch int of pipes 1-7 Oded Gabbay
2014-07-10 21:50 ` [PATCH 24/83] drm/radeon/cik: Call kfd isr function Oded Gabbay
2014-07-10 21:50 ` [PATCH 25/83] hsa/radeon: fix the OEMID assignment in kfd_topology Oded Gabbay
2014-07-10 21:50 ` [PATCH 26/83] hsa/radeon: Make binding of process to device permanent Oded Gabbay
[not found] ` <1405029027-6085-1-git-send-email-oded.gabbay-5C7GfCeVMHo@public.gmane.org>
2014-07-10 21:50 ` [PATCH 27/83] hsa/radeon: Implement hsaKmtSetMemoryPolicy Oded Gabbay
2014-07-10 21:50 ` Oded Gabbay
2014-07-11 16:05 ` [PATCH 02/83] drm/radeon: reduce number of free VMIDs and pipes in KV Jerome Glisse
2014-07-11 16:05 ` Jerome Glisse
2014-07-11 16:18 ` Christian König
2014-07-11 16:18 ` Christian König
2014-07-11 16:22 ` Alex Deucher
2014-07-11 16:22 ` Alex Deucher
2014-07-11 17:07 ` Bridgman, John
2014-07-11 17:07 ` Bridgman, John
2014-07-11 17:59 ` Ilyes Gouta
2014-07-11 22:54 ` Bridgman, John
2014-07-11 22:54 ` Bridgman, John
2014-07-12 9:00 ` Christian König
2014-07-12 9:00 ` Christian König
2014-07-14 7:31 ` Michel Dänzer
2014-07-14 7:31 ` Michel Dänzer
2014-07-14 7:38 ` Michel Dänzer
2014-07-14 7:58 ` Christian König
2014-07-17 11:47 ` Oded Gabbay
2014-07-17 11:47 ` 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=20140711195717.GQ1870@gmail.com \
--to=j.glisse@gmail.com \
--cc=Andrew.Lewycky@amd.com \
--cc=alexander.deucher@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oded.gabbay@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.