| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20190227145346.2fc86646@bahia.lan>
Date: Wed, 27 Feb 2019 14:53:46 +0100
From: Greg Kurz <groug@...d.org>
To: "Alastair D'Silva" <alastair@....ibm.com>
Cc: alastair@...ilva.org, Frederic Barrat <fbarrat@...ux.ibm.com>,
Andrew Donnellan <andrew.donnellan@....ibm.com>,
Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
linuxppc-dev@...ts.ozlabs.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link
On Wed, 27 Feb 2019 15:57:37 +1100
"Alastair D'Silva" <alastair@....ibm.com> wrote:
> From: Alastair D'Silva <alastair@...ilva.org>
>
> The term 'link' is ambiguous (especially when the struct is used for a
> list), so rename it for clarity.
>
> Signed-off-by: Alastair D'Silva <alastair@...ilva.org>
> Reviewed-by: Greg Kurz <groug@...d.org>
> ---
> drivers/misc/ocxl/file.c | 2 +-
> drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------
> 2 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c
> index e6a607488f8a..16eb8a60d5c7 100644
> --- a/drivers/misc/ocxl/file.c
> +++ b/drivers/misc/ocxl/file.c
> @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx,
>
> if (status == ATTACHED) {
> int rc;
> - struct link *link = ctx->afu->fn->link;
> + void *link = ctx->afu->fn->link;
>
Thinking about that again, the link variable only has one user. Irrespectively
of the discussion on adding a struct ocxl_link forward declaration in the
private header and changing the API, link isn't needed in the first place...
> rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr);
... and we could just do:
rc = ocxl_link_update_pe(ctx->afu->fn->link, ctx->pasid,
ctx->tidr);
I guess it is acceptable to do this change "while here" since the patch is
about dropping the ambiguous 'link' term.
> if (rc)
> diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c
> index d50b861d7e57..8d2690a1a9de 100644
> --- a/drivers/misc/ocxl/link.c
> +++ b/drivers/misc/ocxl/link.c
> @@ -76,7 +76,7 @@ struct spa {
> * limited number of opencapi slots on a system and lookup is only
> * done when the device is probed
> */
> -struct link {
> +struct ocxl_link {
> struct list_head list;
> struct kref ref;
> int domain;
> @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work)
>
> static irqreturn_t xsl_fault_handler(int irq, void *data)
> {
> - struct link *link = (struct link *) data;
> + struct ocxl_link *link = (struct ocxl_link *) data;
> struct spa *spa = link->spa;
> u64 dsisr, dar, pe_handle;
> struct pe_data *pe_data;
> @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa)
> &spa->reg_tfc, &spa->reg_pe_handle);
> }
>
> -static int setup_xsl_irq(struct pci_dev *dev, struct link *link)
> +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link)
> {
> struct spa *spa = link->spa;
> int rc;
> @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link)
> return rc;
> }
>
> -static void release_xsl_irq(struct link *link)
> +static void release_xsl_irq(struct ocxl_link *link)
> {
> struct spa *spa = link->spa;
>
> @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link)
> unmap_irq_registers(spa);
> }
>
> -static int alloc_spa(struct pci_dev *dev, struct link *link)
> +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link)
> {
> struct spa *spa;
>
> @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link)
> return 0;
> }
>
> -static void free_spa(struct link *link)
> +static void free_spa(struct ocxl_link *link)
> {
> struct spa *spa = link->spa;
>
> @@ -364,12 +364,12 @@ static void free_spa(struct link *link)
> }
> }
>
> -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link)
> +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link)
> {
> - struct link *link;
> + struct ocxl_link *link;
> int rc;
>
> - link = kzalloc(sizeof(struct link), GFP_KERNEL);
> + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL);
> if (!link)
> return -ENOMEM;
>
> @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link)
> return rc;
> }
>
> -static void free_link(struct link *link)
> +static void free_link(struct ocxl_link *link)
> {
> release_xsl_irq(link);
> free_spa(link);
> @@ -415,7 +415,7 @@ static void free_link(struct link *link)
> int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle)
> {
> int rc = 0;
> - struct link *link;
> + struct ocxl_link *link;
>
> mutex_lock(&links_list_lock);
> list_for_each_entry(link, &links_list, list) {
> @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup);
>
> static void release_xsl(struct kref *ref)
> {
> - struct link *link = container_of(ref, struct link, ref);
> + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref);
>
> list_del(&link->list);
> /* call platform code before releasing data */
> @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref)
>
> void ocxl_link_release(struct pci_dev *dev, void *link_handle)
> {
> - struct link *link = (struct link *) link_handle;
> + struct ocxl_link *link = (struct ocxl_link *) link_handle;
>
> mutex_lock(&links_list_lock);
> kref_put(&link->ref, release_xsl);
> @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr,
> void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr),
> void *xsl_err_data)
> {
> - struct link *link = (struct link *) link_handle;
> + struct ocxl_link *link = (struct ocxl_link *) link_handle;
> struct spa *spa = link->spa;
> struct ocxl_process_element *pe;
> int pe_handle, rc = 0;
> @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe);
>
> int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid)
> {
> - struct link *link = (struct link *) link_handle;
> + struct ocxl_link *link = (struct ocxl_link *) link_handle;
> struct spa *spa = link->spa;
> struct ocxl_process_element *pe;
> int pe_handle, rc;
> @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid)
>
> int ocxl_link_remove_pe(void *link_handle, int pasid)
> {
> - struct link *link = (struct link *) link_handle;
> + struct ocxl_link *link = (struct ocxl_link *) link_handle;
> struct spa *spa = link->spa;
> struct ocxl_process_element *pe;
> struct pe_data *pe_data;
> @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe);
>
> int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr)
> {
> - struct link *link = (struct link *) link_handle;
> + struct ocxl_link *link = (struct ocxl_link *) link_handle;
> int rc, irq;
> u64 addr;
>
> @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc);
>
> void ocxl_link_free_irq(void *link_handle, int hw_irq)
> {
> - struct link *link = (struct link *) link_handle;
> + struct ocxl_link *link = (struct ocxl_link *) link_handle;
>
> pnv_ocxl_free_xive_irq(hw_irq);
> atomic_inc(&link->irq_available);
Powered by blists - more mailing lists