From patchwork Thu Jan 26 11:38:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 48601 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp224873wrn; Thu, 26 Jan 2023 03:40:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXvAXOJJ6zA3EIe8x2Ss/A6mkSrBxiO6MVPPu06onERYNcphSSoaZ5Cyn6SHEJqSiaY+od/N X-Received: by 2002:a05:6402:f06:b0:461:9578:f904 with SMTP id i6-20020a0564020f0600b004619578f904mr41845470eda.23.1674733250618; Thu, 26 Jan 2023 03:40:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674733250; cv=none; d=google.com; s=arc-20160816; b=MN3MGnG06Mb7w4XsOY2jPEamsjX+6HJXjY/lTcOYgLPwBpXdihO/CsCzTRHdua9yT/ s5FncbflHDeQRXl92G/h2Fw8l9iHXpahgEzUvUqz0Ds1qu0HAfKGY9Oy+m/MAABZ4Qzn AYiPxCvY56O0sRMyyc5LGIxwIdbc2G1dXkRnZ+jyfODhYBfn8geohb1UaBPQp+TUT1vX FSV1Aa35qFvkgtOvH4z1ku88/G5ur6M87JiUzIlyUH/x9aO8dUeRxtv0l+1eIEBmM9zG Jsh1V2ik4ioximkmRuekviRQTg3vcxLeApyfEWn45mo4O0ngvW0tn8XZ8TQem7KVdwin HknQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=Yj7YBvoH2/oKg6SUByjlKXShm6+7+3WB/GHvp/SFSCE=; b=q2q6jpAHBq42LleHQYFL+Fvy+2yN/stix2uPstKVaXbQC+f4UqrwNMa9HuXl4DVAKT 381KQ1JMp6fQLDsAMZLPfsM4LNIWX0wpKnYWjC1wLLj9GKe+oNbdlFhSo4qyVic51yQm 81DaMM3feCnYvaK3/hAhY/J4jFudj41ujNcTae7If24zA2552Z+lxwGg/gB5A3OKJBi1 vDe62yzGFRGJK4OBpkXDuuOa7JdBixmAChinCjfj3YJKkicOG1UMgd2a93DwsGLzVee9 0XSXMhoRssHxbT7g8dqDT0b9WJpGFHPdNOPjPvw6KAVkbD4POhtvKR9TQhTW8zWJ4ZP4 dSnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=TZlXkgqP; dkim=neutral (no key) header.i=@linutronix.de; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id we12-20020a170907234c00b008785916ffd8si947834ejb.854.2023.01.26.03.40.25; Thu, 26 Jan 2023 03:40:50 -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; dkim=pass header.i=@linutronix.de header.s=2020 header.b=TZlXkgqP; dkim=neutral (no key) header.i=@linutronix.de; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237318AbjAZLiu (ORCPT + 99 others); Thu, 26 Jan 2023 06:38:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229639AbjAZLir (ORCPT ); Thu, 26 Jan 2023 06:38:47 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D78128D09; Thu, 26 Jan 2023 03:38:46 -0800 (PST) Date: Thu, 26 Jan 2023 11:38:42 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1674733124; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Yj7YBvoH2/oKg6SUByjlKXShm6+7+3WB/GHvp/SFSCE=; b=TZlXkgqP9bq4FaoxFPTlol1BKdMMK1CnDNcPs+4eBrRkbaJQ2YrbB36nttno1sRFTRiAob rMFw2qFMqWbGO+tr07ebvPa65UMRln2xAexUlIYzia7uY4BMua4qfLgaOl2e2PzQAzNgqo 9aGnbw0uUkOcwWIyCPLgCLCeUF0BUiCailvMSYdDiqJhTH6TkMzTBiFKUfYw07RX71kXq9 mlnJFaC8uYkHNHbc5vYfvEs/jkXFJWFedG4VDs3pD+icPlpp1VSB0w7bWtP4LFGGaYtp6p U+eO6VACOZm6g0QZDqzYDQ/AILwp+XZMSCuLVl6Q/jk3Rv7B4eVUenJnBY8TFw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1674733124; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Yj7YBvoH2/oKg6SUByjlKXShm6+7+3WB/GHvp/SFSCE=; b=hcoVFvzigyEU23XWaCIyVlXGMgzV2BZGpW+NL1S0w80MvnMFFLnmiEc96KQHmfSDPZfuvT oBCLy0qsvAGHUwCg== From: "tip-bot2 for Uros Bizjak" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] x86/ACPI/boot: Use try_cmpxchg() in __acpi_{acquire,release}_global_lock() Cc: Uros Bizjak , Ingo Molnar , "Rafael J. Wysocki" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230116162522.4072-1-ubizjak@gmail.com> References: <20230116162522.4072-1-ubizjak@gmail.com> MIME-Version: 1.0 Message-ID: <167473312297.4906.8676420213357731931.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756085093304003135?= X-GMAIL-MSGID: =?utf-8?q?1756085093304003135?= The following commit has been merged into the locking/core branch of tip: Commit-ID: 890a0794b34f89fcd90e94ec970ad2bc18b70e73 Gitweb: https://git.kernel.org/tip/890a0794b34f89fcd90e94ec970ad2bc18b70e73 Author: Uros Bizjak AuthorDate: Mon, 16 Jan 2023 17:25:22 +01:00 Committer: Ingo Molnar CommitterDate: Thu, 26 Jan 2023 11:49:40 +01:00 x86/ACPI/boot: Use try_cmpxchg() in __acpi_{acquire,release}_global_lock() Use try_cmpxchg instead of cmpxchg (*ptr, old, new) == old in __acpi_{acquire,release}_global_lock(). x86 CMPXCHG instruction returns success in ZF flag, so this change saves a compare after CMPXCHG (and related MOV instruction in front of CMPXCHG). Also, try_cmpxchg() implicitly assigns old *ptr value to "old" when CMPXCHG fails. There is no need to re-read the value in the loop. Note that the value from *ptr should be read using READ_ONCE() to prevent the compiler from merging, refetching or reordering the read. No functional change intended. Signed-off-by: Uros Bizjak Signed-off-by: Ingo Molnar Acked-by: Rafael J. Wysocki Link: https://lore.kernel.org/r/20230116162522.4072-1-ubizjak@gmail.com --- arch/x86/kernel/acpi/boot.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 907cc98..4177577 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -1840,23 +1840,23 @@ early_param("acpi_sci", setup_acpi_sci); int __acpi_acquire_global_lock(unsigned int *lock) { - unsigned int old, new, val; + unsigned int old, new; + + old = READ_ONCE(*lock); do { - old = *lock; new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1)); - val = cmpxchg(lock, old, new); - } while (unlikely (val != old)); + } while (!try_cmpxchg(lock, &old, new)); return ((new & 0x3) < 3) ? -1 : 0; } int __acpi_release_global_lock(unsigned int *lock) { - unsigned int old, new, val; + unsigned int old, new; + + old = READ_ONCE(*lock); do { - old = *lock; new = old & ~0x3; - val = cmpxchg(lock, old, new); - } while (unlikely (val != old)); + } while (!try_cmpxchg(lock, &old, new)); return old & 0x1; }