From patchwork Tue Dec 4 07:39:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 10711221 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1136013BF for ; Tue, 4 Dec 2018 07:37:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 008802A53E for ; Tue, 4 Dec 2018 07:37:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8B172A46B; Tue, 4 Dec 2018 07:37:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 852772A46B for ; Tue, 4 Dec 2018 07:37:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 12BBA6B6D91; Tue, 4 Dec 2018 02:37:27 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 00B206B6D92; Tue, 4 Dec 2018 02:37:26 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6C936B6D8D; Tue, 4 Dec 2018 02:37:26 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id 4172A6B6D89 for ; Tue, 4 Dec 2018 02:37:26 -0500 (EST) Received: by mail-pg1-f199.google.com with SMTP id p4so8455016pgj.21 for ; Mon, 03 Dec 2018 23:37:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:in-reply-to :references; bh=1mC9C/kibRKzC5GCk1dJ1h8TbH+ZC47dbrRu4UIn/kQ=; b=pWeTsW7ThmsRgoglsh95nXjSYQ+JcAbPMQVxbKwwz+Um3gaUQX+HV3IHetC46Bdtpz DZmJH1FZHzQKFe4KlptObb8zkoVuKmNr9QxG2e2NVNuKgQtmV6+n4QBUgFnOFCYkPrOP xyX5d22hWr4nnVtORJYIwu0olDGlA7qKPUxud4vg9sL6fpV6BX0BzXQ9SzyWMa3siIKH 0ThCrb+yAtYXF4M46KpDVEhh+3+tDsiixqWFXvkqn4BCvKJMcJJx2LvHOpGUfF+895OT XbOPdRWHN9ICb+txpzwK3zNRhMw4EkbkfQPFPvhMsHbQN4+JZ9LHXagkXrsCPKVRG2+9 T/5g== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of alison.schofield@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=alison.schofield@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AA+aEWbPnRHm4EsoJag52jJlnZwIh1f5bx9vYmO7PeJGQzxf36nzZwSa 69Vh0GT5pEgfmlbaYoztFpIDHgOTjIA+hzr0rjSCjpqcktayOSzj6iTN2Y86PH994lNjTekbdie pqpW30UPmAE1b5+oLaj4cBYuJNnFSlMGtBGHUOQtzVxI1lageQ5hA6siSWhPLFUz3cw== X-Received: by 2002:a17:902:42e4:: with SMTP id h91mr19414939pld.18.1543909045879; Mon, 03 Dec 2018 23:37:25 -0800 (PST) X-Google-Smtp-Source: AFSGD/XDASJCiavOCndP/HHUISTX2TSUKyO//kcmjzQaglBuAKMNLGngDnjcTW2W/mOQajXb/FH3 X-Received: by 2002:a17:902:42e4:: with SMTP id h91mr19414903pld.18.1543909044879; Mon, 03 Dec 2018 23:37:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543909044; cv=none; d=google.com; s=arc-20160816; b=0HWOVjlNwCnKPmnU8AXn8kDgPhUZlkXi3d0q9DitX2/zq+w+gXM4JpJYwT5RcY+gvO PHD5VCHy+Q8Hd8P1NhgGynOmE0JYokM1880bm2zyLGQ1jP1RTVfljokQ3W7CPguteZu4 MquMYSrCS1R91dDnqOj0o8hyhVZaYIoPT9tEa32mDipsDhbmaNNPLo6rLndnxqF5ttvs 1mJm8mlXhar1U568gmb8IsuKfGpB1iO5Kfj/tQxEtQxdpZCXom4p9N27BnKgjP4WINjH cUxhrkJcZC2jTrvhJAn9VuW7ZB+904YqtewCtqsfaoxw9l0XGTGRQjTj5BnC6e2thQeD 1ybg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from; bh=1mC9C/kibRKzC5GCk1dJ1h8TbH+ZC47dbrRu4UIn/kQ=; b=WnB/TqhR+DW/Ibhly/rS2Uq7cAkWu1++Dk13jwRJllYbaTsykuHdBCv3m9PLhVYqIY 2GYdnABewMR8RUXhjXH0JGQ7eMQ1hO5z5eUYNVmj9N4PxCBEM4I1kXlC/OjP2cOCjYkM sH6GE0zJhlplt0TVEKc0AskPXHe1oOl3go/GLJBiIJNeT5FymVtTpoWkTt5tarn/YfSM RygezCyMbPxV2ZY/Jq460UpO0ymOh3Z1FNX7oA2Jn3FbFam5Lmv7/KM8FMreO0rZ6rzq IgwSxanhD8YAn/XxbMmlh4/bkVVC7+8SwB9ywEtM8H8MIJ6mCEI2nqr8FkCpWobEvCfS xAwg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of alison.schofield@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=alison.schofield@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga02.intel.com (mga02.intel.com. [134.134.136.20]) by mx.google.com with ESMTPS id o16si15820728pgd.117.2018.12.03.23.37.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Dec 2018 23:37:24 -0800 (PST) Received-SPF: pass (google.com: domain of alison.schofield@intel.com designates 134.134.136.20 as permitted sender) client-ip=134.134.136.20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of alison.schofield@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=alison.schofield@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Dec 2018 23:37:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,313,1539673200"; d="scan'208";a="95937319" Received: from alison-desk.jf.intel.com (HELO alison-desk) ([10.54.74.53]) by orsmga007.jf.intel.com with ESMTP; 03 Dec 2018 23:37:22 -0800 From: Alison Schofield To: dhowells@redhat.com, tglx@linutronix.de Cc: jmorris@namei.org, mingo@redhat.com, hpa@zytor.com, bp@alien8.de, luto@kernel.org, peterz@infradead.org, kirill.shutemov@linux.intel.com, dave.hansen@intel.com, kai.huang@intel.com, jun.nakajima@intel.com, dan.j.williams@intel.com, jarkko.sakkinen@intel.com, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org Subject: [RFC v2 03/13] syscall/x86: Wire up a new system call for memory encryption keys Date: Mon, 3 Dec 2018 23:39:50 -0800 Message-Id: <952381f6d8b394242590f03a4f7122789681ffbb.1543903910.git.alison.schofield@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP encrypt_mprotect() is a new system call to support memory encryption. It takes the same parameters as legacy mprotect, plus an additional key serial number that is mapped to an encryption keyid. Signed-off-by: Alison Schofield Signed-off-by: Kirill A. Shutemov --- arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + include/linux/syscalls.h | 2 ++ include/uapi/asm-generic/unistd.h | 4 +++- kernel/sys_ni.c | 2 ++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 3cf7b533b3d1..f41ad857d5c6 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -398,3 +398,4 @@ 384 i386 arch_prctl sys_arch_prctl __ia32_compat_sys_arch_prctl 385 i386 io_pgetevents sys_io_pgetevents __ia32_compat_sys_io_pgetevents 386 i386 rseq sys_rseq __ia32_sys_rseq +387 i386 encrypt_mprotect sys_encrypt_mprotect __ia32_sys_encrypt_mprotect diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl index f0b1709a5ffb..cf2decfa6119 100644 --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl @@ -343,6 +343,7 @@ 332 common statx __x64_sys_statx 333 common io_pgetevents __x64_sys_io_pgetevents 334 common rseq __x64_sys_rseq +335 common encrypt_mprotect __x64_sys_encrypt_mprotect # # x32-specific system call numbers start at 512 to avoid cache impact diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 2ac3d13a915b..c728b47e9004 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -907,6 +907,8 @@ asmlinkage long sys_statx(int dfd, const char __user *path, unsigned flags, unsigned mask, struct statx __user *buffer); asmlinkage long sys_rseq(struct rseq __user *rseq, uint32_t rseq_len, int flags, uint32_t sig); +asmlinkage long sys_encrypt_mprotect(unsigned long start, size_t len, + unsigned long prot, key_serial_t serial); /* * Architecture-specific system calls diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 538546edbfbd..696c222ebe40 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -738,9 +738,11 @@ __SYSCALL(__NR_statx, sys_statx) __SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents) #define __NR_rseq 293 __SYSCALL(__NR_rseq, sys_rseq) +#define __NR_encrypt_mprotect 294 +__SYSCALL(__NR_encrypt_mprotect, sys_encrypt_mprotect) #undef __NR_syscalls -#define __NR_syscalls 294 +#define __NR_syscalls 295 /* * 32 bit systems traditionally used different diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index df556175be50..1b48f709c265 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c @@ -336,6 +336,8 @@ COND_SYSCALL(pkey_mprotect); COND_SYSCALL(pkey_alloc); COND_SYSCALL(pkey_free); +/* multi-key total memory encryption keys */ +COND_SYSCALL(encrypt_mprotect); /* * Architecture specific weak syscall entries.