From patchwork Tue Sep 26 18:54:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Anastasio X-Patchwork-Id: 13399571 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9B225E7E65E for ; Tue, 26 Sep 2023 18:55:27 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.608494.946991 (Exim 4.92) (envelope-from ) id 1qlDDA-0008Ow-C3; Tue, 26 Sep 2023 18:55:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 608494.946991; Tue, 26 Sep 2023 18:55:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qlDDA-0008Op-8i; Tue, 26 Sep 2023 18:55:08 +0000 Received: by outflank-mailman (input) for mailman id 608494; Tue, 26 Sep 2023 18:55:07 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qlDD9-0008Od-Lf for xen-devel@lists.xenproject.org; Tue, 26 Sep 2023 18:55:07 +0000 Received: from raptorengineering.com (mail.raptorengineering.com [23.155.224.40]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 34d36939-5c9e-11ee-878a-cb3800f73035; Tue, 26 Sep 2023 20:55:06 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id 572B98285A03; Tue, 26 Sep 2023 13:55:05 -0500 (CDT) Received: from mail.rptsys.com ([127.0.0.1]) by localhost (vali.starlink.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 0Vdzoy3fyqT9; Tue, 26 Sep 2023 13:55:04 -0500 (CDT) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id 4F7B382856E3; Tue, 26 Sep 2023 13:55:04 -0500 (CDT) Received: from mail.rptsys.com ([127.0.0.1]) by localhost (vali.starlink.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id XGAs3b0EJ_7K; Tue, 26 Sep 2023 13:55:04 -0500 (CDT) Received: from raptor-ewks-026.rptsys.com (5.edge.rptsys.com [23.155.224.38]) by mail.rptsys.com (Postfix) with ESMTPSA id AC3A5828587F; Tue, 26 Sep 2023 13:55:03 -0500 (CDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 34d36939-5c9e-11ee-878a-cb3800f73035 DKIM-Filter: OpenDKIM Filter v2.10.3 mail.rptsys.com 4F7B382856E3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raptorengineering.com; s=B8E824E6-0BE2-11E6-931D-288C65937AAD; t=1695754504; bh=D5SRtpO3rGrT6QwItgwTk0eDHOrAHeVxgzl8M/+A/YY=; h=From:To:Date:Message-Id:MIME-Version; b=cHSKB4ZFFRCz7xvKWd1n379a3wYWZF/HxmiO7364mcadS6cQVCwoP7yCQzxmlzSuP PVs6OAkPTd4G6M2Lzmlcm8e2IQO/nWHHjlJnq2vlyE5gJo3kAJXlTybvUTtGnEWXxS sHbUrhOdf2b/gstRRPtG8iY/9rH3ixNdfA0RtObM= X-Virus-Scanned: amavisd-new at rptsys.com From: Shawn Anastasio To: xen-devel@lists.xenproject.org Cc: Timothy Pearson , Shawn Anastasio , Doug Goldstein , Stefano Stabellini , Michal Orzel , Jan Beulich Subject: [PATCH v2 1/2] automation: Change build script to use arch defconfig Date: Tue, 26 Sep 2023 13:54:55 -0500 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Change automation build script to call the make defconfig target before setting CONFIG_DEBUG and extra options. This fixes issues on Power where the build fails without using the ppc64_defconfig. Reported-by: Jan Beulich Signed-off-by: Shawn Anastasio --- v2: No changes. automation/scripts/build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.30.2 diff --git a/automation/scripts/build b/automation/scripts/build index b4edcf010e..19dd9e8270 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -22,7 +22,12 @@ if [[ "${RANDCONFIG}" == "y" ]]; then # RANDCONFIG implies HYPERVISOR_ONLY HYPERVISOR_ONLY="y" else - echo "CONFIG_DEBUG=${debug}" > xen/.config + # Start off with arch's defconfig + make -C xen defconfig + + # Drop existing CONFIG_DEBUG and replace with value of ${debug} + sed -i 's/^CONFIG_DEBUG=[yn]//g' xen/.config + echo "CONFIG_DEBUG=${debug}" >> xen/.config if [[ -n "${EXTRA_XEN_CONFIG}" ]]; then echo "${EXTRA_XEN_CONFIG}" >> xen/.config From patchwork Tue Sep 26 18:54:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Anastasio X-Patchwork-Id: 13399570 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9A9AAE7E65F for ; Tue, 26 Sep 2023 18:55:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.608496.947011 (Exim 4.92) (envelope-from ) id 1qlDDB-0000Rz-Rt; Tue, 26 Sep 2023 18:55:09 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 608496.947011; Tue, 26 Sep 2023 18:55:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qlDDB-0000Rs-Oo; Tue, 26 Sep 2023 18:55:09 +0000 Received: by outflank-mailman (input) for mailman id 608496; Tue, 26 Sep 2023 18:55:08 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qlDDA-0008Od-AW for xen-devel@lists.xenproject.org; Tue, 26 Sep 2023 18:55:08 +0000 Received: from raptorengineering.com (mail.raptorengineering.com [23.155.224.40]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 35009f9d-5c9e-11ee-878a-cb3800f73035; Tue, 26 Sep 2023 20:55:06 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id 9E06B82856E3; Tue, 26 Sep 2023 13:55:05 -0500 (CDT) Received: from mail.rptsys.com ([127.0.0.1]) by localhost (vali.starlink.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id SN1cR25zWsfL; Tue, 26 Sep 2023 13:55:04 -0500 (CDT) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id C72E5828597C; Tue, 26 Sep 2023 13:55:04 -0500 (CDT) Received: from mail.rptsys.com ([127.0.0.1]) by localhost (vali.starlink.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 04_qlkOyIH00; Tue, 26 Sep 2023 13:55:04 -0500 (CDT) Received: from raptor-ewks-026.rptsys.com (5.edge.rptsys.com [23.155.224.38]) by mail.rptsys.com (Postfix) with ESMTPSA id 56B5F8285A03; Tue, 26 Sep 2023 13:55:04 -0500 (CDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 35009f9d-5c9e-11ee-878a-cb3800f73035 DKIM-Filter: OpenDKIM Filter v2.10.3 mail.rptsys.com C72E5828597C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raptorengineering.com; s=B8E824E6-0BE2-11E6-931D-288C65937AAD; t=1695754504; bh=1bghThgK+U6iQoTmvMbxS90PPSZnvYYz37y3sqDtbWc=; h=From:To:Date:Message-Id:MIME-Version; b=ZXC4+7ocqcH/hW7002q69SDtMTSdvZEQPAm62UyHFQtQkPZonxTwLIlAMk0uPEXD3 tGhhkYeBvoKHVG5FycuEjo9T8odOkQWc/CRWm8Ysu/r/6EQsHGbmrijECW15HKWa+f M8Ivb4IP68lBSsLttvYKJFcmOHNyeK96K1sJNY4U= X-Virus-Scanned: amavisd-new at rptsys.com From: Shawn Anastasio To: xen-devel@lists.xenproject.org Cc: Timothy Pearson , Shawn Anastasio , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH v2 2/2] xen/common: Add NUMA node id bounds check to page_alloc.c/node_to_scrub Date: Tue, 26 Sep 2023 13:54:56 -0500 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 When building for Power with CONFIG_DEBUG unset, a compiler error gets raised inside page_alloc.c's node_to_scrub function: common/page_alloc.c: In function 'node_to_scrub.part.0': common/page_alloc.c:1217:29: error: array subscript 1 is above array bounds of 'long unsigned int[1]' [-Werror=array-bounds] 1217 | if ( node_need_scrub[node] ) It appears that this is a false positive, given that in practice cycle_node should never return a node ID >= MAX_NUMNODES as long as the architecture's node_online_map is properly defined and initialized, so this additional bounds check is only to satisfy GCC. Signed-off-by: Shawn Anastasio Reviewed-by: Stefano Stabellini --- v2: Add comment to explain the bounds check. xen/common/page_alloc.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.30.2 diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 35d9a26fa6..c53f917dbc 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1211,6 +1211,14 @@ static unsigned int node_to_scrub(bool get_node) } while ( !cpumask_empty(&node_to_cpumask(node)) && (node != local_node) ); + /* + * In practice `node` will always be within MAX_NUMNODES, but GCC can't + * always see that, so an explicit check is necessary to avoid tripping + * its out-of-bounds array access warning (-Warray-bounds). + */ + if ( node >= MAX_NUMNODES ) + break; + if ( node == local_node ) break;