From patchwork Wed Apr 12 17:24:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 82613 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp507119vqo; Wed, 12 Apr 2023 10:56:57 -0700 (PDT) X-Google-Smtp-Source: AKy350byYD28rXzIjMi+2Oxo+zPpna3COm+vxOhZYmz2LacanMk2BsQSXUvRIqB46jSHBpRF0Uzm X-Received: by 2002:a17:907:1692:b0:91f:5845:4e3c with SMTP id hc18-20020a170907169200b0091f58454e3cmr3685446ejc.42.1681322217511; Wed, 12 Apr 2023 10:56:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681322217; cv=none; d=google.com; s=arc-20160816; b=0Y4849SBU+kdNz4HzdCOYMyutuwywwV0WYPIRGY712PUeNYXBpE1Cdz/U7sg/UMej4 f5E73T1MbI6kMoNSQMZFjSZUoXLh4HZ8k+eGiUStGc9BvBxXBERCpyrq5ZC8SZJl41mI WsXMwMF4LvILNg2u+KX/2q5scVKPjwgJwblUjV5fn7Q/M6WC7L8CcJNb+5C6vVa9sM1m 53zazNrKL8MUcL9Q2RRC9A6JafOjQ+IuuOH/4VJOQOKN4sNXy4oQqgvvG/MsfXa2a11S Q9ZHVSU5vNZ+xLokQq5IB+1PYSGJxYKa0fJwjdqMjuTSK7A7GR83PmwOhSLOdEzCAFT7 tM6Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Gpf7F49ycSxKEw7gwAQC44KI0PSs6wb5uJuT3v+bVTY=; b=DCDAYXCQQU/E0SOjEK8ZzVtQf7XMcAedbErTgexX+uNCyScoLDXfh3xm72rUSBbXOf ZV8h4JPk7+OJot6VE90Td1k5gMgZQqAmhsmTbsfIxY9O9f2cOkbWMDQoPjwzs8/kYlU7 7m8YK/wBGjybiU1ZRAvM5QLbjM3IMiYEJL3I2o+Nd+/ujppoO7TgeFcn8gM44Fko0Knr MImhseZsSkQC1LZiJM6+lVGt0Ahf2vtX9j8gsbIN9poMsLohlQMKKvVqsXp/UWPoP+e5 zQkR3mPYzxtFbRY1qeybyKplUgVnnnTaPkzhvwQS8Qaam0acQLbuiRFptzn7NUmO0iUr RCjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rFCA96UF; 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 o12-20020a170906974c00b0094e72d114cdsi1381780ejy.229.2023.04.12.10.56.31; Wed, 12 Apr 2023 10:56:57 -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=@kernel.org header.s=k20201202 header.b=rFCA96UF; 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 S231544AbjDLRYS (ORCPT + 99 others); Wed, 12 Apr 2023 13:24:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229638AbjDLRYQ (ORCPT ); Wed, 12 Apr 2023 13:24:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 933FE1BE4 for ; Wed, 12 Apr 2023 10:24:15 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 2EDDB631A2 for ; Wed, 12 Apr 2023 17:24:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4965DC433A1; Wed, 12 Apr 2023 17:24:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681320254; bh=yZE3NaZNWGex7AsabXWKzco4PSx2Xxsuc1liFr6+lK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rFCA96UFwB7JCZC7odAG2lpfvCiX8M3sewQ1lShv0FAI3+MNVHqaX0W1BDBo8Kb7E 0IpsEtpCXVH1vazJj1HTAN4sdg63WbLJVv4jTNRaaZMIujhZY4A3rEDLhbTWvPUGhK xMcFecgN+MkYpu7qjz9m5beWzFPIbCjZwdAy282+/v/c4ZM1IqjVptDsEuqj4/EfnX E/jfiWgXL3Mnaa30JRfcKvhM4GP//PgXaEktaB8nG8xmBhAFxXUsmhVpEsAoIlK1eY tJl4n9rb2EvZSCLauXSmGaf5j6+wH+9Y5s+YWICWGCsDQdsuLNHDdsHhrTO3hijVkf HmFIUWOZ5sDZA== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , frederic@kernel.org, paulmck@kernel.org, keescook@chromium.org Subject: [PATCH 1/3] context_tracking: Fix KCSAN noinstr violation Date: Wed, 12 Apr 2023 10:24:06 -0700 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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?1762994125983413474?= X-GMAIL-MSGID: =?utf-8?q?1762994125983413474?= 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 Acked-by: Frederic Weisbecker --- 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 d4afa8508a80..5ae3abd767b4 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 */