From patchwork Fri Nov 4 22:36:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgecombe, Rick P" X-Patchwork-Id: 15852 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp683332wru; Fri, 4 Nov 2022 15:53:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4prrhUTtoRlLkQ7vCQr4fkKp6BkieyBB4zkiZX5O77UoGx8vxUNgMq3i7Xb1ebN8xM4dnX X-Received: by 2002:aa7:9565:0:b0:56c:8860:bce1 with SMTP id x5-20020aa79565000000b0056c8860bce1mr37501264pfq.31.1667602382986; Fri, 04 Nov 2022 15:53:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667602382; cv=none; d=google.com; s=arc-20160816; b=UjkiRwraFPxt8DJc68nfYTBq+PWe5LtNaEUMUEiEZC23cW/lXr62Uyj8azN+jcZyYz DUs4kavXtYExuH2ziufKhcs90gDq0fCJTo2gF/FOJDBc3P5LKsi/iNDH+c8ZO4xcoDZe Tbe+eEOOMu/qnP4nZ447d9Lq3+iyW+ficr1kw1uTJCk5eJi2hiDZwi5Nh7wmZ65mhibx 1N7C/2bJo/3Gy1HmTyXw4kHaI6SU905goQAoDy1sQOD/R3N41xPDUlFMZ+AwzHBKlvSp f2WSXWZMcfoCFKGNncdWOOzhdP0AWrgGrj9/jO7RUtE10bKR9UqydjEkKNH7gCRRNHdA 6liQ== 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=4DbhJGL2YfsIhJmqdbV0qT0hHBtBUjxUx75J/ln81gM=; b=VnEUcG2X9JBl+VJ8UzdYObE76BvMgVeulUEmUnon6wUCBkoHpksb34ApjbiJElNbDG Y1DhVRuMSUrm6oC7jrlGCoqHoO+q9K0log5H91S42JUi31hvcAEBViKV8rGLrx3wL1Un Y4jZWpRVyq6pDYVz5xDRVz6D4vBo9YyEzxjP8vIpEKMTYMleovREcgVL4Y0IUndkGKGB YPYoXoNkhX3ql8M6zVskI+iY8feEjwtDN+HXpjg4G5D1STroDlRi8mlSkdlppqlpPS0c ZxLCScTGHvyXMPaxlUmEns2fW+VEDWq9zcWLFnLLBN6qBmVw3CgoS1eiswl1oNwhDJxc GHWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=def8mlvq; 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 l191-20020a6391c8000000b0046ec9ae4a2esi926171pge.31.2022.11.04.15.52.47; Fri, 04 Nov 2022 15:53:02 -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=@intel.com header.s=Intel header.b=def8mlvq; 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 S230173AbiKDWqZ (ORCPT + 99 others); Fri, 4 Nov 2022 18:46:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230354AbiKDWpb (ORCPT ); Fri, 4 Nov 2022 18:45:31 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE37612126F; Fri, 4 Nov 2022 15:40:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667601658; x=1699137658; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=mTDZ+f4KdYSqV9q+619GLZ5q/2YYY0xPkbFAnS8RyTs=; b=def8mlvqYPnYhc3nOZcvqfNWaA1k1m8BtlQQAr+YKbLlUqkbYUNrs2tO aN5yrwy65XdbOg+tEpabzei3ae/cJctLJUhxgyewZbEmAS5SszEh96WhH /8/skaDavFapsTWE0VP6JJXas5ADW3P/csS9viip+v+DTjE/jix0cX7Zh eSJc6HGVtQBEA+CWU2mtXCb2s+ugRFGHZ/I/jhBX1DtRjGR8SQ6xn4hr3 54LBW0R5CzMmHcbOCHdVnulJf5lCRrei6BH6zE0I9KZWwJVEZ8dGEQg9S uEenIOsZ1wqhqbF7JP1v/RmgK0BsgDuzbpksvAZMKxnXZw9Asyd8uhzCF g==; X-IronPort-AV: E=McAfee;i="6500,9779,10521"; a="311840633" X-IronPort-AV: E=Sophos;i="5.96,138,1665471600"; d="scan'208";a="311840633" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Nov 2022 15:39:55 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10521"; a="668514181" X-IronPort-AV: E=Sophos;i="5.96,138,1665471600"; d="scan'208";a="668514181" Received: from adhjerms-mobl1.amr.corp.intel.com (HELO rpedgeco-desk.amr.corp.intel.com) ([10.212.227.68]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Nov 2022 15:39:54 -0700 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 , "Ravi V . Shankar" , 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 Cc: rick.p.edgecombe@intel.com, Mike Rapoport Subject: [PATCH v3 36/37] x86/cet/shstk: Add ARCH_CET_UNLOCK Date: Fri, 4 Nov 2022 15:36:03 -0700 Message-Id: <20221104223604.29615-37-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221104223604.29615-1-rick.p.edgecombe@intel.com> References: <20221104223604.29615-1-rick.p.edgecombe@intel.com> X-Spam-Status: No, score=-5.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?1748607836314970506?= X-GMAIL-MSGID: =?utf-8?q?1748607836314970506?= From: Mike Rapoport Userspace loaders may lock features before a CRIU restore operation has the chance to set them to whatever state is required by the process being restored. Allow a way for CRIU to unlock features. Add it as an arch_prctl() like the other CET operations, but restrict it being called by the ptrace arch_pctl() interface. Tested-by: Pengfei Xu Tested-by: John Allen Signed-off-by: Mike Rapoport [Merged into recent API changes, added commit log and docs] Signed-off-by: Rick Edgecombe --- v3: - Depend on CONFIG_CHECKPOINT_RESTORE (Kees) Documentation/x86/cet.rst | 4 ++++ arch/x86/include/uapi/asm/prctl.h | 1 + arch/x86/kernel/process_64.c | 1 + arch/x86/kernel/shstk.c | 9 +++++++-- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Documentation/x86/cet.rst b/Documentation/x86/cet.rst index b56811566531..f69cafb1feff 100644 --- a/Documentation/x86/cet.rst +++ b/Documentation/x86/cet.rst @@ -66,6 +66,10 @@ arch_prctl(ARCH_CET_LOCK, unsigned int features) are ignored. The mask is ORed with the existing value. So any feature bits set here cannot be enabled or disabled afterwards. +arch_prctl(ARCH_CET_UNLOCK, unsigned int features) + Unlock features. 'features' is a mask of all features to unlock. All + bits set are processed, unset bits are ignored. + The return values are as following: On success, return 0. On error, errno can be:: diff --git a/arch/x86/include/uapi/asm/prctl.h b/arch/x86/include/uapi/asm/prctl.h index 5f1d3181e4a1..0c37fd0ad8d9 100644 --- a/arch/x86/include/uapi/asm/prctl.h +++ b/arch/x86/include/uapi/asm/prctl.h @@ -25,6 +25,7 @@ #define ARCH_CET_ENABLE 0x5001 #define ARCH_CET_DISABLE 0x5002 #define ARCH_CET_LOCK 0x5003 +#define ARCH_CET_UNLOCK 0x5004 /* ARCH_CET_ features bits */ #define CET_SHSTK (1ULL << 0) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 17fec059317c..03bc16c9cc19 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -835,6 +835,7 @@ long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2) case ARCH_CET_ENABLE: case ARCH_CET_DISABLE: case ARCH_CET_LOCK: + case ARCH_CET_UNLOCK: return cet_prctl(task, option, arg2); default: ret = -EINVAL; diff --git a/arch/x86/kernel/shstk.c b/arch/x86/kernel/shstk.c index 71620b77a654..bed7032d35f2 100644 --- a/arch/x86/kernel/shstk.c +++ b/arch/x86/kernel/shstk.c @@ -450,9 +450,14 @@ long cet_prctl(struct task_struct *task, int option, unsigned long features) return 0; } - /* Don't allow via ptrace */ - if (task != current) + /* Only allow via ptrace */ + if (task != current) { + if (option == ARCH_CET_UNLOCK && IS_ENABLED(CONFIG_CHECKPOINT_RESTORE)) { + task->thread.features_locked &= ~features; + return 0; + } return -EINVAL; + } /* Do not allow to change locked features */ if (features & task->thread.features_locked)