From: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
To: Vaibhav Jain <vaibhav@linux.ibm.com>, nvdimm@lists.linux.dev
Cc: Dan Williams <dan.j.williams@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Ira Weiny <ira.weiny@intel.com>,
Shivaprasad G Bhat <sbhat@linux.ibm.com>
Subject: Re: [ndctl PATCH 2/2] libndctl/papr: Add limited support for inject-smart
Date: Tue, 13 Jul 2021 10:13:12 +0530 [thread overview]
Message-ID: <527107a5-c124-6e85-2364-499d9bb0913e@linux.ibm.com> (raw)
In-Reply-To: <20210712173132.1205192-3-vaibhav@linux.ibm.com>
On 7/12/21 11:01 PM, Vaibhav Jain wrote:
> Implements support for ndctl inject-smart command by providing an
> implementation of 'smart_inject*' dimm-ops callbacks. Presently only
> support for injecting unsafe-shutdown and fatal-health states is
> available.
>
> The patch also introduce various PAPR PDSM structures that are used to
> communicate the inject-smart errors to the papr_scm kernel
> module. This is done via SMART_INJECT PDSM which sends a payload of
> type 'struct nd_papr_pdsm_smart_inject'.
>
> The patch depends on the kernel PAPR PDSM implementation for
> PDSM_SMART_INJECT posted at [1].
>
> [1] : https://lore.kernel.org/nvdimm/20210712084819.1150350-1-vaibhav@linux.ibm.com
> Signed-off-by: Shivaprasad G Bhat <sbhat@linux.ibm.com>
> Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com>
> ---
> ndctl/lib/papr.c | 61 +++++++++++++++++++++++++++++++++++++++++++
> ndctl/lib/papr_pdsm.h | 17 ++++++++++++
> 2 files changed, 78 insertions(+)
>
> diff --git a/ndctl/lib/papr.c b/ndctl/lib/papr.c
> index 42ff200dc588..b797e1e5fe8b 100644
> --- a/ndctl/lib/papr.c
> +++ b/ndctl/lib/papr.c
> @@ -221,6 +221,41 @@ static unsigned int papr_smart_get_shutdown_state(struct ndctl_cmd *cmd)
> return health.dimm_bad_shutdown;
> }
>
> +static int papr_smart_inject_supported(struct ndctl_dimm *dimm)
> +{
> + if (!ndctl_dimm_is_cmd_supported(dimm, ND_CMD_CALL))
> + return -EOPNOTSUPP;
> +
> + if (!test_dimm_dsm(dimm, PAPR_PDSM_SMART_INJECT))
> + return -EIO;
> +
> + return ND_SMART_INJECT_HEALTH_STATE | ND_SMART_INJECT_UNCLEAN_SHUTDOWN;
> +}
> +
with ndtest PAPR_SCM_FAMILY driver, should we test more inject types? if
so should the supported inject types be fetched from the driver?
> +static int papr_smart_inject_valid(struct ndctl_cmd *cmd)
> +{
> + if (cmd->type != ND_CMD_CALL ||
> + to_pdsm(cmd)->cmd_status != 0 ||
> + to_pdsm_cmd(cmd) != PAPR_PDSM_SMART_INJECT)
> + return -EINVAL;
> +
> + return 0;
> +}
> +
> +static struct ndctl_cmd *papr_new_smart_inject(struct ndctl_dimm *dimm)
> +{
> + struct ndctl_cmd *cmd;
> +
> + cmd = allocate_cmd(dimm, PAPR_PDSM_SMART_INJECT,
> + sizeof(struct nd_papr_pdsm_smart_inject));
> + if (!cmd)
> + return NULL;
> + /* Set the input payload size */
> + to_ndcmd(cmd)->nd_size_in = ND_PDSM_HDR_SIZE +
> + sizeof(struct nd_papr_pdsm_smart_inject);
> + return cmd;
> +}
> +
> static unsigned int papr_smart_get_life_used(struct ndctl_cmd *cmd)
> {
> struct nd_papr_pdsm_health health;
> @@ -255,11 +290,37 @@ static unsigned int papr_smart_get_shutdown_count(struct ndctl_cmd *cmd)
>
> return (health.extension_flags & PDSM_DIMM_DSC_VALID) ?
> (health.dimm_dsc) : 0;
> +}
> +
> +static int papr_cmd_smart_inject_fatal(struct ndctl_cmd *cmd, bool enable)
> +{
> + if (papr_smart_inject_valid(cmd) < 0)
> + return -EINVAL;
> +
> + to_payload(cmd)->inject.flags |= PDSM_SMART_INJECT_HEALTH_FATAL;
> + to_payload(cmd)->inject.fatal_enable = enable;
>
> + return 0;
> +}
> +
> +static int papr_cmd_smart_inject_unsafe_shutdown(struct ndctl_cmd *cmd,
> + bool enable)
> +{
> + if (papr_smart_inject_valid(cmd) < 0)
> + return -EINVAL;
> +
> + to_payload(cmd)->inject.flags |= PDSM_SMART_INJECT_BAD_SHUTDOWN;
> + to_payload(cmd)->inject.unsafe_shutdown_enable = enable;
> +
> + return 0;
> }
>
> struct ndctl_dimm_ops * const papr_dimm_ops = &(struct ndctl_dimm_ops) {
> .cmd_is_supported = papr_cmd_is_supported,
> + .new_smart_inject = papr_new_smart_inject,
> + .smart_inject_supported = papr_smart_inject_supported,
> + .smart_inject_fatal = papr_cmd_smart_inject_fatal,
> + .smart_inject_unsafe_shutdown = papr_cmd_smart_inject_unsafe_shutdown,
> .smart_get_flags = papr_smart_get_flags,
> .get_firmware_status = papr_get_firmware_status,
> .xlat_firmware_status = papr_xlat_firmware_status,
> diff --git a/ndctl/lib/papr_pdsm.h b/ndctl/lib/papr_pdsm.h
> index f45b1e40c075..20ac20f89acd 100644
> --- a/ndctl/lib/papr_pdsm.h
> +++ b/ndctl/lib/papr_pdsm.h
> @@ -121,12 +121,29 @@ struct nd_papr_pdsm_health {
> enum papr_pdsm {
> PAPR_PDSM_MIN = 0x0,
> PAPR_PDSM_HEALTH,
> + PAPR_PDSM_SMART_INJECT,
> PAPR_PDSM_MAX,
> };
> +/* Flags for injecting specific smart errors */
> +#define PDSM_SMART_INJECT_HEALTH_FATAL (1 << 0)
> +#define PDSM_SMART_INJECT_BAD_SHUTDOWN (1 << 1)
> +
> +struct nd_papr_pdsm_smart_inject {
> + union {
> + struct {
> + /* One or more of PDSM_SMART_INJECT_ */
> + __u32 flags;
> + __u8 fatal_enable;
> + __u8 unsafe_shutdown_enable;
> + };
> + __u8 buf[ND_PDSM_PAYLOAD_MAX_SIZE];
> + };
> +};
>
> /* Maximal union that can hold all possible payload types */
> union nd_pdsm_payload {
> struct nd_papr_pdsm_health health;
> + struct nd_papr_pdsm_smart_inject inject;
> __u8 buf[ND_PDSM_PAYLOAD_MAX_SIZE];
> } __attribute__((packed));
>
>
-aneesh
next prev parent reply other threads:[~2021-07-13 4:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-12 17:31 [ndctl PATCH 0/2] papr: Implement initial support for injecting smart errors Vaibhav Jain
2021-07-12 17:31 ` [ndctl PATCH 1/2] libndctl, intel: Indicate supported smart-inject types Vaibhav Jain
2021-07-12 17:31 ` [ndctl PATCH 2/2] libndctl/papr: Add limited support for inject-smart Vaibhav Jain
2021-07-13 4:43 ` Aneesh Kumar K.V [this message]
2021-07-13 7:51 ` Vaibhav Jain
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=527107a5-c124-6e85-2364-499d9bb0913e@linux.ibm.com \
--to=aneesh.kumar@linux.ibm.com \
--cc=dan.j.williams@intel.com \
--cc=ira.weiny@intel.com \
--cc=nvdimm@lists.linux.dev \
--cc=sbhat@linux.ibm.com \
--cc=vaibhav@linux.ibm.com \
--cc=vishal.l.verma@intel.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 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).