From patchwork Fri Apr 14 14:47:56 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: 83466 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp379310rwl; Fri, 14 Apr 2023 07:57:28 -0700 (PDT) X-Google-Smtp-Source: AKy350aUWvn26Qopa2zE2LQcONfg4izHNKTYdZBNnLs3JttosXEem7Rv18UK4sJAXgMjcaevkQiW X-Received: by 2002:a05:6a00:1ac7:b0:63b:5f78:d6e1 with SMTP id f7-20020a056a001ac700b0063b5f78d6e1mr5147516pfv.16.1681484248320; Fri, 14 Apr 2023 07:57:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681484248; cv=none; d=google.com; s=arc-20160816; b=lyKeNRtZrSe9h+Jk6ummVw1J4Hi35RlV0qDRQdf0fdDtMUi2fUQGkTz85moOuQgzgK dkqvQEkGJ15F7ic6WDtVnveqMNNn4cOrK8vp5Or6eQDBJ2EQyh57SOB12MdqiIatTtpl oQpACgl7lslRR6Oj2nZaesTNT1IgPJ56dQS2vm5jxS6aa1fT3/tWPUxlbOL9ulFMb5uf RC87KbHR5GMQl+dgCKClOSN10NK44Qc8HRmHky7HQddOlBy7+5staeqXKIxyonTlxAud QFfG4Qfu+RyoyB8V1+vw+UAkWSrqqmXQlh+RmYz0ooz98kctGIImSlTZl4HIJaJh6nN7 VYrg== 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=I6eWeHhDXQ8Dk1a3rU13BnGG9fZTkXy6cJScMSWpIeA=; b=wPFfWnmtq9FbbeWlmZjBdrWPWn1VstmcErSjbPeVvQpvSFUmAwtFm+HcY4trerSOwV oS2LzCx0rbye6vbLTvMEPd6k2nJpWD+qUl+JBwaBcq3arR05AvHjYmIl8YRLJS0+y0br +BNKc+Ivg0xW49lNms0PnhuItNrxnMGArYnDpeQ/NrviuuZkO9FX3jhaYM3zmqhsM/kq 02RZ9RdouXJgzmFIp7jsEJX/0RrG74SxqZcMG0EODDL4NHPaNZGM296HNEctVvYFR3Y2 pcwqWyT4jd5eqtlS6yqW5YGnWIEgeNeCRRWuK3t/lm139LK8rX0iWD6LtbFgip0O3UJp LNYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=JTSauNRt; 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 x21-20020aa79575000000b0062ae6345c6fsi4188918pfq.394.2023.04.14.07.57.15; Fri, 14 Apr 2023 07:57:28 -0700 (PDT) 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=JTSauNRt; 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 S231365AbjDNOsU (ORCPT + 99 others); Fri, 14 Apr 2023 10:48:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231235AbjDNOsC (ORCPT ); Fri, 14 Apr 2023 10:48:02 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 219639039; Fri, 14 Apr 2023 07:48:00 -0700 (PDT) Date: Fri, 14 Apr 2023 14:47:56 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1681483676; 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=I6eWeHhDXQ8Dk1a3rU13BnGG9fZTkXy6cJScMSWpIeA=; b=JTSauNRt4iuEP1B4h5wgsv4FOh5m2/ry3WiAReJL/aL+IOmfaKz8XhC2PVt6/taO7t4ugW iilMTMETwLm6rqYPVDDhMfF4JS4eHavZj7VUJ81/XwtQJG0UOo5WwUiRGBTTkk1fNoZ2JJ zDubjf0SDAgbm0dBM84RMMQpN1BIjEF3Gwwu8HJOfozJ1116P4/SAqJZ05ANmqmX/iojCa Oizb6IQ+ZeVk6rQpIBBrtcIMYL+I4sow2AY69tyMmERkF4QFz+fXBBxg+yMR/aaleXQK/U gSHDydcl1/wscuML71nQFGs/vZnjufPa3Xb36/Ap2cH+CohjHqL3vLXsMaehbw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1681483676; 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=I6eWeHhDXQ8Dk1a3rU13BnGG9fZTkXy6cJScMSWpIeA=; b=SwChvhsG1TkF2yK9BUAY42IEpjDy10h1C+L+c3zgt4PX+M6MITJlpq7fruPsUOvrXc+gAm xtuFBGNqROXeHICg== From: "tip-bot2 for Josh Poimboeuf" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/core] context_tracking: Fix KCSAN noinstr violation Cc: Josh Poimboeuf , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <168148367618.404.8910517787032335784.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,T_SCC_BODY_TEXT_LINE 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?1762994125983413474?= X-GMAIL-MSGID: =?utf-8?q?1763164027135483702?= The following commit has been merged into the objtool/core branch of tip: Commit-ID: e8deb00c0c4808654d1bf96a8f79cf1deb59b631 Gitweb: https://git.kernel.org/tip/e8deb00c0c4808654d1bf96a8f79cf1deb59b631 Author: Josh Poimboeuf AuthorDate: Wed, 12 Apr 2023 10:24:06 -07:00 Committer: Peter Zijlstra CommitterDate: Fri, 14 Apr 2023 16:08:27 +02:00 context_tracking: Fix KCSAN noinstr violation With KCSAN enabled, even empty inline stubs can be out-of-lined. Force the context_tracking_guest_exit() stub inline. Fixes the following warnings: vmlinux.o: warning: objtool: vmx_vcpu_enter_exit+0x1be: call to context_tracking_guest_exit() leaves .noinstr.text section vmlinux.o: warning: objtool: svm_vcpu_enter_exit+0x85: call to context_tracking_guest_exit() leaves .noinstr.text section Signed-off-by: Josh Poimboeuf Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/dc93f45abdec90c171108b4b590b7fff5790963c.1681320026.git.jpoimboe@kernel.org --- include/linux/context_tracking.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h index d4afa85..5ae3abd 100644 --- a/include/linux/context_tracking.h +++ b/include/linux/context_tracking.h @@ -97,7 +97,7 @@ static inline int exception_enter(void) { return 0; } static inline void exception_exit(enum ctx_state prev_ctx) { } static inline int ct_state(void) { return -1; } static __always_inline bool context_tracking_guest_enter(void) { return false; } -static inline void context_tracking_guest_exit(void) { } +static __always_inline void context_tracking_guest_exit(void) { } #define CT_WARN_ON(cond) do { } while (0) #endif /* !CONFIG_CONTEXT_TRACKING_USER */