Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp13631265rwl; Wed, 4 Jan 2023 10:42:18 -0800 (PST) X-Google-Smtp-Source: AMrXdXvJHDKXGKemP6SQGLyBwN5oRQ1MocBVcofJ0P2lbOfPD5WvC879YrPol6EpXHWwjxR2RalE X-Received: by 2002:a05:6402:558:b0:47e:5b70:de7b with SMTP id i24-20020a056402055800b0047e5b70de7bmr40983996edx.19.1672857738645; Wed, 04 Jan 2023 10:42:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672857738; cv=none; d=google.com; s=arc-20160816; b=F78EE1pd2vB/q3FOOuVnYwsRz/UBUNCvDyXgwGlGQuBeiKlaRVrl/wcNNq/ulMKshl MfF8e2GospUiB4FNR3l3/p8Ec781NSIXQpvKoT7LLQ5VxjHI2Tj4GBSvIpbb5yrkf0u/ 8Y3VaFJOzBbInAcQ+NSxjuR/eYFjeacOZ4yO9qCsmvqITU1gOkS7o6IWcdOIz2D+NHBg OJg3Jkuvksq42fALzn7Fk1sibOx6pHUMXxb95CxmvCX1YjErRm2yO4Bd4jzsFxwVsBwf E3q8035Y6gi/rP9jTGa3ptk2GMN4ClnalmLmg2XZxnZkGFX1lWeoXccITL9JyyO2T442 Gbdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=vhPFuo+gfFREBGGTsyqVyuGc5iNikjAbHl+Q/GtyA/Y=; b=O22qcAXgkaCN61bF5+KZoS4oxoKpKBKKg/g7S1sSMq7X0O4FdIHnWUpZ2pGrN83pQw ZwFmL3/G6YfpC7ejl4LqIHrvxvA9SUHd6bsTPqkNoKbgXq3UC26sKju9+baxGmxPuf+H Rg/aBLL2gUwhvuCvkOac39QDCe73xNfSmPfSp5EP+xP+njPk1EvOgdtQEiy8nJ6K6pU1 UbJlIKkMfwuPMNlcAOqGKaSGDT4reO64rEw+CGsAN67iAwkgcsRU7mwMUKH3ct+b42e3 UAUUgasG/g5ptk+nUaIHNrNA86SsAMMZaEFkzKnyuoWEomlH1TPwhzAMZH+XRK+4gmkf Lp1Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f13-20020a056402354d00b00478215c1d6esi35296194edd.553.2023.01.04.10.42.01; Wed, 04 Jan 2023 10:42:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235180AbjADSbP (ORCPT + 58 others); Wed, 4 Jan 2023 13:31:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229449AbjADSbO (ORCPT ); Wed, 4 Jan 2023 13:31:14 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9A9F065B4; Wed, 4 Jan 2023 10:31:12 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B09FB1063; Wed, 4 Jan 2023 10:31:53 -0800 (PST) Received: from pierre123.arm.com (unknown [10.57.44.105]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 706893F663; Wed, 4 Jan 2023 10:31:08 -0800 (PST) From: Pierre Gondois To: linux-kernel@vger.kernel.org Cc: Pierre Gondois , Catalin Marinas , Will Deacon , Paul Walmsley , Palmer Dabbelt , Albert Ou , "Rafael J. Wysocki" , Len Brown , Sudeep Holla , Greg Kroah-Hartman , Jeremy Linton , Conor Dooley , Gavin Shan , linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org Subject: [PATCH v4 0/6] arch_topology: Build cacheinfo from primary CPU Date: Wed, 4 Jan 2023 19:30:23 +0100 Message-Id: <20230104183033.755668-1-pierre.gondois@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org v2: - Applied renaming/formatting comments from v1. - Check CACHE_TYPE_VALID flag in pppt.c. v3: - Applied Sudeep's suggestions (for patch 5/5): - Renaming allocate_cache_info() -> fecth_cache_info() - Updated error message - Extract an inline allocate_cache_info() function - Re-run checkpatch with --strict option v4: - Remove RISC-V's implementation of init_cache_level() as not necessary. - Add patch: 'cacheinfo: Check 'cache-unified' property to count cache leaves' to increase the number of leaves at a cache level when no cache-size property is found. - In cacheinfo: Use RISC-V's init_cache_level() [...], make 'levels', 'leaves' and 'level' unsigned int to match of_property_read_u32()'s parameters signedness. Note: This patchset requires the following patch to be applied first in order to avoid the same bug described in the commit message: https://lore.kernel.org/all/20221116094958.2141072-1-pierre.gondois@arm.com/ [1] and [2] build the CPU topology from the cacheinfo information for both DT/ACPI based systems and remove (struct cpu_topology).llc_id which was used by ACPI only. Creating the cacheinfo for secondary CPUs is done during early boot. Preemption and interrupts are disabled at this stage. On PREEMPT_RT kernels, allocating memory (and parsing the PPTT table for ACPI based systems) triggers a: 'BUG: sleeping function called from invalid context' [4] To prevent this bug, allocate the cacheinfo from the primary CPU when preemption and interrupts are enabled and before booting secondary CPUs. The cache levels/leaves are computed from DT/ACPI PPTT information only, without relying on the arm64 CLIDR_EL1 register. If no cache information is found in the DT/ACPI PPTT, then fallback to the current state, triggering [4] on PREEMPT_RT kernels. Patches to update the arm64 device trees that have incomplete cacheinfo (mostly for missing the 'cache-level' or 'cache-unified' property) have been sent at [3]. Tested platforms: - ACPI + PPTT: Ampere Altra, Ampere eMAG, Cavium ThunderX2, Kunpeng 920, Juno-r2 - DT: rb5, db845c, Juno-r2 [1] https://lore.kernel.org/all/20220704101605.1318280-1-sudeep.holla@arm.com/ [2] https://lore.kernel.org/all/20220720-arch_topo_fixes-v3-0-43d696288e84@arm.com/ [3] https://lore.kernel.org/all/20221107155825.1644604-1-pierre.gondois@arm.com/ [4] On an Ampere Altra, with PREEMPT_RT kernel based on v6.0.0-rc4: [ 7.560791] BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:46 [ 7.560794] in_atomic(): 1, irqs_disabled(): 128, non_block: 0, pid: 0, name: swapper/111 [ 7.560796] preempt_count: 1, expected: 0 [ 7.560797] RCU nest depth: 1, expected: 1 [ 7.560799] 3 locks held by swapper/111/0: [ 7.560800] #0: ffff403e406cae98 (&pcp->lock){+.+.}-{3:3}, at: get_page_from_freelist+0x218/0x12c8 [ 7.560811] #1: ffffc5f8ed09f8e8 (rcu_read_lock){....}-{1:3}, at: rt_spin_trylock+0x48/0xf0 [ 7.560820] #2: ffff403f400b4fd8 (&zone->lock){+.+.}-{3:3}, at: rmqueue_bulk+0x64/0xa80 [ 7.560824] irq event stamp: 0 [ 7.560825] hardirqs last enabled at (0): [<0000000000000000>] 0x0 [ 7.560827] hardirqs last disabled at (0): [] copy_process+0x5dc/0x1ab8 [ 7.560830] softirqs last enabled at (0): [] copy_process+0x5dc/0x1ab8 [ 7.560833] softirqs last disabled at (0): [<0000000000000000>] 0x0 [ 7.560834] Preemption disabled at: [ 7.560835] [] migrate_enable+0x30/0x130 [ 7.560838] CPU: 111 PID: 0 Comm: swapper/111 Tainted: G W 6.0.0-rc4-[...] [ 7.560841] Call trace: [...] [ 7.560870] __kmalloc+0xbc/0x1e8 [ 7.560873] detect_cache_attributes+0x2d4/0x5f0 [ 7.560876] update_siblings_masks+0x30/0x368 [ 7.560880] store_cpu_topology+0x78/0xb8 [ 7.560883] secondary_start_kernel+0xd0/0x198 [ 7.560885] __secondary_switched+0xb0/0xb4 Pierre Gondois (6): cacheinfo: Use RISC-V's init_cache_level() as generic OF implementation cacheinfo: Return error code in init_of_cache_level() cacheinfo: Check 'cache-unified' property to count cache leaves ACPI: PPTT: Remove acpi_find_cache_levels() ACPI: PPTT: Update acpi_find_last_cache_level() to acpi_get_cache_info() arch_topology: Build cacheinfo from primary CPU arch/arm64/kernel/cacheinfo.c | 11 ++- arch/riscv/kernel/cacheinfo.c | 42 ----------- drivers/acpi/pptt.c | 93 +++++++++++++---------- drivers/base/arch_topology.c | 12 ++- drivers/base/cacheinfo.c | 134 +++++++++++++++++++++++++++++----- include/linux/cacheinfo.h | 11 ++- 6 files changed, 196 insertions(+), 107 deletions(-) -- 2.25.1