Message ID | 170229637816.398.6506455819507623200.tip-bot2@tip-bot2 |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6993919vqy; Mon, 11 Dec 2023 04:06:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IGO9kVimW4/XTfHCBpV9zKYH1KZVH1/eTwme5Jrx1ohLm3wfooG94grpDUusHQ0V1pmtfE5 X-Received: by 2002:a17:90b:1bd0:b0:286:b271:39a1 with SMTP id oa16-20020a17090b1bd000b00286b27139a1mr4592116pjb.27.1702296396326; Mon, 11 Dec 2023 04:06:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702296396; cv=none; d=google.com; s=arc-20160816; b=0oqwvaDqGCj101uIt22jJg1Mk3UmFahExwmAnkeXDKQYHvSfa9WjgJKNxC3H0GcQXl FA/In34VzfBUcCWRWIcQYy5oqx52q3goTq0gDrNueoqQmDRxVHAodEf5LSYu3Xg5ud1w tSl5i3vV5oSsfKlMso79ZHT+R4xXcbWxewXJ28ieEHzkRIApIPfZ8J5XJC3XeWMLGR6H WF/zcQV2w9yRUFVzXIhkfmgDh+j3tvJdSS2dKy/+YC8dWcdP7HOs4mUfxZFh1+GGJgiJ 2AUmkq97Frjw58yO8Wiz3heSdtzuOsB3BfUEmClDuwslifuCnNx1C8G6iE+O8GbbsZ0D /0yw== 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=VfTPl/nW9rDgb6I9nd5VFUQTJIv7AQKSpG+8w24XWxg=; fh=aMuEctUrpEjcm7+Z6FW9dcyBzbyQClfa+XesJRjdIVw=; b=c3A1QGJEj96NJuL0vMgXfsYg4bGRdURX7ewFQVWzzHGm5s5UzBWqLfJ/LbuzdwD19H QzDvXoL75SIYDpBTyt4g4wBOluxu2tCXXZrsx0yKPf/vgi1MhBDNaMih1jhjuO/Wgu+v pZDmbhZUKpIwQu6AUZ7Wbrw8jx6VlcWg0W1iq0V3ScOLT0pM9GSY+8mRFfQYBGZTBFSl iYf58SRjiiDqflyHY0XqHBetolzVdNoQ+tVRC4qWcpNBLzJKhOBxA/78tWzCfVET7tL6 MnwjM6QivyGXRWZu+RqrMevubjWUlvU+g2qIkBb5kYmFSpVLDP24KIBMGl1UyVU2d/QY fTQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=2B0cL0Hw; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=MTpmbXwL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id oa4-20020a17090b1bc400b00286f8bfe04bsi6068243pjb.172.2023.12.11.04.06.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 04:06:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=2B0cL0Hw; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=MTpmbXwL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 08F76806002C; Mon, 11 Dec 2023 04:06:32 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234350AbjLKMGT (ORCPT <rfc822;dexuan.linux@gmail.com> + 99 others); Mon, 11 Dec 2023 07:06:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234454AbjLKMGP (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 11 Dec 2023 07:06:15 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68B3BFD; Mon, 11 Dec 2023 04:06:20 -0800 (PST) Date: Mon, 11 Dec 2023 12:06:18 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1702296379; 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=VfTPl/nW9rDgb6I9nd5VFUQTJIv7AQKSpG+8w24XWxg=; b=2B0cL0HwQk/aPIxgPF+q3+qmJmNCR2zriNdqdInHiEhpQqEmxHpUqJ/2MkWq4FCsixWtUz 2zvwuM+bNqmw2oweLeQLb9Jd64G+WkwRlrewYava2VEStdMPvalbRxv8IVNK27/cctY3NR eSEtWHoPHG4i0jLkSXz/d6xw5cyb8Um5I0wT5XzyRnnvKveyUDCWKHA7ProO1iTvsSs+Pn S9W93ggkargHHzmDdbvrrFs0hHyU46/Z7K2EKebSwWfMVGoHuNXSvF55CcBty0Yi25ECmT mlt1hZjSM6oXNhjSLhrsqH+uqOB7uJJTkKPEowIQTosXVDgYZ5UbS460wre1kw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1702296379; 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=VfTPl/nW9rDgb6I9nd5VFUQTJIv7AQKSpG+8w24XWxg=; b=MTpmbXwLJP4DtyKIdC+P4R64LflOAoTXmLRUR1JyGN9kGMpqEIcJVqIhKMTk7SkswX6K+p ZLsVldSOFqLFMrCA== From: "tip-bot2 for Uros Bizjak" <tip-bot2@linutronix.de> Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/percpu] x86/traps: Use current_top_of_stack() helper in traps.c Cc: Uros Bizjak <ubizjak@gmail.com>, Ingo Molnar <mingo@kernel.org>, Linus Torvalds <torvalds@linux-foundation.org>, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231204210320.114429-2-ubizjak@gmail.com> References: <20231204210320.114429-2-ubizjak@gmail.com> MIME-Version: 1.0 Message-ID: <170229637816.398.6506455819507623200.tip-bot2@tip-bot2> Robot-ID: <tip-bot2@linutronix.de> Robot-Unsubscribe: Contact <mailto:tglx@linutronix.de> to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 11 Dec 2023 04:06:32 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784386761276032071 X-GMAIL-MSGID: 1784987146447783087 |
Series |
[tip:,x86/percpu] x86/traps: Use current_top_of_stack() helper in traps.c
|
|
Commit Message
tip-bot2 for Thomas Gleixner
Dec. 11, 2023, 12:06 p.m. UTC
The following commit has been merged into the x86/percpu branch of tip: Commit-ID: 13408c6ae684181d53c870cceddbd3a62ae34c3e Gitweb: https://git.kernel.org/tip/13408c6ae684181d53c870cceddbd3a62ae34c3e Author: Uros Bizjak <ubizjak@gmail.com> AuthorDate: Mon, 04 Dec 2023 22:02:30 +01:00 Committer: Ingo Molnar <mingo@kernel.org> CommitterDate: Mon, 11 Dec 2023 11:47:15 +01:00 x86/traps: Use current_top_of_stack() helper in traps.c Use current_top_of_stack() helper in sync_regs() and vc_switch_off_ist() instead of open-coding the reading of the top_of_stack percpu variable explicitly. Signed-off-by: Uros Bizjak <ubizjak@gmail.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: https://lore.kernel.org/r/20231204210320.114429-2-ubizjak@gmail.com --- arch/x86/kernel/traps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index c876f1d..78b1d1a 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -772,7 +772,7 @@ DEFINE_IDTENTRY_RAW(exc_int3) */ asmlinkage __visible noinstr struct pt_regs *sync_regs(struct pt_regs *eregs) { - struct pt_regs *regs = (struct pt_regs *)this_cpu_read(pcpu_hot.top_of_stack) - 1; + struct pt_regs *regs = (struct pt_regs *)current_top_of_stack() - 1; if (regs != eregs) *regs = *eregs; return regs; @@ -790,7 +790,7 @@ asmlinkage __visible noinstr struct pt_regs *vc_switch_off_ist(struct pt_regs *r * trust it and switch to the current kernel stack */ if (ip_within_syscall_gap(regs)) { - sp = this_cpu_read(pcpu_hot.top_of_stack); + sp = current_top_of_stack(); goto sync; }