From: Manoj Kumar <manoj@linux.vnet.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH v5 13/18] cxl: sysfs support for guests
Date: Wed, 24 Feb 2016 13:03:35 -0600 [thread overview]
Message-ID: <56CDFE87.50908@linux.vnet.ibm.com> (raw)
In-Reply-To: <1456244519-18934-14-git-send-email-fbarrat@linux.vnet.ibm.com>
Reviewed-by: Manoj Kumar <manoj@linux.vnet.ibm.com>
---
Manoj Kumar
On 2/23/2016 10:21 AM, Frederic Barrat wrote:
> From: Christophe Lombard <clombard@linux.vnet.ibm.com>
>
> Filter out a few adapter parameters which don't make sense in a guest.
> Document the changes.
>
> Co-authored-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
> Signed-off-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
> Signed-off-by: Christophe Lombard <clombard@linux.vnet.ibm.com>
> ---
> Documentation/ABI/testing/sysfs-class-cxl | 8 +++----
> drivers/misc/cxl/cxl.h | 1 +
> drivers/misc/cxl/guest.c | 12 +++++++++++
> drivers/misc/cxl/native.c | 6 ++++++
> drivers/misc/cxl/sysfs.c | 36 +++++++++++++++++++++++--------
> 5 files changed, 50 insertions(+), 13 deletions(-)
>
> diff --git a/Documentation/ABI/testing/sysfs-class-cxl b/Documentation/ABI/testing/sysfs-class-cxl
> index b07e86d..4d0da47 100644
> --- a/Documentation/ABI/testing/sysfs-class-cxl
> +++ b/Documentation/ABI/testing/sysfs-class-cxl
> @@ -183,7 +183,7 @@ Description: read only
> Identifies the revision level of the PSL.
> Users: https://github.com/ibm-capi/libcxl
>
> -What: /sys/class/cxl/<card>/base_image
> +What: /sys/class/cxl/<card>/base_image (not in a guest)
> Date: September 2014
> Contact: linuxppc-dev@lists.ozlabs.org
> Description: read only
> @@ -193,7 +193,7 @@ Description: read only
> during the initial program load.
> Users: https://github.com/ibm-capi/libcxl
>
> -What: /sys/class/cxl/<card>/image_loaded
> +What: /sys/class/cxl/<card>/image_loaded (not in a guest)
> Date: September 2014
> Contact: linuxppc-dev@lists.ozlabs.org
> Description: read only
> @@ -201,7 +201,7 @@ Description: read only
> onto the card.
> Users: https://github.com/ibm-capi/libcxl
>
> -What: /sys/class/cxl/<card>/load_image_on_perst
> +What: /sys/class/cxl/<card>/load_image_on_perst (not in a guest)
> Date: December 2014
> Contact: linuxppc-dev@lists.ozlabs.org
> Description: read/write
> @@ -224,7 +224,7 @@ Description: write only
> to reload the FPGA depending on load_image_on_perst.
> Users: https://github.com/ibm-capi/libcxl
>
> -What: /sys/class/cxl/<card>/perst_reloads_same_image
> +What: /sys/class/cxl/<card>/perst_reloads_same_image (not in a guest)
> Date: July 2015
> Contact: linuxppc-dev@lists.ozlabs.org
> Description: read/write
> diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
> index 4372a87..e54bf4f 100644
> --- a/drivers/misc/cxl/cxl.h
> +++ b/drivers/misc/cxl/cxl.h
> @@ -844,6 +844,7 @@ struct cxl_backend_ops {
> int (*attach_process)(struct cxl_context *ctx, bool kernel,
> u64 wed, u64 amr);
> int (*detach_process)(struct cxl_context *ctx);
> + bool (*support_attributes)(const char *attr_name);
> bool (*link_ok)(struct cxl *cxl);
> void (*release_afu)(struct device *dev);
> ssize_t (*afu_read_err_buffer)(struct cxl_afu *afu, char *buf,
> diff --git a/drivers/misc/cxl/guest.c b/drivers/misc/cxl/guest.c
> index 03eb83d..d02ff03 100644
> --- a/drivers/misc/cxl/guest.c
> +++ b/drivers/misc/cxl/guest.c
> @@ -596,6 +596,17 @@ static int guest_afu_check_and_enable(struct cxl_afu *afu)
> return 0;
> }
>
> +static bool guest_support_attributes(const char *attr_name)
> +{
> + if ((strcmp(attr_name, "base_image") == 0) ||
> + (strcmp(attr_name, "load_image_on_perst") == 0) ||
> + (strcmp(attr_name, "perst_reloads_same_image") == 0) ||
> + (strcmp(attr_name, "image_loaded") == 0))
> + return false;
> +
> + return true;
> +}
> +
> static int activate_afu_directed(struct cxl_afu *afu)
> {
> int rc;
> @@ -936,6 +947,7 @@ const struct cxl_backend_ops cxl_guest_ops = {
> .ack_irq = guest_ack_irq,
> .attach_process = guest_attach_process,
> .detach_process = guest_detach_process,
> + .support_attributes = guest_support_attributes,
> .link_ok = guest_link_ok,
> .release_afu = guest_release_afu,
> .afu_read_err_buffer = guest_afu_read_err_buffer,
> diff --git a/drivers/misc/cxl/native.c b/drivers/misc/cxl/native.c
> index c0bca59..acb9486 100644
> --- a/drivers/misc/cxl/native.c
> +++ b/drivers/misc/cxl/native.c
> @@ -967,6 +967,11 @@ int cxl_check_error(struct cxl_afu *afu)
> return (cxl_p1n_read(afu, CXL_PSL_SCNTL_An) == ~0ULL);
> }
>
> +static bool native_support_attributes(const char *attr_name)
> +{
> + return true;
> +}
> +
> static int native_afu_cr_read64(struct cxl_afu *afu, int cr, u64 off, u64 *out)
> {
> if (unlikely(!cxl_ops->link_ok(afu->adapter)))
> @@ -1026,6 +1031,7 @@ const struct cxl_backend_ops cxl_native_ops = {
> .ack_irq = native_ack_irq,
> .attach_process = native_attach_process,
> .detach_process = native_detach_process,
> + .support_attributes = native_support_attributes,
> .link_ok = cxl_adapter_link_ok,
> .release_afu = cxl_pci_release_afu,
> .afu_read_err_buffer = cxl_pci_afu_read_err_buffer,
> diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c
> index 1a1409c..41963d4 100644
> --- a/drivers/misc/cxl/sysfs.c
> +++ b/drivers/misc/cxl/sysfs.c
> @@ -253,8 +253,14 @@ static ssize_t irqs_max_store(struct device *device,
> if (irqs_max < afu->pp_irqs)
> return -EINVAL;
>
> - if (irqs_max > afu->adapter->user_irqs)
> - return -EINVAL;
> + if (cpu_has_feature(CPU_FTR_HVMODE)) {
> + if (irqs_max > afu->adapter->user_irqs)
> + return -EINVAL;
> + } else {
> + /* pHyp sets a per-AFU limit */
> + if (irqs_max > afu->guest->max_ints)
> + return -EINVAL;
> + }
>
> afu->irqs_max = irqs_max;
> return count;
> @@ -406,24 +412,36 @@ static struct device_attribute afu_attrs[] = {
>
> int cxl_sysfs_adapter_add(struct cxl *adapter)
> {
> + struct device_attribute *dev_attr;
> int i, rc;
>
> for (i = 0; i < ARRAY_SIZE(adapter_attrs); i++) {
> - if ((rc = device_create_file(&adapter->dev, &adapter_attrs[i])))
> - goto err;
> + dev_attr = &adapter_attrs[i];
> + if (cxl_ops->support_attributes(dev_attr->attr.name)) {
> + if ((rc = device_create_file(&adapter->dev, dev_attr)))
> + goto err;
> + }
> }
> return 0;
> err:
> - for (i--; i >= 0; i--)
> - device_remove_file(&adapter->dev, &adapter_attrs[i]);
> + for (i--; i >= 0; i--) {
> + dev_attr = &adapter_attrs[i];
> + if (cxl_ops->support_attributes(dev_attr->attr.name))
> + device_remove_file(&adapter->dev, dev_attr);
> + }
> return rc;
> }
> +
> void cxl_sysfs_adapter_remove(struct cxl *adapter)
> {
> + struct device_attribute *dev_attr;
> int i;
>
> - for (i = 0; i < ARRAY_SIZE(adapter_attrs); i++)
> - device_remove_file(&adapter->dev, &adapter_attrs[i]);
> + for (i = 0; i < ARRAY_SIZE(adapter_attrs); i++) {
> + dev_attr = &adapter_attrs[i];
> + if (cxl_ops->support_attributes(dev_attr->attr.name))
> + device_remove_file(&adapter->dev, dev_attr);
> + }
> }
>
> struct afu_config_record {
> @@ -534,7 +552,7 @@ static struct afu_config_record *cxl_sysfs_afu_new_cr(struct cxl_afu *afu, int c
> /*
> * Export raw AFU PCIe like config record. For now this is read only by
> * root - we can expand that later to be readable by non-root and maybe
> - * even writable provided we have a good use-case. Once we suport
> + * even writable provided we have a good use-case. Once we support
> * exposing AFUs through a virtual PHB they will get that for free from
> * Linux' PCI infrastructure, but until then it's not clear that we
> * need it for anything since the main use case is just identifying
>
next prev parent reply other threads:[~2016-02-24 19:03 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-23 16:21 [PATCH v5 00/18] cxl: Add support for powerVM guest Frederic Barrat
2016-02-23 16:21 ` [PATCH v5 01/18] cxl: Move common code away from bare-metal-specific files Frederic Barrat
2016-02-23 19:08 ` Manoj Kumar
2016-02-23 16:21 ` [PATCH v5 02/18] cxl: Move bare-metal specific code to specialized files Frederic Barrat
2016-02-23 19:09 ` Manoj Kumar
2016-02-23 16:21 ` [PATCH v5 03/18] cxl: Define process problem state area at attach time only Frederic Barrat
2016-02-23 19:09 ` Manoj Kumar
2016-03-03 3:55 ` Ian Munsie
2016-02-23 16:21 ` [PATCH v5 04/18] cxl: Introduce implementation-specific API Frederic Barrat
2016-02-23 19:09 ` Manoj Kumar
2016-02-23 16:21 ` [PATCH v5 05/18] cxl: Rename some bare-metal specific functions Frederic Barrat
2016-02-23 19:11 ` Manoj Kumar
2016-03-03 4:56 ` Ian Munsie
2016-02-23 16:21 ` [PATCH v5 06/18] cxl: Isolate a few bare-metal-specific calls Frederic Barrat
2016-02-23 19:12 ` Manoj Kumar
2016-02-23 16:21 ` [PATCH v5 07/18] cxl: Update cxl_irq() prototype Frederic Barrat
2016-02-23 19:13 ` Manoj Kumar
2016-02-23 16:21 ` [PATCH v5 08/18] cxl: IRQ allocation for guests Frederic Barrat
2016-02-23 19:16 ` Manoj Kumar
2016-03-03 4:59 ` Ian Munsie
2016-02-23 16:21 ` [PATCH v5 09/18] cxl: New possible return value from hcall Frederic Barrat
2016-02-23 19:18 ` Manoj Kumar
2016-02-23 19:28 ` Michael Neuling
2016-02-23 16:21 ` [PATCH v5 10/18] cxl: New hcalls to support cxl adapters Frederic Barrat
2016-02-23 19:23 ` Manoj Kumar
2016-03-03 4:04 ` Ian Munsie
2016-02-23 16:21 ` [PATCH v5 11/18] cxl: Separate bare-metal fields in adapter and AFU data structures Frederic Barrat
2016-02-24 16:50 ` Manoj Kumar
2016-03-03 4:09 ` Ian Munsie
2016-02-23 16:21 ` [PATCH v5 12/18] cxl: Add guest-specific code Frederic Barrat
2016-02-24 18:55 ` Manoj Kumar
2016-03-03 5:02 ` Ian Munsie
2016-02-23 16:21 ` [PATCH v5 13/18] cxl: sysfs support for guests Frederic Barrat
2016-02-24 19:03 ` Manoj Kumar [this message]
2016-03-03 5:04 ` Ian Munsie
2016-02-23 16:21 ` [PATCH v5 14/18] cxl: Support to flash a new image on the adapter from a guest Frederic Barrat
2016-02-24 20:03 ` Manoj Kumar
2016-02-25 13:11 ` Frederic Barrat
2016-02-25 16:59 ` Manoj Kumar
2016-03-03 4:52 ` Ian Munsie
2016-02-23 16:21 ` [PATCH v5 15/18] cxl: Parse device tree and create cxl device(s) at boot Frederic Barrat
2016-02-24 20:15 ` Manoj Kumar
2016-02-25 13:19 ` Frederic Barrat
2016-02-25 16:44 ` Manoj Kumar
2016-02-23 16:21 ` [PATCH v5 16/18] cxl: Support the cxl kernel API from a guest Frederic Barrat
2016-02-24 21:09 ` Manoj Kumar
2016-03-03 5:08 ` Ian Munsie
2016-02-23 16:21 ` [PATCH v5 17/18] cxl: Adapter failure handling Frederic Barrat
2016-02-24 21:41 ` Manoj Kumar
2016-02-23 16:21 ` [PATCH v5 18/18] cxl: Add tracepoints around the cxl hcall Frederic Barrat
2016-02-24 21:49 ` Manoj Kumar
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=56CDFE87.50908@linux.vnet.ibm.com \
--to=manoj@linux.vnet.ibm.com \
--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 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.