nvdimm.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Jeff Moyer <jmoyer@redhat.com>
To: Dan Williams <dan.j.williams@intel.com>
Cc: nvdimm@lists.linux.dev,
	 Krzysztof Kensicki <krzysztof.kensicki@intel.com>,
	 vishal.l.verma@intel.com
Subject: Re: [PATCH] libnvdimm/region: Fix label activation vs errors
Date: Wed, 04 Aug 2021 13:12:01 -0400	[thread overview]
Message-ID: <x49lf5ht9r2.fsf@segfault.boston.devel.redhat.com> (raw)
In-Reply-To: <162766356450.3223041.1183118139023841447.stgit@dwillia2-desk3.amr.corp.intel.com> (Dan Williams's message of "Fri, 30 Jul 2021 09:46:04 -0700")

Dan Williams <dan.j.williams@intel.com> writes:

> There are a few scenarios where init_active_labels() can return without
> registering deactivate_labels() to run when the region is disabled. In
> particular label error injection creates scenarios where a DIMM is
> disabled, but labels on other DIMMs in the region become activated.
>
> Arrange for init_active_labels() to always register deactivate_labels().
>
> Reported-by: Krzysztof Kensicki <krzysztof.kensicki@intel.com>
> Fixes: bf9bccc14c05 ("libnvdimm: pmem label sets and namespace instantiation.")
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>

Reviewed-by: Jeff Moyer <jmoyer@redhat.com>


> ---
>  drivers/nvdimm/namespace_devs.c |   17 +++++++++++------
>  1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
> index 2403b71b601e..745478213ff2 100644
> --- a/drivers/nvdimm/namespace_devs.c
> +++ b/drivers/nvdimm/namespace_devs.c
> @@ -2527,7 +2527,7 @@ static void deactivate_labels(void *region)
>  
>  static int init_active_labels(struct nd_region *nd_region)
>  {
> -	int i;
> +	int i, rc = 0;
>  
>  	for (i = 0; i < nd_region->ndr_mappings; i++) {
>  		struct nd_mapping *nd_mapping = &nd_region->mapping[i];
> @@ -2546,13 +2546,14 @@ static int init_active_labels(struct nd_region *nd_region)
>  			else if (test_bit(NDD_LABELING, &nvdimm->flags))
>  				/* fail, labels needed to disambiguate dpa */;
>  			else
> -				return 0;
> +				continue;
>  
>  			dev_err(&nd_region->dev, "%s: is %s, failing probe\n",
>  					dev_name(&nd_mapping->nvdimm->dev),
>  					test_bit(NDD_LOCKED, &nvdimm->flags)
>  					? "locked" : "disabled");
> -			return -ENXIO;
> +			rc = -ENXIO;
> +			goto out;
>  		}
>  		nd_mapping->ndd = ndd;
>  		atomic_inc(&nvdimm->busy);
> @@ -2586,13 +2587,17 @@ static int init_active_labels(struct nd_region *nd_region)
>  			break;
>  	}
>  
> -	if (i < nd_region->ndr_mappings) {
> +	if (i < nd_region->ndr_mappings)
> +		rc = -ENOMEM;
> +
> +out:
> +	if (rc) {
>  		deactivate_labels(nd_region);
> -		return -ENOMEM;
> +		return rc;
>  	}
>  
>  	return devm_add_action_or_reset(&nd_region->dev, deactivate_labels,
> -			nd_region);
> +					nd_region);
>  }
>  
>  int nd_region_register_namespaces(struct nd_region *nd_region, int *err)


      reply	other threads:[~2021-08-04 17:10 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-30 16:46 Dan Williams
2021-08-04 17:12 ` Jeff Moyer [this message]

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=x49lf5ht9r2.fsf@segfault.boston.devel.redhat.com \
    --to=jmoyer@redhat.com \
    --cc=dan.j.williams@intel.com \
    --cc=krzysztof.kensicki@intel.com \
    --cc=nvdimm@lists.linux.dev \
    --cc=vishal.l.verma@intel.com \
    --subject='Re: [PATCH] libnvdimm/region: Fix label activation vs errors' \
    /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

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).