From patchwork Tue Jan 3 03:35:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 38254 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4422159wrt; Mon, 2 Jan 2023 19:37:38 -0800 (PST) X-Google-Smtp-Source: AMrXdXtRg89ieiLrQREHWgUnxuBx4iNO9n1+KjLRkQYCfv19vWegyNfmYggQP2/ndDA1EwF6j5Y7 X-Received: by 2002:a17:906:171b:b0:7e8:ced8:cb9b with SMTP id c27-20020a170906171b00b007e8ced8cb9bmr36294950eje.42.1672717058222; Mon, 02 Jan 2023 19:37:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672717058; cv=none; d=google.com; s=arc-20160816; b=yGS46qnyUoZmOTNM48VfSe/4AuqBxY67mMAp3Igqx7gYtP/JLIuqqrjVJwWVOw7T3+ qKrWZ7npEcUTzeyK/1rCTny3Z3BxtF3wG4BeJEERf+QOW5/ypXaWqx9kmqi90u+g6xhS Cq7RcffObqUEozKzEurCD4RNqkFi0Vwc9EzZqFHvafI2q3qkZXgvituhRsC55+Tsgyfy H/wNigY9UnzCaNrCWKPiXQR1nnpiLysk6kqr35vmt1tQphcUu6n23hcV8wF5EdzA3jqg pSRiHWq1ikMEWsS1G6/sdpxRZNOAdNkAWPqA8JyixuxQ29nuQ3FC3Fbj1uQZOqXXyfUi X2kw== 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=882N5kPyz5Iu3B048L5CJXSWFwyMUDkDVuR5YzqG7H4=; b=r9Jr8Wj9EFwJt3qdpmqMmLhg95RaeX+LwR2Sm0McqdpYSm9e8Jw04XTAZKpi2z2oYi m7I8QUX8ji/w3Kfk2gUhVECpcLlf/2ZQr059Jxd6QN+iGfD7yyMmDK0J/zyfdPYlJPD4 oPG2T2uLesW/sV47p6RnXTdC0muwQx6a4HoG0s1q1b0hC3iNOwfdMZOmFeaHw3Owa1Xm szaU4nOPDa5LbhXRPOHBV1QkvnVHGH9WibjXDZHzGT3hyY+PtYxeWmXlO7uwwqvCb6ZW bPN4yUqHzK/fcfO6zsInbr2spKBYsRF31WV1H8E8Pt6T31OGjvKK6P9+myDDuFKdbCR9 dcqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=g5R6R51S; 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 ww11-20020a170907084b00b0084cbde35b15si6653471ejb.851.2023.01.02.19.37.14; Mon, 02 Jan 2023 19:37:38 -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=g5R6R51S; 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 S236662AbjACDgO (ORCPT + 99 others); Mon, 2 Jan 2023 22:36:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236668AbjACDgH (ORCPT ); Mon, 2 Jan 2023 22:36:07 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C525A0; Mon, 2 Jan 2023 19:36:06 -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 dfw.source.kernel.org (Postfix) with ESMTPS id CCB196111D; Tue, 3 Jan 2023 03:36:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4BEE4C433D2; Tue, 3 Jan 2023 03:35:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672716965; bh=lEoTBcehc8n4upJA5LC+k+yiIJ7hxcNhFuHkvMT2WVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g5R6R51S8vTIQZTbJmn6EPyaHMNKJ8uY3hhdGcagYQ81rAeUxH960BR+FKDAhHqsL MdItJ+MgXXsQF05vl1p+yltUj4+6/yPoPUB+iMWNdkyQYPx2cJaGoAUueSm2ZXlwIS uTlPYMqSSlk4e9t5zkyBrjDhYM58apefdb3k0JlIV2YfMtVPxmwytcYCshFibY+ikA kHlS97mEuN9/0b50fhAxtXlIFy+gLgseoxUP4zfVGlC9z3BATLpgMxsyF4ufXmAvDa 40QsqFK12B5Oz+89lJHWYF86VsMf5Pk/7sDDBTxeRn+fnHETVhEIP7wG+wRSTxudc8 M97VmsL7ZAeQw== From: guoren@kernel.org To: arnd@arndb.de, guoren@kernel.org, palmer@rivosinc.com, tglx@linutronix.de, peterz@infradead.org, luto@kernel.org, conor.dooley@microchip.com, heiko@sntech.de, jszhang@kernel.org, lazyparser@gmail.com, falcon@tinylab.org, chenhuacai@kernel.org, apatel@ventanamicro.com, atishp@atishpatra.org, mark.rutland@arm.com, ben@decadent.org.uk, bjorn@kernel.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Lai Jiangshan , Borislav Petkov , Miguel Ojeda , Kees Cook , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Nick Desaulniers Subject: [PATCH -next V12 1/7] compiler_types.h: Add __noinstr_section() for noinstr Date: Mon, 2 Jan 2023 22:35:25 -0500 Message-Id: <20230103033531.2011112-2-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230103033531.2011112-1-guoren@kernel.org> References: <20230103033531.2011112-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1753970962082347559?= X-GMAIL-MSGID: =?utf-8?q?1753970962082347559?= From: Lai Jiangshan Using __noinstr_section() doesn't automatically disable all instrumentations on the section. Inhibition for some instrumentations requires extra code. I.E. KPROBES explicitly avoids instrumenting on .noinstr.text. Cc: Borislav Petkov Reviewed-by: Miguel Ojeda Reviewed-by: Kees Cook Reviewed-by: Björn Töpel Suggested-by: Nick Desaulniers Suggested-by: Peter Zijlstra Tested-by: Jisheng Zhang Tested-by: Guo Ren Signed-off-by: Guo Ren Signed-off-by: Lai Jiangshan --- include/linux/compiler_types.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index 7c1afe0f4129..0a2ca5755be7 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -231,12 +231,19 @@ struct ftrace_likely_data { #define __no_sanitize_or_inline __always_inline #endif -/* Section for code which can't be instrumented at all */ -#define noinstr \ - noinline notrace __attribute((__section__(".noinstr.text"))) \ - __no_kcsan __no_sanitize_address __no_profile __no_sanitize_coverage \ +/* + * Using __noinstr_section() doesn't automatically disable all instrumentations + * on the section. Inhibition for some instrumentations requires extra code. + * I.E. KPROBES explicitly avoids instrumenting on .noinstr.text. + */ +#define __noinstr_section(section) \ + noinline notrace __section(section) __no_profile \ + __no_kcsan __no_sanitize_address __no_sanitize_coverage \ __no_sanitize_memory +/* Section for code which can't be instrumented at all */ +#define noinstr __noinstr_section(".noinstr.text") + #endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */