From patchwork Fri Jan 5 05:17:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 185220 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp6033158dyb; Thu, 4 Jan 2024 21:17:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IF0Yhz9VxxurPFOp1qOVc/BBpBJhtdgx1iS3ifJCjnFdZMy/PVO0q0LJuxIwjsgpIikriAh X-Received: by 2002:a17:902:bb16:b0:1d4:b6e9:9e41 with SMTP id im22-20020a170902bb1600b001d4b6e99e41mr1452781plb.126.1704431871130; Thu, 04 Jan 2024 21:17:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704431871; cv=none; d=google.com; s=arc-20160816; b=KQlYhUqZdEeo3BsZ5DP2bOSb8E1Q0LIAkzb7jZ9oOJGoTeeDOb7TjhKoT2rDWhWt8J kDn+VPkTDDLtnq2+w0ktaT8vta/RsdCLql7soWYPpQ8rdGUZ77ZFXzn3HxEeHUDJZBOP jS5ZqG0FEHeZLfrlfjHSCToQ7NPAC0+TO2ZOM6U/76hM82TYI1s9hYsyR4S/lv+E8xDk vMiJy2gZmQKd3JFUjhvPP8wdmsArWI6QfE0njPTR6aKXRixr+32AK4jQPr4THM7EUMVa eUyBNWugA+6ZmzuE1XdHSfk2fhxqUZNsjF5/tpqnZm7Av5tc3xpbxvzMaH4HiEuPCznh IySw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=nHoW9gobpmGg5BUBY8TzEAIrwDE1AD2t9/HhOPtJlj4=; fh=6n/tBGY9Maz1N+593RIQk1a7JvmK9JONeEs0e9tVswo=; b=RO7IPvxmbtbfPbXZBHZ8V44GL9SWObzHtDe88OlFFP4v24NT8BnZYw17rZKVCcWMRj 4VCiQyPwsGRtF1PZHkhu2KT1f6plYX8glgLnqWPW5fpqOPOY/of3K/zhDVxyJbPaVLzL NIj59NH/vO/Zk5o+dDfvoo8gaZCCA1mmHUcaiuKL725a3KXzmvXgodvR6o3iv808y+U8 F8AilPtewyY6mQVaOuKKlkikpbb5UPIixgbEa9bNyAgnI1JTd9oP6uVajvHLbSAwyT8O l8KAiMHl1EGTGtRvhA50NuNCbk+U/IdE40qJDpW2Db8Xn4cTBgXCDcmkiqZf01kzHwtx DujA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=kwRuDrs6; spf=pass (google.com: domain of linux-kernel+bounces-17479-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17479-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id g12-20020a170902fe0c00b001d08d0400f1si616520plj.634.2024.01.04.21.17.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 21:17:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-17479-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=kwRuDrs6; spf=pass (google.com: domain of linux-kernel+bounces-17479-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17479-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 765FBB23DFF for ; Fri, 5 Jan 2024 05:17:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ECD19612F; Fri, 5 Jan 2024 05:17:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="kwRuDrs6" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CFF7A538D; Fri, 5 Jan 2024 05:17:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1704431832; bh=nHoW9gobpmGg5BUBY8TzEAIrwDE1AD2t9/HhOPtJlj4=; h=Date:From:To:Cc:Subject:From; b=kwRuDrs6at1fxwuh2IqqTH/memtEe2Mp7N/TXa8Rt4C+8QvzyQgg4lBsgCarwY4Mm y6JHmE5bXeeisr8c12cKlUq5nTfLz4SGVzgU4CdWRQAGBCz0F7MdTUBf/NZH5ST68f k5nFNcg0q4rKW9A3DuWBLepolIcV5hNf6eFUeKr7YArmAamjwUR3wyFAnymBWmw7sX w8wX8Rea3zB22l2Kibk9y/z9yBvNAe+VXrRmw1CLo52v6zwPKBM+m5T7KaAKiOhCIV uSPCd6RoMNeWCfhU1WDjj95xpzA7QHKAqzXCJOPLAhYeTkgGawlC4avcBxX9yBoL84 jcMHJOzdYagNQ== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4T5sCD0DR5z4x1x; Fri, 5 Jan 2024 16:17:11 +1100 (AEDT) Date: Fri, 5 Jan 2024 16:17:09 +1100 From: Stephen Rothwell To: Dan Williams Cc: Dave Jiang , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the cxl tree Message-ID: <20240105161709.22d1b027@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787226353991171095 X-GMAIL-MSGID: 1787226353991171095 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 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 --- 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; }