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;