From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 D04DBECAAA1 for ; Tue, 30 Aug 2022 17:23:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GEMGYx0A/pmxnoN2D+NwpZeCWfBPoeTftgP3Q4J5s3k=; b=SsW503/imgeEkt XhKUXhBUVmp3l3J9dc/ELcy96wx0wxxqiovsT2nJIVBM0COiILTYNTzGRC6Hb06BtP8SLwBv5/ihw N6bghSAiynWoEOHuHlnMs3C29S1kDoUR+Yw9Oy66OPH3uVqPk8PliGXOcnPCvzyDKZVfOG40JZGlY kn1bIxqL7jrojOrXuY5lbaip6vixxlJOPOLAUHVAGwXlIjji3V28LSXvK4T/dk3oQI2nx7RFB6T+h XyjuAlkx1j100EU8Epr1U1Z8YVdAEKc5jY7acKGXMNGq+XIiZld+7nZgGI6r1LbSH/IqUqrbfwNGo DctKakfGGz6K5zXuxq8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oT4wh-000nEJ-Ml; Tue, 30 Aug 2022 17:22:39 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oT4wd-000nCc-ST for linux-arm-kernel@lists.infradead.org; Tue, 30 Aug 2022 17:22:37 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7FD99B81D12; Tue, 30 Aug 2022 17:22:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25EA9C433D6; Tue, 30 Aug 2022 17:22:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661880153; bh=fPid+q0GoEnpfhUVAoMELTMnsoxydhxBhddicCiYKQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dd5mXnl0XoCGUP3y6frrj23V6HIjnJ9HFXyedSfSyF4lEOUnj65wAnEZj3gz/lvtG Xb4ok4Po5aFrWlFEyckw44CKVGFuXMc5gh0yrn2Ffc41aSsr8pMYkcHMQOz30PGXC7 f4RucqP+dt5jArS4UIgUxNFtL3P0b+Y3sWoXNQDqFB5ro5VOYZMJnY5Msc8//QBrjv 0sn+EDvckYQTXN6Sa3o1D3goccKJcDbOyr7PdsVKdPpzRQ63tpc2iilbo8B9zzDf8J O4/Y5V358jnlCw4ld1hvC1GG3eaI/VOc1f+14D+7H0sxiPCE3S9nkxgByzx14TMVhI Ncf6IDDVUB6Lw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sudeep Holla , Bruno Goncalves , Will Deacon , Sasha Levin , catalin.marinas@arm.com, peterz@infradead.org, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 13/23] arm64: cacheinfo: Fix incorrect assignment of signed error value to unsigned fw_level Date: Tue, 30 Aug 2022 13:21:30 -0400 Message-Id: <20220830172141.581086-13-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220830172141.581086-1-sashal@kernel.org> References: <20220830172141.581086-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220830_102236_230120_28880713 X-CRM114-Status: GOOD ( 16.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Sudeep Holla [ Upstream commit e75d18cecbb3805895d8ed64da4f78575ec96043 ] Though acpi_find_last_cache_level() always returned signed value and the document states it will return any errors caused by lack of a PPTT table, it never returned negative values before. Commit 0c80f9e165f8 ("ACPI: PPTT: Leave the table mapped for the runtime usage") however changed it by returning -ENOENT if no PPTT was found. The value returned from acpi_find_last_cache_level() is then assigned to unsigned fw_level. It will result in the number of cache leaves calculated incorrectly as a huge value which will then cause the following warning from __alloc_pages as the order would be great than MAX_ORDER because of incorrect and huge cache leaves value. | WARNING: CPU: 0 PID: 1 at mm/page_alloc.c:5407 __alloc_pages+0x74/0x314 | Modules linked in: | CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.19.0-10393-g7c2a8d3ac4c0 #73 | pstate: 20000005 (nzCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) | pc : __alloc_pages+0x74/0x314 | lr : alloc_pages+0xe8/0x318 | Call trace: | __alloc_pages+0x74/0x314 | alloc_pages+0xe8/0x318 | kmalloc_order_trace+0x68/0x1dc | __kmalloc+0x240/0x338 | detect_cache_attributes+0xe0/0x56c | update_siblings_masks+0x38/0x284 | store_cpu_topology+0x78/0x84 | smp_prepare_cpus+0x48/0x134 | kernel_init_freeable+0xc4/0x14c | kernel_init+0x2c/0x1b4 | ret_from_fork+0x10/0x20 Fix the same by changing fw_level to be signed integer and return the error from init_cache_level() early in case of error. Reported-and-Tested-by: Bruno Goncalves Signed-off-by: Sudeep Holla Link: https://lore.kernel.org/r/20220808084640.3165368-1-sudeep.holla@arm.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/kernel/cacheinfo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/cacheinfo.c b/arch/arm64/kernel/cacheinfo.c index 587543c6c51cb..97c42be71338a 100644 --- a/arch/arm64/kernel/cacheinfo.c +++ b/arch/arm64/kernel/cacheinfo.c @@ -45,7 +45,8 @@ static void ci_leaf_init(struct cacheinfo *this_leaf, int init_cache_level(unsigned int cpu) { - unsigned int ctype, level, leaves, fw_level; + unsigned int ctype, level, leaves; + int fw_level; struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu); for (level = 1, leaves = 0; level <= MAX_CACHE_LEVEL; level++) { @@ -63,6 +64,9 @@ int init_cache_level(unsigned int cpu) else fw_level = acpi_find_last_cache_level(cpu); + if (fw_level < 0) + return fw_level; + if (level < fw_level) { /* * some external caches not specified in CLIDR_EL1 -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel