From: "Huang, Kai" <kai.huang@intel.com> To: "Schofield, Alison" <alison.schofield@intel.com>, "dhowells@redhat.com" <dhowells@redhat.com>, "tglx@linutronix.de" <tglx@linutronix.de> Cc: "Nakajima, Jun" <jun.nakajima@intel.com>, "Shutemov, Kirill" <kirill.shutemov@intel.com>, "Hansen, Dave" <dave.hansen@intel.com>, "Sakkinen, Jarkko" <jarkko.sakkinen@intel.com>, "jmorris@namei.org" <jmorris@namei.org>, "keyrings@vger.kernel.org" <keyrings@vger.kernel.org>, "linux-security-module@vger.kernel.org" <linux-security-module@vger.kernel.org>, "mingo@redhat.com" <mingo@redhat.com>, "hpa@zytor.com" <hpa@zytor.com>, "x86@kernel.org" <x86@kernel.org>, "linux-mm@kvack.org" <linux-mm@kvack.org> Subject: RE: [RFC 07/12] x86/mm: Add helper functions to track encrypted VMA's Date: Mon, 10 Sep 2018 03:17:52 +0000 [thread overview] Message-ID: <105F7BF4D0229846AF094488D65A098935424BDA@PGSMSX112.gar.corp.intel.com> (raw) In-Reply-To: <d98252fe105f2e948e2f585914a61b32c1902889.1536356108.git.alison.schofield@intel.com> > -----Original Message----- > From: keyrings-owner@vger.kernel.org [mailto:keyrings- > owner@vger.kernel.org] On Behalf Of Alison Schofield > Sent: Saturday, September 8, 2018 10:37 AM > To: dhowells@redhat.com; tglx@linutronix.de > Cc: Huang, Kai <kai.huang@intel.com>; Nakajima, Jun > <jun.nakajima@intel.com>; Shutemov, Kirill <kirill.shutemov@intel.com>; > Hansen, Dave <dave.hansen@intel.com>; Sakkinen, Jarkko > <jarkko.sakkinen@intel.com>; jmorris@namei.org; keyrings@vger.kernel.org; > linux-security-module@vger.kernel.org; mingo@redhat.com; hpa@zytor.com; > x86@kernel.org; linux-mm@kvack.org > Subject: [RFC 07/12] x86/mm: Add helper functions to track encrypted VMA's > > In order to safely manage the usage of memory encryption keys, VMA's using > each keyid need to be tracked. This tracking allows the Kernel Key Service to > know when the keyid resource is actually in use, or when it is idle and may be > considered for reuse. > > Define a global atomic encrypt_count array to track the number of VMA's > oustanding for each encryption keyid. > > Implement helper functions to manipulate this encrypt_count array. > > Signed-off-by: Alison Schofield <alison.schofield@intel.com> > --- > arch/x86/include/asm/mktme.h | 7 +++++++ > arch/x86/mm/mktme.c | 39 > +++++++++++++++++++++++++++++++++++++++ > include/linux/mm.h | 2 ++ > 3 files changed, 48 insertions(+) > > diff --git a/arch/x86/include/asm/mktme.h b/arch/x86/include/asm/mktme.h > index b707f800b68f..5f3fa0c39c1c 100644 > --- a/arch/x86/include/asm/mktme.h > +++ b/arch/x86/include/asm/mktme.h > @@ -16,6 +16,13 @@ extern int mktme_keyid_shift; > /* Set the encryption keyid bits in a VMA */ extern void > mprotect_set_encrypt(struct vm_area_struct *vma, int newkeyid); > > +/* Manage the references to outstanding VMA's per encryption key */ > +extern int vma_alloc_encrypt_array(void); extern void > +vma_free_encrypt_array(void); extern int vma_read_encrypt_ref(int > +keyid); extern void vma_get_encrypt_ref(struct vm_area_struct *vma); > +extern void vma_put_encrypt_ref(struct vm_area_struct *vma); > + > /* Manage mappings between hardware keyids and userspace keys */ extern > int mktme_map_alloc(void); extern void mktme_map_free(void); diff --git > a/arch/x86/mm/mktme.c b/arch/x86/mm/mktme.c index > 5ee7f37e9cd0..5690ef51a79a 100644 > --- a/arch/x86/mm/mktme.c > +++ b/arch/x86/mm/mktme.c > @@ -163,6 +163,45 @@ int mktme_map_get_free_keyid(void) > return 0; > } > > +/* > + * Helper functions manage the encrypt_count[] array that tracks the > + * VMA's outstanding for each encryption keyid. The gets & puts are > + * used in core mm code that allocates and free's VMA's. The alloc, > + * free, and read functions are used by the MKTME key service to > + * manage key allocation and programming. > + */ > +atomic_t *encrypt_count; > + > +int vma_alloc_encrypt_array(void) > +{ > + encrypt_count = kcalloc(mktme_nr_keyids, sizeof(atomic_t), > GFP_KERNEL); > + if (!encrypt_count) > + return -ENOMEM; > + return 0; > +} > + > +void vma_free_encrypt_array(void) > +{ > + kfree(encrypt_count); > +} > + > +int vma_read_encrypt_ref(int keyid) > +{ > + return atomic_read(&encrypt_count[keyid]); > +} I think it's better to move above to security/keys/mktme_keys.c w/ appropriate renaming. Thanks, -Kai > + > +void vma_get_encrypt_ref(struct vm_area_struct *vma) { > + if (vma_keyid(vma)) > + atomic_inc(&encrypt_count[vma_keyid(vma)]); > +} > + > +void vma_put_encrypt_ref(struct vm_area_struct *vma) { > + if (vma_keyid(vma)) > + atomic_dec(&encrypt_count[vma_keyid(vma)]); > +} > + > void prep_encrypted_page(struct page *page, int order, int keyid, bool zero) { > int i; > diff --git a/include/linux/mm.h b/include/linux/mm.h index > 0f9422c7841e..b217c699dbab 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2803,6 +2803,8 @@ static inline void setup_nr_node_ids(void) {} #ifndef > CONFIG_X86_INTEL_MKTME static inline void mprotect_set_encrypt(struct > vm_area_struct *vma, > int newkeyid) {} > +static inline void vma_get_encrypt_ref(struct vm_area_struct *vma) {} > +static inline void vma_put_encrypt_ref(struct vm_area_struct *vma) {} > #endif /* CONFIG_X86_INTEL_MKTME */ > #endif /* __KERNEL__ */ > #endif /* _LINUX_MM_H */ > -- > 2.14.1
WARNING: multiple messages have this Message-ID (diff)
From: kai.huang@intel.com (Huang, Kai) To: linux-security-module@vger.kernel.org Subject: [RFC 07/12] x86/mm: Add helper functions to track encrypted VMA's Date: Mon, 10 Sep 2018 03:17:52 +0000 [thread overview] Message-ID: <105F7BF4D0229846AF094488D65A098935424BDA@PGSMSX112.gar.corp.intel.com> (raw) In-Reply-To: <d98252fe105f2e948e2f585914a61b32c1902889.1536356108.git.alison.schofield@intel.com> > -----Original Message----- > From: keyrings-owner at vger.kernel.org [mailto:keyrings- > owner at vger.kernel.org] On Behalf Of Alison Schofield > Sent: Saturday, September 8, 2018 10:37 AM > To: dhowells at redhat.com; tglx at linutronix.de > Cc: Huang, Kai <kai.huang@intel.com>; Nakajima, Jun > <jun.nakajima@intel.com>; Shutemov, Kirill <kirill.shutemov@intel.com>; > Hansen, Dave <dave.hansen@intel.com>; Sakkinen, Jarkko > <jarkko.sakkinen@intel.com>; jmorris at namei.org; keyrings at vger.kernel.org; > linux-security-module at vger.kernel.org; mingo at redhat.com; hpa at zytor.com; > x86 at kernel.org; linux-mm at kvack.org > Subject: [RFC 07/12] x86/mm: Add helper functions to track encrypted VMA's > > In order to safely manage the usage of memory encryption keys, VMA's using > each keyid need to be tracked. This tracking allows the Kernel Key Service to > know when the keyid resource is actually in use, or when it is idle and may be > considered for reuse. > > Define a global atomic encrypt_count array to track the number of VMA's > oustanding for each encryption keyid. > > Implement helper functions to manipulate this encrypt_count array. > > Signed-off-by: Alison Schofield <alison.schofield@intel.com> > --- > arch/x86/include/asm/mktme.h | 7 +++++++ > arch/x86/mm/mktme.c | 39 > +++++++++++++++++++++++++++++++++++++++ > include/linux/mm.h | 2 ++ > 3 files changed, 48 insertions(+) > > diff --git a/arch/x86/include/asm/mktme.h b/arch/x86/include/asm/mktme.h > index b707f800b68f..5f3fa0c39c1c 100644 > --- a/arch/x86/include/asm/mktme.h > +++ b/arch/x86/include/asm/mktme.h > @@ -16,6 +16,13 @@ extern int mktme_keyid_shift; > /* Set the encryption keyid bits in a VMA */ extern void > mprotect_set_encrypt(struct vm_area_struct *vma, int newkeyid); > > +/* Manage the references to outstanding VMA's per encryption key */ > +extern int vma_alloc_encrypt_array(void); extern void > +vma_free_encrypt_array(void); extern int vma_read_encrypt_ref(int > +keyid); extern void vma_get_encrypt_ref(struct vm_area_struct *vma); > +extern void vma_put_encrypt_ref(struct vm_area_struct *vma); > + > /* Manage mappings between hardware keyids and userspace keys */ extern > int mktme_map_alloc(void); extern void mktme_map_free(void); diff --git > a/arch/x86/mm/mktme.c b/arch/x86/mm/mktme.c index > 5ee7f37e9cd0..5690ef51a79a 100644 > --- a/arch/x86/mm/mktme.c > +++ b/arch/x86/mm/mktme.c > @@ -163,6 +163,45 @@ int mktme_map_get_free_keyid(void) > return 0; > } > > +/* > + * Helper functions manage the encrypt_count[] array that tracks the > + * VMA's outstanding for each encryption keyid. The gets & puts are > + * used in core mm code that allocates and free's VMA's. The alloc, > + * free, and read functions are used by the MKTME key service to > + * manage key allocation and programming. > + */ > +atomic_t *encrypt_count; > + > +int vma_alloc_encrypt_array(void) > +{ > + encrypt_count = kcalloc(mktme_nr_keyids, sizeof(atomic_t), > GFP_KERNEL); > + if (!encrypt_count) > + return -ENOMEM; > + return 0; > +} > + > +void vma_free_encrypt_array(void) > +{ > + kfree(encrypt_count); > +} > + > +int vma_read_encrypt_ref(int keyid) > +{ > + return atomic_read(&encrypt_count[keyid]); > +} I think it's better to move above to security/keys/mktme_keys.c w/ appropriate renaming. Thanks, -Kai > + > +void vma_get_encrypt_ref(struct vm_area_struct *vma) { > + if (vma_keyid(vma)) > + atomic_inc(&encrypt_count[vma_keyid(vma)]); > +} > + > +void vma_put_encrypt_ref(struct vm_area_struct *vma) { > + if (vma_keyid(vma)) > + atomic_dec(&encrypt_count[vma_keyid(vma)]); > +} > + > void prep_encrypted_page(struct page *page, int order, int keyid, bool zero) { > int i; > diff --git a/include/linux/mm.h b/include/linux/mm.h index > 0f9422c7841e..b217c699dbab 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2803,6 +2803,8 @@ static inline void setup_nr_node_ids(void) {} #ifndef > CONFIG_X86_INTEL_MKTME static inline void mprotect_set_encrypt(struct > vm_area_struct *vma, > int newkeyid) {} > +static inline void vma_get_encrypt_ref(struct vm_area_struct *vma) {} > +static inline void vma_put_encrypt_ref(struct vm_area_struct *vma) {} > #endif /* CONFIG_X86_INTEL_MKTME */ > #endif /* __KERNEL__ */ > #endif /* _LINUX_MM_H */ > -- > 2.14.1
next prev parent reply other threads:[~2018-09-10 3:17 UTC|newest] Thread overview: 159+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-07 22:23 [RFC 00/12] Multi-Key Total Memory Encryption API (MKTME) Alison Schofield 2018-09-07 22:23 ` Alison Schofield 2018-09-07 22:23 ` Alison Schofield 2018-09-07 22:34 ` [RFC 01/12] docs/x86: Document the Multi-Key Total Memory Encryption API Alison Schofield 2018-09-08 18:44 ` Randy Dunlap 2018-09-08 18:44 ` Randy Dunlap 2018-09-08 18:44 ` Randy Dunlap 2018-09-10 1:28 ` Huang, Kai 2018-09-10 1:28 ` Huang, Kai 2018-09-10 1:28 ` Huang, Kai 2018-09-11 0:13 ` Alison Schofield 2018-09-11 0:13 ` Alison Schofield 2018-09-11 0:13 ` Alison Schofield 2018-09-11 0:33 ` Huang, Kai 2018-09-11 0:33 ` Huang, Kai 2018-09-11 0:33 ` Huang, Kai 2018-09-11 0:45 ` Alison Schofield 2018-09-11 0:45 ` Alison Schofield 2018-09-11 0:45 ` Alison Schofield 2018-09-11 1:14 ` Huang, Kai 2018-09-11 1:14 ` Huang, Kai 2018-09-11 1:14 ` Huang, Kai 2018-09-11 0:14 ` Huang, Kai 2018-09-11 0:14 ` Huang, Kai 2018-09-11 0:14 ` Huang, Kai 2018-09-10 17:32 ` Sakkinen, Jarkko 2018-09-10 17:32 ` Sakkinen, Jarkko 2018-09-10 17:32 ` Sakkinen, Jarkko 2018-09-11 0:19 ` Alison Schofield 2018-09-11 0:19 ` Alison Schofield 2018-09-11 0:19 ` Alison Schofield 2018-09-07 22:34 ` [RFC 02/12] mm: Generalize the mprotect implementation to support extensions Alison Schofield 2018-09-07 22:34 ` Alison Schofield 2018-09-07 22:34 ` Alison Schofield 2018-09-10 10:12 ` Jarkko Sakkinen 2018-09-10 10:12 ` Jarkko Sakkinen 2018-09-10 10:12 ` Jarkko Sakkinen 2018-09-11 0:34 ` Alison Schofield 2018-09-11 0:34 ` Alison Schofield 2018-09-11 0:34 ` Alison Schofield 2018-09-07 22:34 ` [RFC 03/12] syscall/x86: Wire up a new system call for memory encryption keys Alison Schofield 2018-09-07 22:34 ` Alison Schofield 2018-09-07 22:34 ` Alison Schofield 2018-09-07 22:36 ` [RFC 04/12] x86/mm: Add helper functions to manage " Alison Schofield 2018-09-07 22:36 ` Alison Schofield 2018-09-07 22:36 ` Alison Schofield 2018-09-10 2:56 ` Huang, Kai 2018-09-10 2:56 ` Huang, Kai 2018-09-10 2:56 ` Huang, Kai 2018-09-10 23:37 ` Huang, Kai 2018-09-10 23:37 ` Huang, Kai 2018-09-10 23:37 ` Huang, Kai 2018-09-10 23:41 ` Alison Schofield 2018-09-10 23:41 ` Alison Schofield 2018-09-10 23:41 ` Alison Schofield 2018-09-10 17:37 ` Sakkinen, Jarkko 2018-09-07 22:36 ` [RFC 05/12] x86/mm: Add a helper function to set keyid bits in encrypted VMA's Alison Schofield 2018-09-07 22:36 ` Alison Schofield 2018-09-07 22:36 ` Alison Schofield 2018-09-10 17:57 ` Sakkinen, Jarkko 2018-09-10 17:57 ` Sakkinen, Jarkko 2018-09-10 17:57 ` Sakkinen, Jarkko 2018-09-07 22:36 ` [RFC 06/12] mm: Add the encrypt_mprotect() system call Alison Schofield 2018-09-10 18:02 ` Jarkko Sakkinen 2018-09-10 18:02 ` Jarkko Sakkinen 2018-09-10 18:02 ` Jarkko Sakkinen 2018-09-11 2:15 ` Alison Schofield 2018-09-11 2:15 ` Alison Schofield 2018-09-11 2:15 ` Alison Schofield 2018-09-07 22:37 ` [RFC 07/12] x86/mm: Add helper functions to track encrypted VMA's Alison Schofield 2018-09-07 22:37 ` Alison Schofield 2018-09-07 22:37 ` Alison Schofield 2018-09-10 3:17 ` Huang, Kai [this message] 2018-09-10 3:17 ` Huang, Kai 2018-09-07 22:37 ` [RFC 08/12] mm: Track VMA's in use for each memory encryption keyid Alison Schofield 2018-09-07 22:37 ` Alison Schofield 2018-09-07 22:37 ` Alison Schofield 2018-09-10 18:20 ` Jarkko Sakkinen 2018-09-10 18:20 ` Jarkko Sakkinen 2018-09-10 18:20 ` Jarkko Sakkinen 2018-09-11 2:39 ` Alison Schofield 2018-09-11 2:39 ` Alison Schofield 2018-09-11 2:39 ` Alison Schofield 2018-09-07 22:37 ` [RFC 09/12] mm: Restrict memory encryption to anonymous VMA's Alison Schofield 2018-09-07 22:37 ` Alison Schofield 2018-09-07 22:37 ` Alison Schofield 2018-09-10 18:21 ` Sakkinen, Jarkko 2018-09-10 18:21 ` Sakkinen, Jarkko 2018-09-10 18:21 ` Sakkinen, Jarkko 2018-09-10 18:57 ` Dave Hansen 2018-09-10 18:57 ` Dave Hansen 2018-09-10 18:57 ` Dave Hansen 2018-09-10 21:07 ` Jarkko Sakkinen 2018-09-10 21:07 ` Jarkko Sakkinen 2018-09-10 21:07 ` Jarkko Sakkinen 2018-09-10 21:09 ` Dave Hansen 2018-09-10 21:09 ` Dave Hansen 2018-09-10 21:09 ` Dave Hansen 2018-09-07 22:38 ` [RFC 10/12] x86/pconfig: Program memory encryption keys on a system-wide basis Alison Schofield 2018-09-07 22:38 ` Alison Schofield 2018-09-07 22:38 ` Alison Schofield 2018-09-10 1:46 ` Huang, Kai 2018-09-10 1:46 ` Huang, Kai 2018-09-10 18:24 ` Sakkinen, Jarkko 2018-09-10 18:24 ` Sakkinen, Jarkko 2018-09-10 18:24 ` Sakkinen, Jarkko 2018-09-11 2:46 ` Alison Schofield 2018-09-11 2:46 ` Alison Schofield 2018-09-11 2:46 ` Alison Schofield 2018-09-11 14:31 ` Jarkko Sakkinen 2018-09-11 14:31 ` Jarkko Sakkinen 2018-09-11 14:31 ` Jarkko Sakkinen 2018-09-07 22:38 ` [RFC 11/12] keys/mktme: Add a new key service type for memory encryption keys Alison Schofield 2018-09-07 22:38 ` Alison Schofield 2018-09-07 22:38 ` Alison Schofield 2018-09-10 3:29 ` Huang, Kai 2018-09-10 3:29 ` Huang, Kai 2018-09-10 3:29 ` Huang, Kai 2018-09-10 21:47 ` Alison Schofield 2018-09-10 21:47 ` Alison Schofield 2018-09-10 21:47 ` Alison Schofield 2018-09-15 0:06 ` Alison Schofield 2018-09-15 0:06 ` Alison Schofield 2018-09-15 0:06 ` Alison Schofield 2018-09-17 10:48 ` Huang, Kai 2018-09-17 10:48 ` Huang, Kai 2018-09-17 10:48 ` Huang, Kai 2018-09-17 22:34 ` Huang, Kai 2018-09-17 22:34 ` Huang, Kai 2018-09-17 22:34 ` Huang, Kai 2018-09-07 22:39 ` [RFC 12/12] keys/mktme: Do not revoke in use " Alison Schofield 2018-09-07 22:39 ` Alison Schofield 2018-09-07 22:39 ` Alison Schofield 2018-09-10 1:10 ` [RFC 00/12] Multi-Key Total Memory Encryption API (MKTME) Huang, Kai 2018-09-10 1:10 ` Huang, Kai 2018-09-10 19:10 ` Alison Schofield 2018-09-10 19:10 ` Alison Schofield 2018-09-10 19:10 ` Alison Schofield 2018-09-11 3:15 ` Huang, Kai 2018-09-11 3:15 ` Huang, Kai 2018-09-11 3:15 ` Huang, Kai 2018-09-10 17:29 ` Sakkinen, Jarkko 2018-09-10 17:29 ` Sakkinen, Jarkko 2018-09-10 17:29 ` Sakkinen, Jarkko 2018-09-11 22:03 ` [RFC 11/12] keys/mktme: Add a new key service type for memory encryption keys David Howells 2018-09-11 22:03 ` David Howells 2018-09-11 22:03 ` David Howells 2018-09-11 22:39 ` Alison Schofield 2018-09-11 22:39 ` Alison Schofield 2018-09-11 22:39 ` Alison Schofield 2018-09-11 23:01 ` David Howells 2018-09-11 23:01 ` David Howells 2018-09-11 23:01 ` David Howells 2018-09-11 22:56 ` [RFC 04/12] x86/mm: Add helper functions to manage " David Howells 2018-09-11 22:56 ` David Howells 2018-09-11 22:56 ` David Howells 2018-09-12 11:12 ` [RFC 12/12] keys/mktme: Do not revoke in use " David Howells 2018-09-12 11:12 ` David Howells 2018-09-12 11:12 ` David Howells
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=105F7BF4D0229846AF094488D65A098935424BDA@PGSMSX112.gar.corp.intel.com \ --to=kai.huang@intel.com \ --cc=alison.schofield@intel.com \ --cc=dave.hansen@intel.com \ --cc=dhowells@redhat.com \ --cc=hpa@zytor.com \ --cc=jarkko.sakkinen@intel.com \ --cc=jmorris@namei.org \ --cc=jun.nakajima@intel.com \ --cc=keyrings@vger.kernel.org \ --cc=kirill.shutemov@intel.com \ --cc=linux-mm@kvack.org \ --cc=linux-security-module@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.