Received: by 2002:a05:7412:37c9:b0:e2:908c:2ebd with SMTP id jz9csp1217709rdb; Wed, 20 Sep 2023 03:08:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGdO6gV7BOO3ZN6FC8/yuvgVPb1NeJx76tClsg9ZPjjVb/7zc3Oj+fsztGsRrtuD+HYLtMK X-Received: by 2002:a05:6a20:978e:b0:152:be08:b013 with SMTP id hx14-20020a056a20978e00b00152be08b013mr1854628pzc.42.1695204494486; Wed, 20 Sep 2023 03:08:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695204494; cv=none; d=google.com; s=arc-20160816; b=Vvhr3mVIe+WGQVHK2WwF2nGXzciFF9sOmD70eVlxVyRUpj3gL8FQbs0i5kKNPd8MOo +NdQC3FgyIc5D3zfmYsxCkbD5RhN9nFKbh3oaMwnilEbBkMXDlbaQ6Z3NisSV9FBAs0n avrUHR92dKfXYIEHoWNqjzsaUrw7WKjaI8zPRapSz5eQYnQ0NiyfjXO4W9OZWz1+Xdye 3nKnRHc5Y8TFCKsIQ6emrKTfTxXaD8O/JMs700thY5uXiJgxGIHpaNAcabJX5yWlCE2a BIapI36t+7r2Ds5LuYHRKsd9/Y4X8NyP9aEfrcsiCzwVWLuHNT22sqDd690lwu/1wmL2 htWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version; bh=44Pe6srBfgGcyU4oBWUmXHv8FOZCQZX9YZ3BUAuODUU=; fh=r4d50eC1A1mE2M6OkwdQrSYZIzqe78S++0spQnnGhU8=; b=q9p71vU5n91AYlVLYItpY8mRWONwPBL+gf2AkXV/S62HIAwX4uejDnhGRWiKIJ6HEr MG1y0rmLs+U1QhT9//BjGcp0yG+aIamnILjSbVJzWWqrnhItrnfNtTCV4dQdbeSB2In6 eMEEWEw8OKsKdjDIfax165+LjdlVH+NUmOAlKyAtE1MghaqQQeROlVRragyKUo5rkzFN I30yz4PJr2gmPdF8AZCaF8D2406Zp/+wZp7uB50Jlz+y1lXZDnx+4yppCeUXWELQVNlN 4RZ7vuxDD+nA5zfiANbX8RIotKiH6wtMPhDyHpTQhirqZVSjco7ifoK/XaLqAHlpxAgh 2e+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id c17-20020a170903235100b001bf559a7bc6si11650542plh.465.2023.09.20.03.08.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 03:08:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 8400381489F4; Wed, 20 Sep 2023 02:53:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234216AbjITJxv convert rfc822-to-8bit (ORCPT + 99 others); Wed, 20 Sep 2023 05:53:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234210AbjITJxt (ORCPT ); Wed, 20 Sep 2023 05:53:49 -0400 Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67D0BA3; Wed, 20 Sep 2023 02:53:42 -0700 (PDT) Received: by mail-oo1-f50.google.com with SMTP id 006d021491bc7-5733d11894dso1143563eaf.0; Wed, 20 Sep 2023 02:53:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695203621; x=1695808421; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P0W2+GC8VC3VSLquVGlwO+FpZZboAZGXm/jN7TQ/yiw=; b=KNiug2ovTc3mViCUbb2NYN1d+wPccy+DJS+DBlbJNxnvHZrxf9VSXR+GeYnJdG0c/2 dgZtolXOstiJHS3FkjecFjNRPl8LeJDvQBMy0fBO8OFt+qm0PQvKdOTcFnlECvcx+DNn vivGpm/ZoUn1x7jqJlCELX+KZaGKy1BduzFSadr/DYLUqe+MRYOII4pvhJ7kj8lvDUKS i7YRuphzoEzcDaRpOMEEcyFdJ3ep/u1leMvfHtDgtMse2Ciet6kflfJEsj6BZQIwnUfP SoIJF53Ndz9yBY6EQMKlILMcyOmYsjSTZ18A2kjqJSmFGrAjNqcwIDG4aQjKjXdY3iot Nh5w== X-Gm-Message-State: AOJu0YwJFCqtV6tRLBocPn7n88Gz1/9nujbH0uH3CVgI0rRGf1Y+RoeX 8UMaOdtLHQ1LkdoV9/CvkNeKsSr3C3PvxXQBxMw= X-Received: by 2002:a4a:a50c:0:b0:573:764b:3b8d with SMTP id v12-20020a4aa50c000000b00573764b3b8dmr2108395ook.0.1695203621463; Wed, 20 Sep 2023 02:53:41 -0700 (PDT) MIME-Version: 1.0 References: <20230920074158.3605-1-mirsad.todorovac@alu.unizg.hr> In-Reply-To: <20230920074158.3605-1-mirsad.todorovac@alu.unizg.hr> From: "Rafael J. Wysocki" Date: Wed, 20 Sep 2023 11:53:28 +0200 Message-ID: Subject: Re: [PATCH v2 1/1] acpica: use spinlocks to fix the data-races reported by the KCSAN To: Mirsad Goran Todorovac Cc: linux-acpi@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-kernel@vger.kernel.org, Robert Moore , "Rafael J. Wysocki" , Len Brown , Jung-uk Kim , Linus Torvalds , Erik Kaneda , kernel test robot Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 20 Sep 2023 02:53:59 -0700 (PDT) On Wed, Sep 20, 2023 at 9:44 AM Mirsad Goran Todorovac wrote: > > KCSAN reported hundreds of instances of data-races in ACPICA like this one: If you want to make changes in the ACPICA code, the way to do that is to submit a pull request for the upstream ACPICA project on GitHub. Then you can resend the Linux patch with a Link: tag pointing to the upstream pull request. > [ 6.994149] ================================================================== > [ 6.994443] BUG: KCSAN: data-race in acpi_ut_status_exit / acpi_ut_trace > > [ 6.994795] write to 0xffffffffbae5a884 of 4 bytes by task 0 on cpu 2: > [ 6.994944] acpi_ut_status_exit (/home/marvin/linux/kernel/torvalds2/drivers/acpi/acpica/utdebug.c:467) > [ 6.994957] acpi_hw_register_read (/home/marvin/linux/kernel/torvalds2/drivers/acpi/acpica/hwregs.c:563) > [ 6.994968] acpi_read_bit_register (/home/marvin/linux/kernel/torvalds2/drivers/acpi/acpica/hwxface.c:171) > [ 6.994980] acpi_idle_bm_check (/home/marvin/linux/kernel/torvalds2/drivers/acpi/processor_idle.c:511) > [ 6.994990] acpi_idle_enter_bm (/home/marvin/linux/kernel/torvalds2/drivers/acpi/processor_idle.c:644 (discriminator 1)) > [ 6.995000] acpi_idle_enter (/home/marvin/linux/kernel/torvalds2/drivers/acpi/processor_idle.c:695) > [ 6.995010] cpuidle_enter_state (/home/marvin/linux/kernel/torvalds2/drivers/cpuidle/cpuidle.c:267) > [ 6.995019] cpuidle_enter (/home/marvin/linux/kernel/torvalds2/drivers/cpuidle/cpuidle.c:390) > [ 6.995027] call_cpuidle (/home/marvin/linux/kernel/torvalds2/kernel/sched/idle.c:135) > [ 6.995038] do_idle (/home/marvin/linux/kernel/torvalds2/kernel/sched/idle.c:219 /home/marvin/linux/kernel/torvalds2/kernel/sched/idle.c:282) > [ 6.995046] cpu_startup_entry (/home/marvin/linux/kernel/torvalds2/kernel/sched/idle.c:378 (discriminator 1)) > [ 6.995055] start_secondary (/home/marvin/linux/kernel/torvalds2/arch/x86/kernel/smpboot.c:210 /home/marvin/linux/kernel/torvalds2/arch/x86/kernel/smpboot.c:294) > [ 6.995066] secondary_startup_64_no_verify (/home/marvin/linux/kernel/torvalds2/arch/x86/kernel/head_64.S:433) > > [ 6.995121] read to 0xffffffffbae5a884 of 4 bytes by task 0 on cpu 9: > [ 6.995267] acpi_ut_trace (/home/marvin/linux/kernel/torvalds2/drivers/acpi/acpica/utdebug.c:263) > [ 6.995279] acpi_hw_validate_io_request (/home/marvin/linux/kernel/torvalds2/drivers/acpi/acpica/hwvalid.c:101) > [ 6.995291] acpi_hw_read_port (/home/marvin/linux/kernel/torvalds2/drivers/acpi/acpica/hwvalid.c:202) > [ 6.995303] acpi_hw_read (/home/marvin/linux/kernel/torvalds2/drivers/acpi/acpica/hwregs.c:251) > [ 6.995313] acpi_hw_register_read (/home/marvin/linux/kernel/torvalds2/drivers/acpi/acpica/hwregs.c:725 /home/marvin/linux/kernel/torvalds2/drivers/acpi/acpica/hwregs.c:499) > [ 6.995325] acpi_read_bit_register (/home/marvin/linux/kernel/torvalds2/drivers/acpi/acpica/hwxface.c:171) > [ 6.995336] acpi_idle_bm_check (/home/marvin/linux/kernel/torvalds2/drivers/acpi/processor_idle.c:511) > [ 6.995346] acpi_idle_enter_bm (/home/marvin/linux/kernel/torvalds2/drivers/acpi/processor_idle.c:644 (discriminator 1)) > [ 6.995356] acpi_idle_enter (/home/marvin/linux/kernel/torvalds2/drivers/acpi/processor_idle.c:695) > [ 6.995366] cpuidle_enter_state (/home/marvin/linux/kernel/torvalds2/drivers/cpuidle/cpuidle.c:267) > [ 6.995375] cpuidle_enter (/home/marvin/linux/kernel/torvalds2/drivers/cpuidle/cpuidle.c:390) > [ 6.995383] call_cpuidle (/home/marvin/linux/kernel/torvalds2/kernel/sched/idle.c:135) > [ 6.995394] do_idle (/home/marvin/linux/kernel/torvalds2/kernel/sched/idle.c:219 /home/marvin/linux/kernel/torvalds2/kernel/sched/idle.c:282) > [ 6.995402] cpu_startup_entry (/home/marvin/linux/kernel/torvalds2/kernel/sched/idle.c:378 (discriminator 1)) > [ 6.995411] start_secondary (/home/marvin/linux/kernel/torvalds2/arch/x86/kernel/smpboot.c:210 /home/marvin/linux/kernel/torvalds2/arch/x86/kernel/smpboot.c:294) > [ 6.995422] secondary_startup_64_no_verify (/home/marvin/linux/kernel/torvalds2/arch/x86/kernel/head_64.S:433) > > [ 6.995476] value changed: 0x00000004 -> 0x00000002 > > [ 6.995629] Reported by Kernel Concurrency Sanitizer on: > [ 6.995748] CPU: 9 PID: 0 Comm: swapper/9 Not tainted 6.6.0-rc2-kcsan-00003-g16819584c239-dirty #21 > [ 6.995758] Hardware name: ASRock X670E PG Lightning/X670E PG Lightning, BIOS 1.21 04/26/2023 > [ 6.995765] ================================================================== > > Please find the complete list at: https://domac.alu.unizg.hr/~mtodorov/linux/patches/acpica_utdebug/acpi_ut_status_exit.log.xz > > A number of unprotected increments: > > acpi_gbl_nesting_level++; > > and conditional statements: > > if (acpi_gbl_nesting_level) { > acpi_gbl_nesting_level--; > } > > no longer work in SMP environment. > > Proper locking like > > spin_lock(&acpi_utdebug_lock); > acpi_gbl_nesting_level++; > spin_unlock(&acpi_utdebug_lock); > > and > > spin_lock(&acpi_utdebug_lock); > if (acpi_gbl_nesting_level) { > acpi_gbl_nesting_level--; > } > spin_unlock(&acpi_utdebug_lock); > > makes these data-races go away. > > Additionally, READ_ONCE() or WRITE_ONCE() is required with the global variable > acpi_gbl_nesting_level to prevent unwanted read or write reordering or other funny > stuff the optmisers do. > > The patch eliminates KCSAN BUG warnings. > > Reported-by: Mirsad Goran Todorovac > Fixes: 6be2d72b18649 ("ACPICA: Update for a few debug output statements") > Fixes: bf9b448ef8430 ("ACPICA: Debug output: Do not emit function nesting level for kernel build.") > Fixes: 6e875fa0480c1 ("ACPICA: Debugger: fix slight indentation issue") > Fixes: ^1da177e4c3f4 ("Initial git repository build.") > Cc: Jung-uk Kim > Cc: Linus Torvalds > Cc: Erik Kaneda > Cc: Bob Moore > Cc: "Rafael J. Wysocki" > Cc: Len Brown > Cc: linux-acpi@vger.kernel.org > Cc: acpica-devel@lists.linuxfoundation.org > Signed-off-by: Mirsad Goran Todorovac > Reported-by: kernel test robot > Closes: https://lore.kernel.org/oe-kbuild-all/202309201331.S2c1JL2h-lkp@intel.com/ > --- > v1 -> v2: > Moved the declaration of 'u32 nesting_level' inside #ifdef ACPI_APPLICATION ... #endif > according to the unused variable warning of the kernel test robot. > > v1: > Preliminary RFC version of the patch. > > drivers/acpi/acpica/utdebug.c | 40 ++++++++++++++++++++++++++++++----- > 1 file changed, 35 insertions(+), 5 deletions(-) > > diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c > index c5f6c85a3a09..1faf7dc144f0 100644 > --- a/drivers/acpi/acpica/utdebug.c > +++ b/drivers/acpi/acpica/utdebug.c > @@ -16,6 +16,8 @@ > #define _COMPONENT ACPI_UTILITIES > ACPI_MODULE_NAME("utdebug") > > +static DEFINE_SPINLOCK(acpi_utdebug_lock); > + > #ifdef ACPI_DEBUG_OUTPUT > static acpi_thread_id acpi_gbl_previous_thread_id = (acpi_thread_id) 0xFFFFFFFF; > static const char *acpi_gbl_function_entry_prefix = "----Entry"; > @@ -60,13 +62,16 @@ void acpi_ut_init_stack_ptr_trace(void) > void acpi_ut_track_stack_ptr(void) > { > acpi_size current_sp; > + u32 nesting_level; > > if (¤t_sp < acpi_gbl_lowest_stack_pointer) { > acpi_gbl_lowest_stack_pointer = ¤t_sp; > } > > - if (acpi_gbl_nesting_level > acpi_gbl_deepest_nesting) { > - acpi_gbl_deepest_nesting = acpi_gbl_nesting_level; > + nesting_level = READ_ONCE(acpi_gbl_nesting_level); > + > + if (nesting_level > acpi_gbl_deepest_nesting) { > + acpi_gbl_deepest_nesting = nesting_level; > } > } > > @@ -136,6 +141,7 @@ acpi_debug_print(u32 requested_debug_level, > va_list args; > #ifdef ACPI_APPLICATION > int fill_count; > + u32 nesting_level; > #endif > > /* Check if debug output enabled */ > @@ -156,7 +162,7 @@ acpi_debug_print(u32 requested_debug_level, > } > > acpi_gbl_previous_thread_id = thread_id; > - acpi_gbl_nesting_level = 0; > + WRITE_ONCE(acpi_gbl_nesting_level, 0); > } > > /* > @@ -176,14 +182,16 @@ acpi_debug_print(u32 requested_debug_level, > acpi_os_printf("[%u] ", (u32)thread_id); > } > > - fill_count = 48 - acpi_gbl_nesting_level - > + fill_count = 48 - READ_ONCE(acpi_gbl_nesting_level) - > strlen(acpi_ut_trim_function_name(function_name)); > if (fill_count < 0) { > fill_count = 0; > } > > + nesting_level = READ_ONCE(acpi_gbl_nesting_level); > + > acpi_os_printf("[%02d] %*s", > - acpi_gbl_nesting_level, acpi_gbl_nesting_level + 1, " "); > + nesting_level, nesting_level + 1, " "); > acpi_os_printf("%s%*s: ", > acpi_ut_trim_function_name(function_name), fill_count, > " "); > @@ -260,7 +268,10 @@ acpi_ut_trace(u32 line_number, > const char *module_name, u32 component_id) > { > > + spin_lock(&acpi_utdebug_lock); > acpi_gbl_nesting_level++; > + spin_unlock(&acpi_utdebug_lock); > + > acpi_ut_track_stack_ptr(); > > /* Check if enabled up-front for performance */ > @@ -298,7 +309,10 @@ acpi_ut_trace_ptr(u32 line_number, > u32 component_id, const void *pointer) > { > > + spin_lock(&acpi_utdebug_lock); > acpi_gbl_nesting_level++; > + spin_unlock(&acpi_utdebug_lock); > + > acpi_ut_track_stack_ptr(); > > /* Check if enabled up-front for performance */ > @@ -334,7 +348,10 @@ acpi_ut_trace_str(u32 line_number, > const char *module_name, u32 component_id, const char *string) > { > > + spin_lock(&acpi_utdebug_lock); > acpi_gbl_nesting_level++; > + spin_unlock(&acpi_utdebug_lock); > + > acpi_ut_track_stack_ptr(); > > /* Check if enabled up-front for performance */ > @@ -370,7 +387,10 @@ acpi_ut_trace_u32(u32 line_number, > const char *module_name, u32 component_id, u32 integer) > { > > + spin_lock(&acpi_utdebug_lock); > acpi_gbl_nesting_level++; > + spin_unlock(&acpi_utdebug_lock); > + > acpi_ut_track_stack_ptr(); > > /* Check if enabled up-front for performance */ > @@ -414,9 +434,11 @@ acpi_ut_exit(u32 line_number, > acpi_gbl_function_exit_prefix); > } > > + spin_lock(&acpi_utdebug_lock); > if (acpi_gbl_nesting_level) { > acpi_gbl_nesting_level--; > } > + spin_unlock(&acpi_utdebug_lock); > } > > ACPI_EXPORT_SYMBOL(acpi_ut_exit) > @@ -463,9 +485,11 @@ acpi_ut_status_exit(u32 line_number, > } > } > > + spin_lock(&acpi_utdebug_lock); > if (acpi_gbl_nesting_level) { > acpi_gbl_nesting_level--; > } > + spin_unlock(&acpi_utdebug_lock); > } > > ACPI_EXPORT_SYMBOL(acpi_ut_status_exit) > @@ -502,9 +526,11 @@ acpi_ut_value_exit(u32 line_number, > ACPI_FORMAT_UINT64(value)); > } > > + spin_lock(&acpi_utdebug_lock); > if (acpi_gbl_nesting_level) { > acpi_gbl_nesting_level--; > } > + spin_unlock(&acpi_utdebug_lock); > } > > ACPI_EXPORT_SYMBOL(acpi_ut_value_exit) > @@ -540,9 +566,11 @@ acpi_ut_ptr_exit(u32 line_number, > acpi_gbl_function_exit_prefix, ptr); > } > > + spin_lock(&acpi_utdebug_lock); > if (acpi_gbl_nesting_level) { > acpi_gbl_nesting_level--; > } > + spin_unlock(&acpi_utdebug_lock); > } > > /******************************************************************************* > @@ -577,9 +605,11 @@ acpi_ut_str_exit(u32 line_number, > acpi_gbl_function_exit_prefix, string); > } > > + spin_lock(&acpi_utdebug_lock); > if (acpi_gbl_nesting_level) { > acpi_gbl_nesting_level--; > } > + spin_unlock(&acpi_utdebug_lock); > } > > /******************************************************************************* > -- > 2.34.1 >