From patchwork Sun Feb 26 00:01:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 61544 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1716533wrd; Sat, 25 Feb 2023 16:08:15 -0800 (PST) X-Google-Smtp-Source: AK7set/ShUa/y4dnXIVCF8uHNNkx3IV6AA784aJMA/gf4Qr7P5FfV3Q358sjyJgwEBls3yARH/ze X-Received: by 2002:a17:907:d27:b0:8e5:88ca:ebac with SMTP id gn39-20020a1709070d2700b008e588caebacmr21423258ejc.40.1677370095422; Sat, 25 Feb 2023 16:08:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677370095; cv=none; d=google.com; s=arc-20160816; b=NyzGyYSv8nfj1DJVrLLi7bPkH3Ibhv0evOPiOJQ7Z6Z8F2DL1SdzOaBGs4YjTOOkH6 YVUnK+oMvD56K3XgN3PLvvYAPIdZd6vN+At8w9iCvhst0bZl/lxvhIEYweeRywOUS6gW KKitPVSlrs9JpC8FfP83ScYkU6+kIH+3GJZupDpimS0n/lVxisraDkARBz1lFFjb8Wl/ v0dAyfquqtuP0sqWNFpc5JYDDfcfTH5RGB/Yu+16AuprQDSUj+kGDjfiPVRMkY1q63je MeVsm8IY8UFLaNp2p/nBlKae5rUtQf3IYiYnroAaEh0KHWYhrOBEb77PTiRyIhrXNYua 4iuQ== 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:dkim-signature; bh=TUZtp14G3xWRt+4Ruxv0iXzzQJxklLyeEw5JF6iVqT0=; b=ggNP1h+gz7NhJm5j5C2rqOrNJJoNlrC8mDwB0e+lZrzqzLRlzFqwP96jXJTUOdDQ77 rDzcUftMXbra8TLink56+AdA+cqXTk3qI89xwmEFjt9DkRC5TlXVGpV5awLACPOpvCp9 +4BCKcOrY3qT4I5Gt8sWG+RmNz98+WTiCOTI8jkQSExDR8zoEKbKkvpFpw0P4cSXcDRc RzQDUKmngQCYshLZ4N3ysla6BLJ0P0uRfC1zupzgwZGSQSyXMfSlAN6pt0hwU4SAAkir yQwaZ8kj6yCNw80EQH4R56YkgiC+JyXi7SIkZ1j5jM9EBMG47DYpaDo2YxpnAlaPFS45 muhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tCEOKJ8U; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z22-20020a1709060ad600b008c6691eecb6si3492409ejf.235.2023.02.25.16.07.52; Sat, 25 Feb 2023 16:08:15 -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=@kernel.org header.s=k20201202 header.b=tCEOKJ8U; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229589AbjBZABs (ORCPT + 99 others); Sat, 25 Feb 2023 19:01:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229489AbjBZABr (ORCPT ); Sat, 25 Feb 2023 19:01:47 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A41D813D7B for ; Sat, 25 Feb 2023 16:01:46 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 53D50B80B62 for ; Sun, 26 Feb 2023 00:01:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 815CDC433EF; Sun, 26 Feb 2023 00:01:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677369703; bh=eWj6PIOaCae4y8z9IQbNFV+J1m/e0EEztX9tQWxRspc=; h=From:To:Cc:Subject:Date:From; b=tCEOKJ8UPoF6+r0yC5w5nKqYONy5Pz8vioHFiiKzWyx/UNNcfeZPjt5RaCwVfAASk LrieXXyp0tu1aQUl3GukQEOS8sBjZH+JBzijTq9HsaUlKeP8VBHWmQgUj3RgWSk2l4 WOmHctB03WR9K7tYdMh7s0bIjx5pU5q6H4zuAK1teVbMUbOSTAX/q6+pWJHMLkdWuc ligk7fbyNj8BTx8J4U+wPunQAV5v3NRAwh90fwiLX4Z/D/NN6YXFgo890TBU2Rp3xa RKXqSBm7SWzh1PuvEATRqRU91ks34DUlroq2MPjArSs4dgsBEopXNw4NJiQLizxWwJ EXOp+/Xpuk3zQ== From: Josh Poimboeuf To: x86@kernel.org Cc: Peter Zijlstra , Thomas Gleixner , Frederic Weisbecker , "Paul E . McKenney" , Andy Lutomirski , linux-kernel@vger.kernel.org Subject: [PATCH] x86/entry: Fix noinstr warning in __enter_from_user_mode() Date: Sat, 25 Feb 2023 16:01:36 -0800 Message-Id: X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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?1758850025052043165?= X-GMAIL-MSGID: =?utf-8?q?1758850025052043165?= __enter_from_user_mode() is triggering noinstr warnings with CONFIG_DEBUG_PREEMPT due to its call of preempt_count_add() via ct_state(). The preemption disable isn't needed as interrupts are already disabled. And the context_tracking_enabled() check in ct_state() also isn't needed as that's already being done by the CT_WARN_ON(). Just use __ct_state() instead. Fixes the following warnings: vmlinux.o: warning: objtool: enter_from_user_mode+0xba: call to preempt_count_add() leaves .noinstr.text section vmlinux.o: warning: objtool: syscall_enter_from_user_mode+0xf9: call to preempt_count_add() leaves .noinstr.text section vmlinux.o: warning: objtool: syscall_enter_from_user_mode_prepare+0xc7: call to preempt_count_add() leaves .noinstr.text section vmlinux.o: warning: objtool: irqentry_enter_from_user_mode+0xba: call to preempt_count_add() leaves .noinstr.text section Fixes: 171476775d32 ("context_tracking: Convert state to atomic_t") Signed-off-by: Josh Poimboeuf --- include/linux/context_tracking.h | 1 + kernel/entry/common.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h index d4afa8508a80..3a7909ed5498 100644 --- a/include/linux/context_tracking.h +++ b/include/linux/context_tracking.h @@ -96,6 +96,7 @@ static inline void user_exit_irqoff(void) { } 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 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) { } #define CT_WARN_ON(cond) do { } while (0) diff --git a/kernel/entry/common.c b/kernel/entry/common.c index 846add8394c4..1314894d2efa 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -21,7 +21,7 @@ static __always_inline void __enter_from_user_mode(struct pt_regs *regs) arch_enter_from_user_mode(regs); lockdep_hardirqs_off(CALLER_ADDR0); - CT_WARN_ON(ct_state() != CONTEXT_USER); + CT_WARN_ON(__ct_state() != CONTEXT_USER); user_exit_irqoff(); instrumentation_begin();