Received-SPF: pass (google.com: domain of linux-kernel+bounces-18467-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Fri, 5 Jan 2024 19:23:47 -0800
From: Dan Williams <dan.j.williams@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Dan Williams
	<dan.j.williams@intel.com>
CC: Dave Jiang <dave.jiang@intel.com>, Linux Kernel Mailing List
	<linux-kernel@vger.kernel.org>, Linux Next Mailing List
	<linux-next@vger.kernel.org>
Subject: RE: linux-next: build failure after merge of the cxl tree
Message-ID: <6598c7c3db0fb_127da2294a6@dwillia2-xfh.jf.intel.com.notmuch>
References: <20240105161709.22d1b027@canb.auug.org.au>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20240105161709.22d1b027@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?S19SCg3+GVZOpGzCmTGsgLzSSz7KR2Ty1vdStza0Lzm1yGWvz3nykpgAAgnQ?=
 =?us-ascii?Q?TPvYaScDKT/6aOdp07tGOuSdavQLDzYZEpE50tl1+o+dxB0Sb7rk9Y1Wp0ON?=
 =?us-ascii?Q?APMnIh0wvxdkzi0TO7SA2Sab/SvFv6ZX9L8PfvJCzYpSLhqLC5QZJ8K4xTAL?=
 =?us-ascii?Q?gHtuhgP8L6bI5+YU5L446g2UUeJW684LfaFbbqFVQj5MZ1122hbxwIvdoiQW?=
 =?us-ascii?Q?S7AaxHn+tlaWP09YPAdrhFWi110ZvC+15dpjhO+K9i08r4sxidg6HgAU+Cma?=
 =?us-ascii?Q?jaMczuWs0EQgMVeHqpVEcyqH2JcSDzHbcc5jB3MvlY5hTv3gtCrObXGLQnTT?=
 =?us-ascii?Q?DafqAZqhhBiJCqWWj8yKDrBZCvFmLkLNj+FSY29QLnD8pX5UbGoF0AOzAWTq?=
 =?us-ascii?Q?mYuDMDLWvsNooOMKfoIyiIlch7MvjR9w9VpepVQdxxE57CI2smnNoRGtmX90?=
 =?us-ascii?Q?octDnGX60lz4wmXePprmOe9324AfW1vZPq2qsZofeIq+MCa6kS5W1QIM4vMi?=
 =?us-ascii?Q?WkwUQ5G+Rxx61UpZSOknrOUcNwy2iTOeVy/Cylrlhe9jcPAyDplAa0sZ+6hT?=
 =?us-ascii?Q?xaQcJO19Nok7I5XJh8B3MzfjbNQrzaYgUbMSGeotuY6tA/dJiR/jVBi/W0DI?=
 =?us-ascii?Q?vczaJUVMhyTLNeL8PfOjToOCvUY4kboNVe3Pm5tkR4gIW2CxL7FN7yMhFMvU?=
 =?us-ascii?Q?DQOM7yVspH1KR0FmWxI5owNkOa/t3r83YMwv6IyzKTuc4Bj9TzCoLJc5cwo8?=
 =?us-ascii?Q?Q1N21eW/2CRyJn5iM5FdPa08eT77p6DnxgmPgOsHefaWiRTKiLS5699lSKyr?=
 =?us-ascii?Q?alD3L50+J/IN+187a7lT7Wv4Yf5GHL38FKAQeU6Xewpi8ZSmHg6BRSIKQrrh?=
 =?us-ascii?Q?ybwNaWUK07ZNWHDYJWU0jvocTY5yR4ylOxbsdeHG9uSjqTK7cmt1R/VayHt+?=
 =?us-ascii?Q?m0SbTglW0F3nwLbdRKN7JxU3CeO5gwzgiU4AQDFmT465/Z/qen3yPF/czl1c?=
 =?us-ascii?Q?s9m3+oWFcoHZwl0EZuJ9R0l++6H45ot5MAiHXdvJybCDmyRckyLDpbQ0o7sc?=
 =?us-ascii?Q?l1r0FoSZOt1Gicutq0nl0iP4XMxLjWwpSWj/lXPEeuOH4kZ4sG3hjovLeDjh?=
 =?us-ascii?Q?0ME21qYTS5ESOM311tjdmkipPjiX8bMvRfZC82aigba5GksRa5pYs2Ra+mHS?=
 =?us-ascii?Q?Np+a1Zd+vKRpWPfe12/bvqVVZnfHcF9bOq4M6QjRv/8IVG3moKFrereeWD5t?=
 =?us-ascii?Q?e+6T4wMyq90vM4adRJuyEIRoxFlNk+XSL2/9OGw4ag6MjGnVLWa64+zevV+Q?=
 =?us-ascii?Q?6EMwgvd9vNTDzdDwFOVGFd+2Io6ZEPuMjaDfC9ePj5ubpCPRi3xPGFiDCr+H?=
 =?us-ascii?Q?gIFN3ydARi0IAWjDPEAVtBibT2IBR/QOERd+LGL6bsk3xlF1tVwoD/gET8/1?=
 =?us-ascii?Q?5pw5mBJw6uB9e9j0E2LdIvdGrvrrJwkbmLG2QyI28BOSmIIRn0Dl6kx7Ks+Q?=
 =?us-ascii?Q?nu9F9tKaKg+ZygfQ13pV6ekoQnztXJVSGKLJdh2oQMRxEnvBDc7VAK+A4VuS?=
 =?us-ascii?Q?s1vtmH6SljswAxF5kQsHn5Pov2BXh8CxV7AQIEV6QGxsxC7QliYW+fWPr+tW?=
 =?us-ascii?Q?JA=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 119f9b3b-2ae7-4eaa-3711-08dc0e66e6a5
X-MS-Exchange-CrossTenant-AuthSource: PH8PR11MB8107.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2024 03:23:50.0643
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: +DEmjUlG0rtPjRh8oLz/Hm87KFNGoWjgRQiEgdzBIjMIPQs21MHm+TSt8FlS4gDZffm0FqKuS+kCxvpxvAsHuebFcuk+6TQgo43JGkmcTJ8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB7565
X-OriginatorOrg: intel.com

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