linux-next: build failure after merge of the cxl tree

linux-next: build failure after merge of the cxl tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]

Hi all,

After merging the cxl tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/nvdimm/label.c:750:32: error: 'uuid_to_nvdimm_cclass' defined but not used [-Werror=unused-function]
  750 | static enum nvdimm_claim_class uuid_to_nvdimm_cclass(uuid_t *uuid)
      |                                ^~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Caused by commit

  d68bc4b2338b ("libnvdimm/labels: Add address-abstraction uuid definitions")

Exposed by commit

  3fe617ccafd6 ("Enable '-Werror' by default for all kernel builds")

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 6 Sep 2021 14:14:52 +1000
Subject: [PATCH] cxl: mark unused function as such

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/nvdimm/label.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c
index 7abeb1233404..175db14c7694 100644
--- a/drivers/nvdimm/label.c
+++ b/drivers/nvdimm/label.c
@@ -747,6 +747,7 @@ static enum nvdimm_claim_class guid_to_nvdimm_cclass(guid_t *guid)
 }
 
 /* CXL labels store UUIDs instead of GUIDs for the same data */
+__maybe_unused
 static enum nvdimm_claim_class uuid_to_nvdimm_cclass(uuid_t *uuid)
 {
 	if (uuid_equal(uuid, &nvdimm_btt_uuid))
-- 
2.32.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the cxl tree

[Dan Williams]

On Sun, Sep 5, 2021 at 9:20 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the cxl tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/nvdimm/label.c:750:32: error: 'uuid_to_nvdimm_cclass' defined but not used [-Werror=unused-function]
>   750 | static enum nvdimm_claim_class uuid_to_nvdimm_cclass(uuid_t *uuid)
>       |                                ^~~~~~~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
>
> Caused by commit
>
>   d68bc4b2338b ("libnvdimm/labels: Add address-abstraction uuid definitions")
>
> Exposed by commit
>
>   3fe617ccafd6 ("Enable '-Werror' by default for all kernel builds")
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 6 Sep 2021 14:14:52 +1000
> Subject: [PATCH] cxl: mark unused function as such
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/nvdimm/label.c | 1 +
>  1 file changed, 1 insertion(+)
>

Thanks for that Stephen. I'll just back this patch out and retry for
v5.16, it's not super critical.

RE: linux-next: build failure after merge of the cxl tree

[Dan Williams]

Stephen Rothwell wrote:
> Hi all,
> 
> After merging the cxl tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/cxl/core/cdat.c: In function 'match_cxlrd_hb':
> drivers/cxl/core/cdat.c:327:43: error: 'struct cxl_switch_decoder' has no member named 'target_lock'
>   327 |                 seq = read_seqbegin(&cxlsd->target_lock);
>       |                                           ^~
> drivers/cxl/core/cdat.c:332:38: error: 'struct cxl_switch_decoder' has no member named 'target_lock'
>   332 |         } while (read_seqretry(&cxlsd->target_lock, seq));
>       |                                      ^~
> 
> Caused by commit
> 
>   185c1a489f87 ("cxl: Check qos_class validity on memdev probe")
> 
> interacting with commit
> 
>   5459e186a5c9 ("cxl/port: Fix missing target list lock")
> 
> from hte cls-fixes tree.
> 
> I have applied the following merge resolution for today.

Yup, this looks good, I will include a this merge in my next branch
going forward.

> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 5 Jan 2024 15:44:24 +1100
> Subject: [PATCH] fix up for "cxl: Check qos_class validity on memdev probe"
> 
> interacting with "cxl/port: Fix missing target list lock"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/cxl/core/cdat.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/cxl/core/cdat.c b/drivers/cxl/core/cdat.c
> index cd84d87f597a..10ac76bed477 100644
> --- a/drivers/cxl/core/cdat.c
> +++ b/drivers/cxl/core/cdat.c
> @@ -8,6 +8,7 @@
>  #include "cxlpci.h"
>  #include "cxlmem.h"
>  #include "cxl.h"
> +#include "core.h"
>  
>  struct dsmas_entry {
>  	struct range dpa_range;
> @@ -315,7 +316,6 @@ static int match_cxlrd_hb(struct device *dev, void *data)
>  	struct device *host_bridge = data;
>  	struct cxl_switch_decoder *cxlsd;
>  	struct cxl_root_decoder *cxlrd;
> -	unsigned int seq;
>  
>  	if (!is_root_decoder(dev))
>  		return 0;
> @@ -323,13 +323,11 @@ static int match_cxlrd_hb(struct device *dev, void *data)
>  	cxlrd = to_cxl_root_decoder(dev);
>  	cxlsd = &cxlrd->cxlsd;
>  
> -	do {
> -		seq = read_seqbegin(&cxlsd->target_lock);
> -		for (int i = 0; i < cxlsd->nr_targets; i++) {
> -			if (host_bridge == cxlsd->target[i]->dport_dev)
> -				return 1;
> -		}
> -	} while (read_seqretry(&cxlsd->target_lock, seq));
> +	guard(rwsem_read)(&cxl_region_rwsem);
> +	for (int i = 0; i < cxlsd->nr_targets; i++) {
> +		if (host_bridge == cxlsd->target[i]->dport_dev)
> +			return 1;
> +	}
>  
>  	return 0;
>  }
> -- 
> 2.43.0
> 
> -- 
> Cheers,
> Stephen Rothwell

linux-next: build failure after merge of the cxl tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2442 bytes --]

Hi all,

After merging the cxl tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/cxl/core/cdat.c: In function 'match_cxlrd_hb':
drivers/cxl/core/cdat.c:327:43: error: 'struct cxl_switch_decoder' has no member named 'target_lock'
  327 |                 seq = read_seqbegin(&cxlsd->target_lock);
      |                                           ^~
drivers/cxl/core/cdat.c:332:38: error: 'struct cxl_switch_decoder' has no member named 'target_lock'
  332 |         } while (read_seqretry(&cxlsd->target_lock, seq));
      |                                      ^~

Caused by commit

  185c1a489f87 ("cxl: Check qos_class validity on memdev probe")

interacting with commit

  5459e186a5c9 ("cxl/port: Fix missing target list lock")

from hte cls-fixes tree.

I have applied the following merge resolution for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 5 Jan 2024 15:44:24 +1100
Subject: [PATCH] fix up for "cxl: Check qos_class validity on memdev probe"

interacting with "cxl/port: Fix missing target list lock"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/cxl/core/cdat.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/cxl/core/cdat.c b/drivers/cxl/core/cdat.c
index cd84d87f597a..10ac76bed477 100644
--- a/drivers/cxl/core/cdat.c
+++ b/drivers/cxl/core/cdat.c
@@ -8,6 +8,7 @@
 #include "cxlpci.h"
 #include "cxlmem.h"
 #include "cxl.h"
+#include "core.h"
 
 struct dsmas_entry {
 	struct range dpa_range;
@@ -315,7 +316,6 @@ static int match_cxlrd_hb(struct device *dev, void *data)
 	struct device *host_bridge = data;
 	struct cxl_switch_decoder *cxlsd;
 	struct cxl_root_decoder *cxlrd;
-	unsigned int seq;
 
 	if (!is_root_decoder(dev))
 		return 0;
@@ -323,13 +323,11 @@ static int match_cxlrd_hb(struct device *dev, void *data)
 	cxlrd = to_cxl_root_decoder(dev);
 	cxlsd = &cxlrd->cxlsd;
 
-	do {
-		seq = read_seqbegin(&cxlsd->target_lock);
-		for (int i = 0; i < cxlsd->nr_targets; i++) {
-			if (host_bridge == cxlsd->target[i]->dport_dev)
-				return 1;
-		}
-	} while (read_seqretry(&cxlsd->target_lock, seq));
+	guard(rwsem_read)(&cxl_region_rwsem);
+	for (int i = 0; i < cxlsd->nr_targets; i++) {
+		if (host_bridge == cxlsd->target[i]->dport_dev)
+			return 1;
+	}
 
 	return 0;
 }
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]