From patchwork Sat Feb 18 21:14:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgecombe, Rick P" X-Patchwork-Id: 59020 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp556162wrn; Sat, 18 Feb 2023 13:23:22 -0800 (PST) X-Google-Smtp-Source: AK7set+N0nQhG+3NaRhzJDNsKBfdZ6+O3R6bEQBpSlgPF2sACpxs7N06KutDeRZirb5JGsPNuQQm X-Received: by 2002:a17:902:f693:b0:19a:80e6:2a1d with SMTP id l19-20020a170902f69300b0019a80e62a1dmr3425922plg.41.1676755402187; Sat, 18 Feb 2023 13:23:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676755402; cv=none; d=google.com; s=arc-20160816; b=uN4tqjQ+e1LpYO7bI1Ip9rYYo10WHZPpBqDUtvAssBRvBVqtkH9xuONVzn2vAX88i4 X9NiC8qJN0DE3WDZQRPtrgWuOL9N8i/TSOV3/HxBcFpJ5lQyrgjjfY3pEecI9Igzk05p +bAxkEoMhB8LTbxo6b+mETTCQ09XwnCF7Px8dbojkowamKh3kgq+/Sg20v9YOhJYHb6j pRmjFMnXi/E50Ba5wi+sNF0RFPVL4B9mt7B4rdQlrCDYjG+blDpo0ILT/U8ofdgz1NIc EofYSGKNSVKWLrQxb8oE7XUSQBq9VLO0EsQKt6TONrp6qWaz1Y8sJi0/SwMf/N7l2RFk nY9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=9GGr4I/3LFReBSYqcfJoP1HVRW9+H5YST8fr63qrVPw=; b=RxttUSluPMiDl4cFc7IRqHSlBeMV1RpC79VZI2u+wZsWsV2wDaEEcGrYauE8YeQKWv tZ4nl1jdf/cx0BauUtnoad4eJ+YNxyTj7ATgs9AWm3wP1Dzrqo1tJUmzB0+K506+ePZq v/iMfilaw6H6xLbsVXLZozT/faWFDbdJ8LIf4v2GKP2GW4HpSO9PRF2ygmv/vCgwq3+q ZNKwzvw9KQyj+YxNh0qtjzGTQ0TSvivQ/2zAAhqOpszxCuJst8tj9GXssT5z584KN2Mb eMzPc2QQ8jVmpWEzmBtMgKim+HghSe2cArb3GdGJ6/11/OAYdfO1IaYKNjCido/mgxlq a5Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ldeR68we; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k9-20020a170902c40900b001963440c24bsi5191275plk.254.2023.02.18.13.23.09; Sat, 18 Feb 2023 13:23:22 -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=@intel.com header.s=Intel header.b=ldeR68we; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230234AbjBRVWl (ORCPT + 99 others); Sat, 18 Feb 2023 16:22:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230224AbjBRVVm (ORCPT ); Sat, 18 Feb 2023 16:21:42 -0500 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 855291ABFA; Sat, 18 Feb 2023 13:19:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676755141; x=1708291141; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=rLqhRE2d5TzXO0jkrIimoFvYNyWSmS33HBbaA6qKIFg=; b=ldeR68weXIcb+J89Eq2jW5P7X2+SGIfjb32yverMoC48smSUv8D09qtK 5e8asO42UHfkSGP26LtgdXEEp49HQwpXWTEdrIK90sLF7n4PIq+4HW1Xa 4fGPx2ObWr/YpXNB9E/9S1NcjkJg/PfgRd3o7+r7ue7fz7SDBpm3bcF3O TxNnaNLFijoB8pL27ccttV5Uxuj27CdD8HMywqqU88RzvEPs2zlnH25Gz OCS2RO55i2hIbUzCE8v8ZZeGfMf0CWzXjtRmu34Bj/7ZLZ+KFj98XM1rc fEeuv2VmS1GhtUsi3KgduqWy1ObkQHlU27jNOcHtcv5wbOdPvsXDyYoE8 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10625"; a="418427849" X-IronPort-AV: E=Sophos;i="5.97,309,1669104000"; d="scan'208";a="418427849" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2023 13:16:25 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10625"; a="664241739" X-IronPort-AV: E=Sophos;i="5.97,309,1669104000"; d="scan'208";a="664241739" Received: from adityava-mobl1.amr.corp.intel.com (HELO rpedgeco-desk.amr.corp.intel.com) ([10.209.80.223]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2023 13:16:24 -0800 From: Rick Edgecombe To: x86@kernel.org, "H . Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H . J . Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , Weijiang Yang , "Kirill A . Shutemov" , John Allen , kcc@google.com, eranian@google.com, rppt@kernel.org, jamorris@linux.microsoft.com, dethoma@microsoft.com, akpm@linux-foundation.org, Andrew.Cooper3@citrix.com, christina.schimpe@intel.com, david@redhat.com, debug@rivosinc.com Cc: rick.p.edgecombe@intel.com Subject: [PATCH v6 35/41] x86: Expose thread features in /proc/$PID/status Date: Sat, 18 Feb 2023 13:14:27 -0800 Message-Id: <20230218211433.26859-36-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230218211433.26859-1-rick.p.edgecombe@intel.com> References: <20230218211433.26859-1-rick.p.edgecombe@intel.com> 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_NONE 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?1758205472219010441?= X-GMAIL-MSGID: =?utf-8?q?1758205472219010441?= Applications and loaders can have logic to decide whether to enable shadow stack. They usually don't report whether shadow stack has been enabled or not, so there is no way to verify whether an application actually is protected by shadow stack. Add two lines in /proc/$PID/status to report enabled and locked features. Since, this involves referring to arch specific defines in asm/prctl.h, implement an arch breakout to emit the feature lines. Reviewed-by: Kees Cook Tested-by: Pengfei Xu Tested-by: John Allen Signed-off-by: Kirill A. Shutemov [Switched to CET, added to commit log] Signed-off-by: Rick Edgecombe --- v4: - Remove "CET" references v3: - Move to /proc/pid/status (Kees) v2: - New patch --- arch/x86/kernel/cpu/proc.c | 23 +++++++++++++++++++++++ fs/proc/array.c | 6 ++++++ include/linux/proc_fs.h | 2 ++ 3 files changed, 31 insertions(+) diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c index 099b6f0d96bd..31c0e68f6227 100644 --- a/arch/x86/kernel/cpu/proc.c +++ b/arch/x86/kernel/cpu/proc.c @@ -4,6 +4,8 @@ #include #include #include +#include +#include #include "cpu.h" @@ -175,3 +177,24 @@ const struct seq_operations cpuinfo_op = { .stop = c_stop, .show = show_cpuinfo, }; + +#ifdef CONFIG_X86_USER_SHADOW_STACK +static void dump_x86_features(struct seq_file *m, unsigned long features) +{ + if (features & ARCH_SHSTK_SHSTK) + seq_puts(m, "shstk "); + if (features & ARCH_SHSTK_WRSS) + seq_puts(m, "wrss "); +} + +void arch_proc_pid_thread_features(struct seq_file *m, struct task_struct *task) +{ + seq_puts(m, "x86_Thread_features:\t"); + dump_x86_features(m, task->thread.features); + seq_putc(m, '\n'); + + seq_puts(m, "x86_Thread_features_locked:\t"); + dump_x86_features(m, task->thread.features_locked); + seq_putc(m, '\n'); +} +#endif /* CONFIG_X86_USER_SHADOW_STACK */ diff --git a/fs/proc/array.c b/fs/proc/array.c index 49283b8103c7..7ac43ecda1c2 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -428,6 +428,11 @@ static inline void task_thp_status(struct seq_file *m, struct mm_struct *mm) seq_printf(m, "THP_enabled:\t%d\n", thp_enabled); } +__weak void arch_proc_pid_thread_features(struct seq_file *m, + struct task_struct *task) +{ +} + int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task) { @@ -451,6 +456,7 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, task_cpus_allowed(m, task); cpuset_task_status_allowed(m, task); task_context_switch_counts(m, task); + arch_proc_pid_thread_features(m, task); return 0; } diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 0260f5ea98fe..80ff8e533cbd 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -158,6 +158,8 @@ int proc_pid_arch_status(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task); #endif /* CONFIG_PROC_PID_ARCH_STATUS */ +void arch_proc_pid_thread_features(struct seq_file *m, struct task_struct *task); + #else /* CONFIG_PROC_FS */ static inline void proc_root_init(void)