Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp22818pxy; Tue, 4 May 2021 17:36:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlLj003uoRtynkviiTO1k/NdcfEcCzeByFaMQZssbH12wUtIcbJEFgP2hdxQ05A9enV3k7 X-Received: by 2002:a17:907:1b11:: with SMTP id mp17mr24911847ejc.1.1620174983545; Tue, 04 May 2021 17:36:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620174983; cv=none; d=google.com; s=arc-20160816; b=bTWHe+5zgseD8LzXoxgNyjXELpE1AbECoAVYUkV66C80q3sVd28xksdpaogeo/Dqe8 zxcnzskYzXEPu9s7gwj83BNYhq43z0SGynzFgcXs5nOStVQSn/Z6ICTdstzK7Mz/JLMD WpKGtBYiE80hguiSnP940p/15dpNFqAovnS1sCQCGGNjUPETtr8anIxsUKR8+bLY5ZcL syZTJTqtdqXrlsQsHpmSzUcKAATv4yBeZ89n+Xe/PJSotpduSay+uWxgkV1RsYlc6IEa ktP4/2ZPwFymfQqKVHGJkSwWjLyeXbEMQHjro3qNadK97+bt6BE0iYfpl0AuRBS99umf dWZg== 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 :ironport-sdr:ironport-sdr; bh=yoHjB6Jnb+XlpHRO9KqUeQioA20DPSJC+prDpLR1GOY=; b=WNb2jBvTpvSzaofBeRBIfn23EdS7DHz6jvxCZ95bDiOQfiWf4c7fGHFa9MNxqkEAeU beZSOLH7NTRdAR44KgwQ7KfdTafxvdPJZED+VXdF1UovQBBx/fBnz2G7ATkwBYjPhznC dJebwI37AZheDXL3uInpyNtEPpev7Asl+I7kj4M2UajnOejOLHnJ61qoEhIkLROwvskC Lrqg5B3wr87BgLxBPJf6UxXB1xVTO93nAK5vH8BmzOd700HsbaD813xh8IYFSbvMPKX4 jsUwDUiCJbOy5PJem/dvcbTyiLS+q/jiM+nyVtZ3zV4/e7FskJ47xNHor2TLJ6SKmGxk N+lg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j7si3907212ejn.636.2021.05.04.17.35.59; Tue, 04 May 2021 17:36:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231551AbhEEAde (ORCPT + 99 others); Tue, 4 May 2021 20:33:34 -0400 Received: from mga04.intel.com ([192.55.52.120]:19824 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231503AbhEEAdZ (ORCPT ); Tue, 4 May 2021 20:33:25 -0400 IronPort-SDR: NIsHcdQNd+ujF+DaYrQYv1vv2+UuhtKgyL12HctS6yC3so/6XADMpEG007r5UfBMSUFJymDfbP 8tt9W/2EZCWA== X-IronPort-AV: E=McAfee;i="6200,9189,9974"; a="196058598" X-IronPort-AV: E=Sophos;i="5.82,273,1613462400"; d="scan'208";a="196058598" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2021 17:32:29 -0700 IronPort-SDR: ystkmVaLd3ynX9ydNCnx/U8bOYtmoL7EVqOaerYbN9eiXBwAlyVZHDuTDCv0OgBOAZiPRXxDBx AVuB95agEXmA== X-IronPort-AV: E=Sophos;i="5.82,273,1613462400"; d="scan'208";a="429490807" Received: from rpedgeco-mobl3.amr.corp.intel.com (HELO localhost.intel.com) ([10.209.26.68]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2021 17:32:28 -0700 From: Rick Edgecombe To: dave.hansen@intel.com, luto@kernel.org, peterz@infradead.org, linux-mm@kvack.org, x86@kernel.org, akpm@linux-foundation.org, linux-hardening@vger.kernel.org, kernel-hardening@lists.openwall.com Cc: ira.weiny@intel.com, rppt@kernel.org, dan.j.williams@intel.com, linux-kernel@vger.kernel.org, Rick Edgecombe Subject: [PATCH RFC 6/9] x86/mm/cpa: Add set_memory_pks() Date: Tue, 4 May 2021 17:30:29 -0700 Message-Id: <20210505003032.489164-7-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210505003032.489164-1-rick.p.edgecombe@intel.com> References: <20210505003032.489164-1-rick.p.edgecombe@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add function for setting PKS key on kernel memory. Signed-off-by: Rick Edgecombe --- arch/x86/include/asm/set_memory.h | 1 + arch/x86/mm/pat/set_memory.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h index b63f09cc282a..a2bab1626fdd 100644 --- a/arch/x86/include/asm/set_memory.h +++ b/arch/x86/include/asm/set_memory.h @@ -52,6 +52,7 @@ int set_memory_decrypted(unsigned long addr, int numpages); int set_memory_np_noalias(unsigned long addr, int numpages); int set_memory_nonglobal(unsigned long addr, int numpages); int set_memory_global(unsigned long addr, int numpages); +int set_memory_pks(unsigned long addr, int numpages, int key); int set_pages_array_uc(struct page **pages, int addrinarray); int set_pages_array_wc(struct page **pages, int addrinarray); diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 6877ef66793b..29e61afb4a94 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -1914,6 +1914,13 @@ int set_memory_wb(unsigned long addr, int numpages) } EXPORT_SYMBOL(set_memory_wb); +int set_memory_pks(unsigned long addr, int numpages, int key) +{ + return change_page_attr_set_clr(&addr, numpages, __pgprot(_PAGE_PKEY(key)), + __pgprot(_PAGE_PKEY(0xF & ~(unsigned int)key)), + 0, 0, NULL); +} + int set_memory_x(unsigned long addr, int numpages) { if (!(__supported_pte_mask & _PAGE_NX)) -- 2.30.2