From patchwork Mon Sep 25 22:42:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Anastasio X-Patchwork-Id: 13398532 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 D9658E6FE31 for ; Mon, 25 Sep 2023 22:43:05 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.608151.946481 (Exim 4.92) (envelope-from ) id 1qkuHv-0007BB-NX; Mon, 25 Sep 2023 22:42:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 608151.946481; Mon, 25 Sep 2023 22:42:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qkuHv-0007B0-KB; Mon, 25 Sep 2023 22:42:47 +0000 Received: by outflank-mailman (input) for mailman id 608151; Mon, 25 Sep 2023 22:42:46 +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 1qkuHu-0006e1-0Q for xen-devel@lists.xenproject.org; Mon, 25 Sep 2023 22:42:46 +0000 Received: from raptorengineering.com (mail.raptorengineering.com [23.155.224.40]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d7c9fbcb-5bf4-11ee-878a-cb3800f73035; Tue, 26 Sep 2023 00:42:45 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id 52A33828558A; Mon, 25 Sep 2023 17:42:44 -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 swcRR5RQMj6u; Mon, 25 Sep 2023 17:42:43 -0500 (CDT) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id 2CE3D82867A9; Mon, 25 Sep 2023 17:42:43 -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 t6R6dDD_VBP4; Mon, 25 Sep 2023 17:42:42 -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 219B78285B83; Mon, 25 Sep 2023 17:42:42 -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: d7c9fbcb-5bf4-11ee-878a-cb3800f73035 DKIM-Filter: OpenDKIM Filter v2.10.3 mail.rptsys.com 2CE3D82867A9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raptorengineering.com; s=B8E824E6-0BE2-11E6-931D-288C65937AAD; t=1695681763; bh=n7RbV6HKhggR9ZKikSDWaAYhJWp3wDDzOjNqYprqXEk=; h=From:To:Date:Message-Id:MIME-Version; b=vLmBfBYe+KOv7Okxx7jFjFzyykpd0C/YFf6cCSqqAXQV5Bk4tJLmnG76eYtUxyADq 3qfBn5UxwkX3O7TYjqrsnc4dAtswk6vrEbrsLz33Nvdw3Vvv3OcBt9Mr2u6Nm0jU8g qASTBWDfE7gL5LXuZ0m9gg0DPn1h43qWZXT/jKPg= 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 3/3] xen/common: Add NUMA node id bounds check to page_alloc.c/node_to_scrub Date: Mon, 25 Sep 2023 17:42:30 -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, likely due to the increased optimization level: 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 Acked-by: Stefano Stabellini --- xen/common/page_alloc.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.30.2 diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 35d9a26fa6..6df2a223e1 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1211,6 +1211,9 @@ static unsigned int node_to_scrub(bool get_node) } while ( !cpumask_empty(&node_to_cpumask(node)) && (node != local_node) ); + if ( node >= MAX_NUMNODES ) + break; + if ( node == local_node ) break;