From patchwork Sat Jan 7 11:38:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 40373 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1260390wrt; Sat, 7 Jan 2023 03:40:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXu6/emfVR419y9mpR/7rJ8S1759bxtmZZ3PWivJYJmMVOLuCYWsHnYmuVdJ6tAzeiSlC7+B X-Received: by 2002:a05:6a20:4e04:b0:9d:efbf:786a with SMTP id gk4-20020a056a204e0400b0009defbf786amr64948191pzb.31.1673091615397; Sat, 07 Jan 2023 03:40:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673091615; cv=none; d=google.com; s=arc-20160816; b=hy6aYG26o3AdquE34RVUARJXIMXrCdp1rXzHRUsH1X2js9Q3w87CanhhZvLfWtMNMA W39Equ6GegBfLLMQSMv3Ksmos8f8Elclnj3uu0Jr2xZ/LyUJd9KmulFplr28dJCVL3oP 9xE2oB3YzCNpmVUGXroV/o0blWIuamT33rT8R6xAG9GLZe7ZeKYRye79lDmy0IWN5vUW +hiGlLnsTD0Df4TX8T/jgY5vJWWfshA/dfoRVsC5VBE/PUa0Uj42ZEJVd5TQQmdDQUjl WBdw8qpBcb+6Y8+t7+MIKn1dnyFRB9MZWU8/Fjda9H1EmMwIAlLZyD2KIytYRYXIHieA Sw9w== 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=iC6gWaGYnHYnkhTWjOSE0v5lo+95QHq7/4zPMMP0EPEF2262hL/FIGtqB+X0zqR4RF 41rOZjjY487HSwcx503Fu1N6ogUaw3VV+k450cQvGIIWyovh3n9s6+300aA/EUNstfHl 9tYTrybfC5FAN/KWEGdVMtmqKkKsnUFK6GRp5R53KPN0B48JI2bVxpl342t8eLZXraJ5 WK/IXjJQ4IW5vmXkvMElCBU9mjV45zOLSq+J2CWKA/LSZtKqtw321VlRotKiLKebAIK+ D/hTaCbQxIp9mUb2hoU/KrFX1dtJL6qiy/UZQdfFITbbbc+NGJSays1N2yv5oZQMm5Bk 2Y+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=flxC7+Ly; 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 h9-20020a655189000000b0048205aae13esi3826947pgq.701.2023.01.07.03.40.02; Sat, 07 Jan 2023 03:40: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=flxC7+Ly; 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 S231819AbjAGLjM (ORCPT + 99 others); Sat, 7 Jan 2023 06:39:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231890AbjAGLjE (ORCPT ); Sat, 7 Jan 2023 06:39:04 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25E4C80622; Sat, 7 Jan 2023 03:39:02 -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 C2671B81F87; Sat, 7 Jan 2023 11:39:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8290CC43396; Sat, 7 Jan 2023 11:38:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673091539; bh=lEoTBcehc8n4upJA5LC+k+yiIJ7hxcNhFuHkvMT2WVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=flxC7+LyXLaW44yPqUILkPBrgh324rYKwjU49klA1Zw16+3ttA2DWDCir7CQYcIuF DfS6CKLtffD91W+IawxJDHvGxVD+NikpMTDNMmV0UTGbDkNqGUgNsovlQhcHtwg7Ts qrBe62DB61WjHGprTSZaGJXAbBDJ+n0yKqRajZ/ANYvNgjQTYfeSD98VZRjXPs7PyP jeaHYCX5MsVrvDMf1tZdU3kxs0zTDcpN4MY8a+fA5/t/hZEuH1J0bxTOf4MzjI5O/j AsGBPCp1eqFczgZJsUI9wPIqouvWN1+cy2540woKnM0tJRJjfyOSIm5SL52PHTOMfe 980GQQmp5gR5A== 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 V13 1/7] compiler_types.h: Add __noinstr_section() for noinstr Date: Sat, 7 Jan 2023 06:38:32 -0500 Message-Id: <20230107113838.3969149-2-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230107113838.3969149-1-guoren@kernel.org> References: <20230107113838.3969149-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?1754363713875825434?= X-GMAIL-MSGID: =?utf-8?q?1754363713875825434?= 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__ */