From: Jethro Beekman <jethro@fortanix.com>
To: Jarkko Sakkinen <jarkko@kernel.org>, linux-sgx@vger.kernel.org
Cc: Shuah Khan <shuah@kernel.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Jonathan Corbet <corbet@lwn.net>,
Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>,
Mike Rapoport <rppt@kernel.org>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Saravanan D <saravanand@fb.com>,
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>,
Krish Sadhukhan <krish.sadhukhan@oracle.com>,
linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org
Subject: Re: [PATCH] x86/sgx: Add SGX_MemTotal to /proc/meminfo
Date: Wed, 18 Aug 2021 15:29:59 +0200 [thread overview]
Message-ID: <acd5a925-ce86-9934-5e1c-d0bcee3f606b@fortanix.com> (raw)
In-Reply-To: <20210818132509.545997-1-jarkko@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 4494 bytes --]
On 2021-08-18 15:25, Jarkko Sakkinen wrote:
> The amount of SGX memory on the system is determined by the BIOS and it
> varies wildly between systems. It can be from dozens of MB's on desktops
> or VM's, up to many GB's on servers. Just like for regular memory, it is
> sometimes useful to know the amount of usable SGX memory in the system.
>
> Add SGX_MemTotal field to /proc/meminfo, which shows the total amount of
> usable SGX memory in the system. E.g. with 32 MB reserved for SGX from
> BIOS, the printout would be:
>
> SGX_MemTotal: 22528 kB
>
> It is less than 32 MB because some of the space is reserved for Enclave
> Page Cache Metadata (EPCM), which contains state variables for all the
> pages in the Enclave Page Cache (EPC). The latter contains the pages,
> which applications can use to create enclaves.
>
> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
> ---
> Documentation/x86/sgx.rst | 6 ++++++
> arch/x86/include/asm/sgx.h | 10 +++++++---
> arch/x86/kernel/cpu/sgx/main.c | 7 ++++++-
> arch/x86/mm/pat/set_memory.c | 5 +++++
> 4 files changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/x86/sgx.rst b/Documentation/x86/sgx.rst
> index dd0ac96ff9ef..68ee171e1d8f 100644
> --- a/Documentation/x86/sgx.rst
> +++ b/Documentation/x86/sgx.rst
> @@ -250,3 +250,9 @@ user wants to deploy SGX applications both on the host and in guests
> on the same machine, the user should reserve enough EPC (by taking out
> total virtual EPC size of all SGX VMs from the physical EPC size) for
> host SGX applications so they can run with acceptable performance.
> +
> +Supplemental fields for /proc/meminfo
> +=====================================
> +
> +SGX_MemTotal
> + The total usable SGX protected memory in kilobytes.
> diff --git a/arch/x86/include/asm/sgx.h b/arch/x86/include/asm/sgx.h
> index 05f3e21f01a7..2ae9dc8c9411 100644
> --- a/arch/x86/include/asm/sgx.h
> +++ b/arch/x86/include/asm/sgx.h
> @@ -365,6 +365,13 @@ struct sgx_sigstruct {
> * comment!
> */
>
> +#if defined(CONFIG_X86_SGX) || defined(CONFIG_X86_SGX_KVM)
> +extern unsigned long sgx_nr_all_pages;
> +
> +int sgx_set_attribute(unsigned long *allowed_attributes,
> + unsigned int attribute_fd);
> +#endif
> +
> #ifdef CONFIG_X86_SGX_KVM
> int sgx_virt_ecreate(struct sgx_pageinfo *pageinfo, void __user *secs,
> int *trapnr);
> @@ -372,7 +379,4 @@ int sgx_virt_einit(void __user *sigstruct, void __user *token,
> void __user *secs, u64 *lepubkeyhash, int *trapnr);
> #endif
>
> -int sgx_set_attribute(unsigned long *allowed_attributes,
> - unsigned int attribute_fd);
> -
This change seems unrelated?
> #endif /* _ASM_X86_SGX_H */
> diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
> index 63d3de02bbcc..1fe26a8e80dc 100644
> --- a/arch/x86/kernel/cpu/sgx/main.c
> +++ b/arch/x86/kernel/cpu/sgx/main.c
> @@ -28,7 +28,10 @@ static DECLARE_WAIT_QUEUE_HEAD(ksgxd_waitq);
> static LIST_HEAD(sgx_active_page_list);
> static DEFINE_SPINLOCK(sgx_reclaimer_lock);
>
> -/* The free page list lock protected variables prepend the lock. */
> +/* The number of usable EPC pages in the system. */
> +unsigned long sgx_nr_all_pages;
> +
> +/* The number of free EPC pages in all nodes. */
> static unsigned long sgx_nr_free_pages;
>
> /* Nodes with one or more EPC sections. */
> @@ -656,6 +659,8 @@ static bool __init sgx_setup_epc_section(u64 phys_addr, u64 size,
> list_add_tail(§ion->pages[i].list, &sgx_dirty_page_list);
> }
>
> + sgx_nr_all_pages += nr_pages;
> +
> return true;
> }
>
> diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c
> index ad8a5c586a35..82bb09c298de 100644
> --- a/arch/x86/mm/pat/set_memory.c
> +++ b/arch/x86/mm/pat/set_memory.c
> @@ -29,6 +29,7 @@
> #include <asm/proto.h>
> #include <asm/memtype.h>
> #include <asm/set_memory.h>
> +#include <asm/sgx.h>
>
> #include "../mm_internal.h"
>
> @@ -116,6 +117,10 @@ void arch_report_meminfo(struct seq_file *m)
> if (direct_gbpages)
> seq_printf(m, "DirectMap1G: %8lu kB\n",
> direct_pages_count[PG_LEVEL_1G] << 20);
> +
> +#if defined(CONFIG_X86_SGX) || defined(CONFIG_X86_SGX_KVM)
> + seq_printf(m, "SGX_MemTotal: %8lu kB\n", sgx_nr_all_pages << 2);
> +#endif
> }
> #else
> static inline void split_page_count(int level) { }
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4490 bytes --]
next prev parent reply other threads:[~2021-08-18 13:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-18 13:25 Jarkko Sakkinen
2021-08-18 13:29 ` Jethro Beekman [this message]
2021-08-18 13:40 ` Jarkko Sakkinen
2021-08-18 18:34 ` Shuah Khan
2021-08-19 11:32 ` Jarkko Sakkinen
2021-08-23 15:15 ` Dave Hansen
2021-08-24 1:16 ` Jarkko Sakkinen
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=acd5a925-ce86-9934-5e1c-d0bcee3f606b@fortanix.com \
--to=jethro@fortanix.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=bp@alien8.de \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jarkko@kernel.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=krish.sadhukhan@oracle.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rppt@kernel.org \
--cc=saravanand@fb.com \
--cc=shuah@kernel.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®