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 */ From patchwork Wed Apr 12 17:24:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 82609 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp497580vqo; Wed, 12 Apr 2023 10:37:28 -0700 (PDT) X-Google-Smtp-Source: AKy350ZFpKEGNaAdsm+M89/AubbAjSygOE/OKQ5CTJHnWV3TIzE1qYySZ12lUVkbP6zC45CtpKTS X-Received: by 2002:a05:6402:3ce:b0:504:8c6a:2eb2 with SMTP id t14-20020a05640203ce00b005048c6a2eb2mr13209436edw.29.1681321048434; Wed, 12 Apr 2023 10:37:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681321048; cv=none; d=google.com; s=arc-20160816; b=dM8xCV84NEcDJB0J5XS5bN5ozT8ukvh7omBI+GBjxpEQohhOIPlATlpHT8gDTMyMGd gpmC523nFNRSAI6x82ik8SEGSb8l3fMPY5JRPiT/NMyeqHn7VpuMYagcgJ283+XVsrbw 0At48Qjl8SQuTM831pavUwoMQpa62mZVuPAO6SbJTbikWUAYhsC+X2AuHYkMxAN5GVh9 5vEZIrMEbsSFxzJwYCrhh46vlmLA4kwp9STVb4hXMFR2d0yJF3U9Q7Sl3AOxTdOQSX1C 7BKDXf7hRr8Q/Dtd+Gu1BTBVIzIlBLxAl1PFIOr1m/hHVAUE+7MmbGwkKwnOlc7u+x0w f12A== 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=eDsJKP/nGXpuhW2laNrTf89QCVE2yIjy2OL7YXFWnIU=; b=bn0LfmynJjqjUoV52dQ7u1vs0xB+0TK78b9akRtKSwnPxXPUsUzOk8EsgbE/1otnir 3tMEXwNOpZkbwVDBsMAnNcg1NNPzrgljlU6kjN77zJcn0HM8+JwlId/3uW+6BQ/sgn6H 563I8y7CzhmwM9SUkc9ByXnvgf2HUhHIzQHli6IOnHDkOoLTJ0XW+A1RLjIUawUOoxLb 1F17QIF8lc9et2aJnWDbdSz76QENZRCW/F8v6cSoATElS2mpaCOKKyYzvaZjUl4ciwon Brphz/7BBodBYF24pKsgh3wEENbrXXKh8sHCndPzBuWLEi93D0PMn5oLyIU9RkW+1Iv5 SgFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="S/0lStm0"; 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 p1-20020a056402044100b005049b859721si2523419edw.49.2023.04.12.10.37.03; Wed, 12 Apr 2023 10:37: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=@kernel.org header.s=k20201202 header.b="S/0lStm0"; 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 S230214AbjDLRYU (ORCPT + 99 others); Wed, 12 Apr 2023 13:24:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231252AbjDLRYQ (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 EFFD31726 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 869B1637CC for ; Wed, 12 Apr 2023 17:24:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD300C433AA; 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=1681320255; bh=40bQAl7b9ZRfFX150jDT4Y2Aky1kTJSd3vkEWMdjKys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S/0lStm0fcgmo7O/BpzPF+J6qdMt8uKX4RF6V6vpfoaXb28wNlJpphDYIJwnLZtem 830qJt9OGn8zMRl6slScF7ONK1esfYPEC9AgaWjmtsi382hw+NCQImblNHRZkpPUlT wJ+Y9/2sxgvNV410VG6bCPzmeWZikIbM7Boa+mzaDr54jzqgsEXsp8PKaIn3GiZHkt MPywY/uh5qZy74BxqlE/9gR2cCXW7VIdOCM0gzTr165TeeJeWCvZt+Jrd/JL6u+0/L vk/Uxq4XkTkmmoqHWZjYa3rDWOiQQnU4Ft2WzZybBMap0d2sUM+4aSq1TfnV8cB1T2 0xxIuoj3/ujYA== 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 2/3] sched: Fix KCSAN noinstr violation Date: Wed, 12 Apr 2023 10:24:07 -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?1762992899540074210?= X-GMAIL-MSGID: =?utf-8?q?1762992899540074210?= With KCSAN enabled, end_of_stack() can get out-of-lined. Force it inline. Fixes the following warnings: vmlinux.o: warning: objtool: check_stackleak_irqoff+0x2b: call to end_of_stack() leaves .noinstr.text section Signed-off-by: Josh Poimboeuf --- include/linux/sched/task_stack.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/sched/task_stack.h b/include/linux/sched/task_stack.h index 5e799a47431e..f158b025c175 100644 --- a/include/linux/sched/task_stack.h +++ b/include/linux/sched/task_stack.h @@ -23,7 +23,7 @@ static __always_inline void *task_stack_page(const struct task_struct *task) #define setup_thread_stack(new,old) do { } while(0) -static inline unsigned long *end_of_stack(const struct task_struct *task) +static __always_inline unsigned long *end_of_stack(const struct task_struct *task) { #ifdef CONFIG_STACK_GROWSUP return (unsigned long *)((unsigned long)task->stack + THREAD_SIZE) - 1; From patchwork Wed Apr 12 17:24:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 82612 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp506170vqo; Wed, 12 Apr 2023 10:54:48 -0700 (PDT) X-Google-Smtp-Source: AKy350ajtwADy176Wmirhu/fPSPKJo2f9qEJ+qDBiDkhk3rSAWhuPnEe+7fSPd5TTbhCFUoeZ+pa X-Received: by 2002:a17:907:6e28:b0:94e:79c2:5e18 with SMTP id sd40-20020a1709076e2800b0094e79c25e18mr1908116ejc.38.1681322087845; Wed, 12 Apr 2023 10:54:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681322087; cv=none; d=google.com; s=arc-20160816; b=uni+iRJ+IXU9EkcaDVGI5cV1IuKmtgnZ9ORFy1/KeRI5IXagoO02kwYvrBItjJ6BLC oTIl7uI49Il5U8wq/ywR7EKOTOYgFbmD+sbmpCUwjd8yjS65QqGjZdJX/4o0hXQ/YUSQ AOPJxOkPN2RXZIG12zXKrhTypS/Wr7hoLI3X3ytpAZJ15d4FcnvcMsiRLKZOnZ6tWbMk CJWKGReg9Dx/7KFtR2IqI2KLTQ1PQrhXQMWjTzH2UgQZD/4PvdezHmrdl0bzCtuVevSr zkQex0HhMSSgzJYeBAbBjCVGt8yK8+8b38T6ip2oilNr8Si7YoN1iGlQPzeOe3pmIrNp jCXQ== 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=xZUn6yIelm7/HpU/gOGoZM0sTrX0C4pbQI9VlLTYDdo=; b=uDl7OUUucxio5U8rJ3gBTJJjp6ufH4Da9l3RmFUrnkeEgQsD/Xma3lj4LpsEA0IMwV ir6MI85jk3FoJhh8Rf87mzDDYbSu1JocRGdnunv84zozSXKabCDTsTJj8v+qwgG8D4Ps EkeS82mIEEujZ2+umBT85vKY/0I1qx9Krd4NTsGuB4SWz0qgYuTNHx/9gbHuVNRwQwJK ZH3+d0/HASDtgt9bOESAn4qTYa4L14MEh0Ed664G+n46Y/MBgekMEDEXpRq4uQS1B81K O9GN9POQMq0TnAV5VtRw+la/nyxfLimc4/BoC0ERr9tXr9jbQipMvF9xG6n0Pbbblkd4 LPCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sLf47uQl; 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 gs32-20020a1709072d2000b0094bd6195ccasi2042682ejc.531.2023.04.12.10.54.18; Wed, 12 Apr 2023 10:54:47 -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=sLf47uQl; 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 S231567AbjDLRYX (ORCPT + 99 others); Wed, 12 Apr 2023 13:24:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231363AbjDLRYR (ORCPT ); Wed, 12 Apr 2023 13:24:17 -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 56CC82729 for ; Wed, 12 Apr 2023 10:24:16 -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 E9718637C7 for ; Wed, 12 Apr 2023 17:24:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D88BC433AC; Wed, 12 Apr 2023 17:24:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681320255; bh=PX0fLdA8IAgbJJ5QVSIRQQaQAaqC5FcGk2sQ9w9igC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sLf47uQlDla37yzgOud/SwN71Lt30pJA4qAFFnzDAKXVX0/sUQWPIokzGctf7H+Nr HLxKShf6gkXywWFkR/i+LRfOe7kBTA6N04AajQUkt75OBc06A6K2qI6Nk3bP4mVdt/ aqtrJstMoGUvx9VoFw6l8mbtfnK52TydAaBs8x8Lf1uhwBIoGR9ZLDJCkbk+4QYivf N93ofL4lqufBXhrjjH6VDbQWEX1ZS3HPbVIEhtHBj+CD1qPEb7wz+Ty1i0kwyM39Hc 8wLHf9DbVMCSLTKrnO3SVZVWrHw4YmOxmTomZzQzTYvZP1c35ojwGEA6G3CxDLm5ng QltscOTPrno3A== 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 3/3] lkdtm/stackleak: Fix noinstr violation Date: Wed, 12 Apr 2023 10:24:08 -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?1762993989490696456?= X-GMAIL-MSGID: =?utf-8?q?1762993989490696456?= Fixes the following warning: vmlinux.o: warning: objtool: check_stackleak_irqoff+0x2b6: call to _printk() leaves .noinstr.text section Signed-off-by: Josh Poimboeuf --- drivers/misc/lkdtm/stackleak.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/misc/lkdtm/stackleak.c b/drivers/misc/lkdtm/stackleak.c index 025b133297a6..f1d022160913 100644 --- a/drivers/misc/lkdtm/stackleak.c +++ b/drivers/misc/lkdtm/stackleak.c @@ -43,12 +43,14 @@ static void noinstr check_stackleak_irqoff(void) * STACK_END_MAGIC, and in either casee something is seriously wrong. */ if (current_sp < task_stack_low || current_sp >= task_stack_high) { + instrumentation_begin(); pr_err("FAIL: current_stack_pointer (0x%lx) outside of task stack bounds [0x%lx..0x%lx]\n", current_sp, task_stack_low, task_stack_high - 1); test_failed = true; goto out; } if (lowest_sp < task_stack_low || lowest_sp >= task_stack_high) { + instrumentation_begin(); pr_err("FAIL: current->lowest_stack (0x%lx) outside of task stack bounds [0x%lx..0x%lx]\n", lowest_sp, task_stack_low, task_stack_high - 1); test_failed = true; @@ -86,11 +88,14 @@ static void noinstr check_stackleak_irqoff(void) if (*(unsigned long *)poison_low == STACKLEAK_POISON) continue; + instrumentation_begin(); pr_err("FAIL: non-poison value %lu bytes below poison boundary: 0x%lx\n", poison_high - poison_low, *(unsigned long *)poison_low); test_failed = true; + goto out; } + instrumentation_begin(); pr_info("stackleak stack usage:\n" " high offset: %lu bytes\n" " current: %lu bytes\n" @@ -113,6 +118,7 @@ static void noinstr check_stackleak_irqoff(void) } else { pr_info("OK: the rest of the thread stack is properly erased\n"); } + instrumentation_end(); } static void lkdtm_STACKLEAK_ERASING(void)