From: Frederic Barrat <fbarrat@linux.ibm.com>
To: "Alastair D'Silva" <alastair@au1.ibm.com>, alastair@d-silva.org
Cc: Andrew Donnellan <andrew.donnellan@au1.ibm.com>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH v3 5/7] ocxl: afu_irq only deals with IRQ IDs, not offsets
Date: Mon, 25 Mar 2019 16:24:54 +0100 [thread overview]
Message-ID: <b061390f-fb28-de5a-f504-8b5441e33be5@linux.ibm.com> (raw)
In-Reply-To: <20190325054438.15022-6-alastair@au1.ibm.com>
Le 25/03/2019 à 06:44, Alastair D'Silva a écrit :
> From: Alastair D'Silva <alastair@d-silva.org>
>
> The use of offsets is required only in the frontend, so alter
> the IRQ API to only work with IRQ IDs in the backend.
>
> Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
> ---
Acked-by: Frederic Barrat <fbarrat@linux.ibm.com>
> drivers/misc/ocxl/afu_irq.c | 34 +++++++++++++++----------------
> drivers/misc/ocxl/context.c | 7 +++++--
> drivers/misc/ocxl/file.c | 13 +++++++-----
> drivers/misc/ocxl/ocxl_internal.h | 10 +++++----
> drivers/misc/ocxl/trace.h | 12 ++++-------
> 5 files changed, 39 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/misc/ocxl/afu_irq.c b/drivers/misc/ocxl/afu_irq.c
> index 11ab996657a2..2d410cd6f817 100644
> --- a/drivers/misc/ocxl/afu_irq.c
> +++ b/drivers/misc/ocxl/afu_irq.c
> @@ -14,14 +14,14 @@ struct afu_irq {
> struct eventfd_ctx *ev_ctx;
> };
>
> -static int irq_offset_to_id(struct ocxl_context *ctx, u64 offset)
> +int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset)
> {
> return (offset - ctx->afu->irq_base_offset) >> PAGE_SHIFT;
> }
>
> -static u64 irq_id_to_offset(struct ocxl_context *ctx, int id)
> +u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id)
> {
> - return ctx->afu->irq_base_offset + (id << PAGE_SHIFT);
> + return ctx->afu->irq_base_offset + (irq_id << PAGE_SHIFT);
> }
>
> static irqreturn_t afu_irq_handler(int virq, void *data)
> @@ -69,7 +69,7 @@ static void release_afu_irq(struct afu_irq *irq)
> kfree(irq->name);
> }
>
> -int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset)
> +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id)
> {
> struct afu_irq *irq;
> int rc;
> @@ -101,11 +101,11 @@ int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset)
> if (rc)
> goto err_alloc;
>
> - *irq_offset = irq_id_to_offset(ctx, irq->id);
> -
> - trace_ocxl_afu_irq_alloc(ctx->pasid, irq->id, irq->virq, irq->hw_irq,
> - *irq_offset);
> + trace_ocxl_afu_irq_alloc(ctx->pasid, irq->id, irq->virq, irq->hw_irq);
> mutex_unlock(&ctx->irq_lock);
> +
> + *irq_id = irq->id;
> +
> return 0;
>
> err_alloc:
> @@ -123,7 +123,7 @@ static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx)
> trace_ocxl_afu_irq_free(ctx->pasid, irq->id);
> if (ctx->mapping)
> unmap_mapping_range(ctx->mapping,
> - irq_id_to_offset(ctx, irq->id),
> + ocxl_irq_id_to_offset(ctx, irq->id),
> 1 << PAGE_SHIFT, 1);
> release_afu_irq(irq);
> if (irq->ev_ctx)
> @@ -132,14 +132,13 @@ static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx)
> kfree(irq);
> }
>
> -int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset)
> +int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id)
> {
> struct afu_irq *irq;
> - int id = irq_offset_to_id(ctx, irq_offset);
>
> mutex_lock(&ctx->irq_lock);
>
> - irq = idr_find(&ctx->irq_idr, id);
> + irq = idr_find(&ctx->irq_idr, irq_id);
> if (!irq) {
> mutex_unlock(&ctx->irq_lock);
> return -EINVAL;
> @@ -161,14 +160,14 @@ void ocxl_afu_irq_free_all(struct ocxl_context *ctx)
> mutex_unlock(&ctx->irq_lock);
> }
>
> -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd)
> +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id, int eventfd)
> {
> struct afu_irq *irq;
> struct eventfd_ctx *ev_ctx;
> - int rc = 0, id = irq_offset_to_id(ctx, irq_offset);
> + int rc = 0;
>
> mutex_lock(&ctx->irq_lock);
> - irq = idr_find(&ctx->irq_idr, id);
> + irq = idr_find(&ctx->irq_idr, irq_id);
> if (!irq) {
> rc = -EINVAL;
> goto unlock;
> @@ -186,14 +185,13 @@ int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd)
> return rc;
> }
>
> -u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset)
> +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id)
> {
> struct afu_irq *irq;
> - int id = irq_offset_to_id(ctx, irq_offset);
> u64 addr = 0;
>
> mutex_lock(&ctx->irq_lock);
> - irq = idr_find(&ctx->irq_idr, id);
> + irq = idr_find(&ctx->irq_idr, irq_id);
> if (irq)
> addr = irq->trigger_page;
> mutex_unlock(&ctx->irq_lock);
> diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c
> index 8b97b0f19db8..d6056883b85d 100644
> --- a/drivers/misc/ocxl/context.c
> +++ b/drivers/misc/ocxl/context.c
> @@ -93,8 +93,9 @@ static vm_fault_t map_afu_irq(struct vm_area_struct *vma, unsigned long address,
> u64 offset, struct ocxl_context *ctx)
> {
> u64 trigger_addr;
> + int irq_id = ocxl_irq_offset_to_id(ctx, offset);
>
> - trigger_addr = ocxl_afu_irq_get_addr(ctx, offset);
> + trigger_addr = ocxl_afu_irq_get_addr(ctx, irq_id);
> if (!trigger_addr)
> return VM_FAULT_SIGBUS;
>
> @@ -154,12 +155,14 @@ static const struct vm_operations_struct ocxl_vmops = {
> static int check_mmap_afu_irq(struct ocxl_context *ctx,
> struct vm_area_struct *vma)
> {
> + int irq_id = ocxl_irq_offset_to_id(ctx, vma->vm_pgoff << PAGE_SHIFT);
> +
> /* only one page */
> if (vma_pages(vma) != 1)
> return -EINVAL;
>
> /* check offset validty */
> - if (!ocxl_afu_irq_get_addr(ctx, vma->vm_pgoff << PAGE_SHIFT))
> + if (!ocxl_afu_irq_get_addr(ctx, irq_id))
> return -EINVAL;
>
> /*
> diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c
> index e51578186fd4..2585fc991108 100644
> --- a/drivers/misc/ocxl/file.c
> +++ b/drivers/misc/ocxl/file.c
> @@ -196,6 +196,7 @@ static long afu_ioctl(struct file *file, unsigned int cmd,
> {
> struct ocxl_context *ctx = file->private_data;
> struct ocxl_ioctl_irq_fd irq_fd;
> + int irq_id;
> u64 irq_offset;
> long rc;
> bool closed;
> @@ -217,12 +218,13 @@ static long afu_ioctl(struct file *file, unsigned int cmd,
> break;
>
> case OCXL_IOCTL_IRQ_ALLOC:
> - rc = ocxl_afu_irq_alloc(ctx, &irq_offset);
> + rc = ocxl_afu_irq_alloc(ctx, &irq_id);
> if (!rc) {
> + irq_offset = ocxl_irq_id_to_offset(ctx, irq_id);
> rc = copy_to_user((u64 __user *) args, &irq_offset,
> sizeof(irq_offset));
> if (rc) {
> - ocxl_afu_irq_free(ctx, irq_offset);
> + ocxl_afu_irq_free(ctx, irq_id);
> return -EFAULT;
> }
> }
> @@ -233,7 +235,8 @@ static long afu_ioctl(struct file *file, unsigned int cmd,
> sizeof(irq_offset));
> if (rc)
> return -EFAULT;
> - rc = ocxl_afu_irq_free(ctx, irq_offset);
> + irq_id = ocxl_irq_offset_to_id(ctx, irq_offset);
> + rc = ocxl_afu_irq_free(ctx, irq_id);
> break;
>
> case OCXL_IOCTL_IRQ_SET_FD:
> @@ -243,8 +246,8 @@ static long afu_ioctl(struct file *file, unsigned int cmd,
> return -EFAULT;
> if (irq_fd.reserved)
> return -EINVAL;
> - rc = ocxl_afu_irq_set_fd(ctx, irq_fd.irq_offset,
> - irq_fd.eventfd);
> + irq_id = ocxl_irq_offset_to_id(ctx, irq_fd.irq_offset);
> + rc = ocxl_afu_irq_set_fd(ctx, irq_id, irq_fd.eventfd);
> break;
>
> case OCXL_IOCTL_GET_METADATA:
> diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h
> index cda1e7667fc8..923e7f29c693 100644
> --- a/drivers/misc/ocxl/ocxl_internal.h
> +++ b/drivers/misc/ocxl/ocxl_internal.h
> @@ -137,12 +137,14 @@ void ocxl_context_detach_all(struct ocxl_afu *afu);
> int ocxl_sysfs_register_afu(struct ocxl_afu *afu);
> void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu);
>
> -int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset);
> -int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset);
> +int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset);
> +u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id);
> +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id);
> +int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id);
> void ocxl_afu_irq_free_all(struct ocxl_context *ctx);
> -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset,
> +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id,
> int eventfd);
> -u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset);
> +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id);
>
> /**
> * Free an AFU
> diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h
> index bcb7ff330c1e..024f417e7e01 100644
> --- a/drivers/misc/ocxl/trace.h
> +++ b/drivers/misc/ocxl/trace.h
> @@ -107,16 +107,14 @@ DEFINE_EVENT(ocxl_fault_handler, ocxl_fault_ack,
> );
>
> TRACE_EVENT(ocxl_afu_irq_alloc,
> - TP_PROTO(int pasid, int irq_id, unsigned int virq, int hw_irq,
> - u64 irq_offset),
> - TP_ARGS(pasid, irq_id, virq, hw_irq, irq_offset),
> + TP_PROTO(int pasid, int irq_id, unsigned int virq, int hw_irq),
> + TP_ARGS(pasid, irq_id, virq, hw_irq),
>
> TP_STRUCT__entry(
> __field(int, pasid)
> __field(int, irq_id)
> __field(unsigned int, virq)
> __field(int, hw_irq)
> - __field(u64, irq_offset)
> ),
>
> TP_fast_assign(
> @@ -124,15 +122,13 @@ TRACE_EVENT(ocxl_afu_irq_alloc,
> __entry->irq_id = irq_id;
> __entry->virq = virq;
> __entry->hw_irq = hw_irq;
> - __entry->irq_offset = irq_offset;
> ),
>
> - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx",
> + TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d",
> __entry->pasid,
> __entry->irq_id,
> __entry->virq,
> - __entry->hw_irq,
> - __entry->irq_offset
> + __entry->hw_irq
> )
> );
>
>
next prev parent reply other threads:[~2019-03-25 15:25 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-27 4:57 [PATCH 0/5] ocxl: OpenCAPI Cleanup Alastair D'Silva
2019-02-27 4:57 ` [PATCH 1/5] ocxl: Rename struct link to ocxl_link Alastair D'Silva
2019-02-27 7:15 ` Andrew Donnellan
2019-02-27 7:34 ` Alastair D'Silva
2019-02-27 7:54 ` Andrew Donnellan
2019-02-27 8:04 ` Alastair D'Silva
2019-02-27 8:18 ` Andrew Donnellan
2019-02-27 13:45 ` Frederic Barrat
2019-02-27 13:59 ` Greg Kurz
2019-02-27 13:53 ` Greg Kurz
2019-02-27 4:57 ` [PATCH 2/5] ocxl: Clean up printf formats Alastair D'Silva
2019-02-27 13:40 ` Frederic Barrat
2019-02-28 5:02 ` Andrew Donnellan
2019-03-02 1:13 ` Joe Perches
2019-02-27 4:57 ` [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void Alastair D'Silva
2019-02-27 13:25 ` Frederic Barrat
2019-02-28 5:03 ` Andrew Donnellan
2019-02-27 4:57 ` [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers Alastair D'Silva
2019-02-27 13:36 ` Frederic Barrat
2019-02-28 5:05 ` Andrew Donnellan
2019-02-27 4:57 ` [PATCH 5/5] ocxl: Remove some unused exported symbols Alastair D'Silva
2019-02-27 13:39 ` Frederic Barrat
2019-02-28 5:23 ` Andrew Donnellan
2019-03-13 4:06 ` [PATCH v2 0/5] ocxl: OpenCAPI Cleanup Alastair D'Silva
2019-03-13 4:06 ` [PATCH 1/5] ocxl: Rename struct link to ocxl_link Alastair D'Silva
2019-03-15 6:58 ` Andrew Donnellan
2019-03-13 4:06 ` [PATCH 2/5] ocxl: Clean up printf formats Alastair D'Silva
2019-03-13 8:24 ` Greg Kurz
2019-03-14 4:58 ` Andrew Donnellan
2019-03-13 4:06 ` [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void Alastair D'Silva
2019-03-14 4:59 ` Andrew Donnellan
2019-03-13 4:07 ` [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers Alastair D'Silva
2019-03-13 8:28 ` Greg Kurz
2019-03-14 5:08 ` Andrew Donnellan
2019-03-13 4:07 ` [PATCH 5/5] ocxl: Remove some unused exported symbols Alastair D'Silva
2019-03-13 9:10 ` Greg Kurz
2019-03-14 2:23 ` Alastair D'Silva
2019-03-14 6:50 ` Greg Kurz
2019-03-15 4:49 ` Andrew Donnellan
2019-03-15 5:07 ` Andrew Donnellan
2019-03-20 5:34 ` [PATCH v3 0/5] ocxl: OpenCAPI Cleanup Alastair D'Silva
2019-03-20 5:34 ` [PATCH v3 1/5] ocxl: Rename struct link to ocxl_link Alastair D'Silva
2019-03-20 5:34 ` [PATCH v3 2/5] ocxl: Clean up printf formats Alastair D'Silva
2019-03-20 17:24 ` Joe Perches
2019-03-20 5:34 ` [PATCH v3 3/5] ocxl: read_pasid never returns an error, so make it void Alastair D'Silva
2019-03-20 5:34 ` [PATCH v3 4/5] ocxl: Remove superfluous 'extern' from headers Alastair D'Silva
2019-03-20 5:34 ` [PATCH v3 5/5] ocxl: Remove some unused exported symbols Alastair D'Silva
2019-03-25 5:34 ` [PATCH v4 0/4] ocxl: OpenCAPI Cleanup Alastair D'Silva
2019-03-25 5:34 ` [PATCH v4 1/4] ocxl: Rename struct link to ocxl_link Alastair D'Silva
2019-04-03 14:18 ` Frederic Barrat
2019-04-05 7:05 ` Andrew Donnellan
2019-05-03 6:59 ` Michael Ellerman
2019-03-25 5:34 ` [PATCH v4 2/4] ocxl: read_pasid never returns an error, so make it void Alastair D'Silva
2019-04-03 14:20 ` Frederic Barrat
2019-04-05 7:05 ` Andrew Donnellan
2019-03-25 5:34 ` [PATCH v4 3/4] ocxl: Remove superfluous 'extern' from headers Alastair D'Silva
2019-03-25 16:55 ` Greg Kurz
2019-04-03 14:20 ` Frederic Barrat
2019-04-05 7:09 ` Andrew Donnellan
2019-03-25 5:34 ` [PATCH v4 4/4] ocxl: Remove some unused exported symbols Alastair D'Silva
2019-03-25 16:57 ` Greg Kurz
2019-04-03 14:23 ` Frederic Barrat
2019-04-05 7:28 ` Andrew Donnellan
2019-03-25 16:49 ` [PATCH v4 0/4] ocxl: OpenCAPI Cleanup Greg Kurz
2019-03-25 17:34 ` Frederic Barrat
2019-03-25 21:45 ` Alastair D'Silva
2019-03-25 5:44 ` [PATCH v3 0/7] Refactor OCXL driver to allow external drivers to use it Alastair D'Silva
2019-03-25 5:44 ` [PATCH v3 1/7] ocxl: Split pci.c Alastair D'Silva
2019-03-25 10:01 ` Frederic Barrat
2019-03-25 5:44 ` [PATCH v3 2/7] ocxl: Don't pass pci_dev around Alastair D'Silva
2019-03-25 10:04 ` Frederic Barrat
2019-03-25 5:44 ` [PATCH v3 3/7] ocxl: Create a clear delineation between ocxl backend & frontend Alastair D'Silva
2019-03-25 15:11 ` Frederic Barrat
2019-03-25 5:44 ` [PATCH v3 4/7] ocxl: Allow external drivers to use OpenCAPI contexts Alastair D'Silva
2019-03-25 15:13 ` Frederic Barrat
2019-03-25 5:44 ` [PATCH v3 5/7] ocxl: afu_irq only deals with IRQ IDs, not offsets Alastair D'Silva
2019-03-25 15:24 ` Frederic Barrat [this message]
2019-03-25 5:44 ` [PATCH v3 6/7] ocxl: move event_fd handling to frontend Alastair D'Silva
2019-03-25 15:41 ` Frederic Barrat
2019-03-25 5:44 ` [PATCH v3 7/7] ocxl: Provide global MMIO accessors for external drivers Alastair D'Silva
2019-03-25 15:49 ` Frederic Barrat
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=b061390f-fb28-de5a-f504-8b5441e33be5@linux.ibm.com \
--to=fbarrat@linux.ibm.com \
--cc=alastair@au1.ibm.com \
--cc=alastair@d-silva.org \
--cc=andrew.donnellan@au1.ibm.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.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;
as well as URLs for NNTP newsgroup(s).