From: Thiago Jung Bauermann <bauerman@linux.ibm.com> To: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org, Alexey Kardashevskiy <aik@ozlabs.ru>, Anshuman Khandual <anshuman.linux@gmail.com>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Christoph Hellwig <hch@lst.de>, Michael Ellerman <mpe@ellerman.id.au>, Mike Anderson <andmike@linux.ibm.com>, Paul Mackerras <paulus@samba.org>, Ram Pai <linuxram@us.ibm.com>, Claudio Carvalho <cclaudio@linux.ibm.com>, Anshuman Khandual <khandual@linux.vnet.ibm.com>, Thiago Jung Bauermann <bauerman@linux.ibm.com> Subject: [PATCH v4 14/16] powerpc/pseries/svm: Force SWIOTLB for secure guests Date: Mon, 19 Aug 2019 23:13:24 -0300 [thread overview] Message-ID: <20190820021326.6884-15-bauerman@linux.ibm.com> (raw) In-Reply-To: <20190820021326.6884-1-bauerman@linux.ibm.com> From: Anshuman Khandual <khandual@linux.vnet.ibm.com> SWIOTLB checks range of incoming CPU addresses to be bounced and sees if the device can access it through its DMA window without requiring bouncing. In such cases it just chooses to skip bouncing. But for cases like secure guests on powerpc platform all addresses need to be bounced into the shared pool of memory because the host cannot access it otherwise. Hence the need to do the bouncing is not related to device's DMA window and use of bounce buffers is forced by setting swiotlb_force. Also, connect the shared memory conversion functions into the ARCH_HAS_MEM_ENCRYPT hooks and call swiotlb_update_mem_attributes() to convert SWIOTLB's memory pool to shared memory. Signed-off-by: Anshuman Khandual <khandual@linux.vnet.ibm.com> [ bauerman: Use ARCH_HAS_MEM_ENCRYPT hooks to share swiotlb memory pool. ] Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com> --- arch/powerpc/include/asm/mem_encrypt.h | 26 +++++++++++++++ arch/powerpc/platforms/pseries/Kconfig | 3 ++ arch/powerpc/platforms/pseries/svm.c | 45 ++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) diff --git a/arch/powerpc/include/asm/mem_encrypt.h b/arch/powerpc/include/asm/mem_encrypt.h new file mode 100644 index 000000000000..ba9dab07c1be --- /dev/null +++ b/arch/powerpc/include/asm/mem_encrypt.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * SVM helper functions + * + * Copyright 2018 IBM Corporation + */ + +#ifndef _ASM_POWERPC_MEM_ENCRYPT_H +#define _ASM_POWERPC_MEM_ENCRYPT_H + +#include <asm/svm.h> + +static inline bool mem_encrypt_active(void) +{ + return is_secure_guest(); +} + +static inline bool force_dma_unencrypted(struct device *dev) +{ + return is_secure_guest(); +} + +int set_memory_encrypted(unsigned long addr, int numpages); +int set_memory_decrypted(unsigned long addr, int numpages); + +#endif /* _ASM_POWERPC_MEM_ENCRYPT_H */ diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index d09deb05bb66..9e35cddddf73 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig @@ -149,6 +149,9 @@ config PAPR_SCM config PPC_SVM bool "Secure virtual machine (SVM) support for POWER" depends on PPC_PSERIES + select SWIOTLB + select ARCH_HAS_MEM_ENCRYPT + select ARCH_HAS_FORCE_DMA_UNENCRYPTED help There are certain POWER platforms which support secure guests using the Protected Execution Facility, with the help of an Ultravisor diff --git a/arch/powerpc/platforms/pseries/svm.c b/arch/powerpc/platforms/pseries/svm.c index 2b2b1a77ca1e..40c0637203d5 100644 --- a/arch/powerpc/platforms/pseries/svm.c +++ b/arch/powerpc/platforms/pseries/svm.c @@ -7,8 +7,53 @@ */ #include <linux/mm.h> +#include <asm/machdep.h> +#include <asm/svm.h> +#include <asm/swiotlb.h> #include <asm/ultravisor.h> +static int __init init_svm(void) +{ + if (!is_secure_guest()) + return 0; + + /* Don't release the SWIOTLB buffer. */ + ppc_swiotlb_enable = 1; + + /* + * Since the guest memory is inaccessible to the host, devices always + * need to use the SWIOTLB buffer for DMA even if dma_capable() says + * otherwise. + */ + swiotlb_force = SWIOTLB_FORCE; + + /* Share the SWIOTLB buffer with the host. */ + swiotlb_update_mem_attributes(); + + return 0; +} +machine_early_initcall(pseries, init_svm); + +int set_memory_encrypted(unsigned long addr, int numpages) +{ + if (!PAGE_ALIGNED(addr)) + return -EINVAL; + + uv_unshare_page(PHYS_PFN(__pa(addr)), numpages); + + return 0; +} + +int set_memory_decrypted(unsigned long addr, int numpages) +{ + if (!PAGE_ALIGNED(addr)) + return -EINVAL; + + uv_share_page(PHYS_PFN(__pa(addr)), numpages); + + return 0; +} + /* There's one dispatch log per CPU. */ #define NR_DTL_PAGE (DISPATCH_LOG_BYTES * CONFIG_NR_CPUS / PAGE_SIZE)
WARNING: multiple messages have this Message-ID (diff)
From: Thiago Jung Bauermann <bauerman@linux.ibm.com> To: linuxppc-dev@lists.ozlabs.org Cc: Anshuman Khandual <anshuman.linux@gmail.com>, Alexey Kardashevskiy <aik@ozlabs.ru>, Mike Anderson <andmike@linux.ibm.com>, Ram Pai <linuxram@us.ibm.com>, linux-kernel@vger.kernel.org, Claudio Carvalho <cclaudio@linux.ibm.com>, Paul Mackerras <paulus@samba.org>, Christoph Hellwig <hch@lst.de>, Thiago Jung Bauermann <bauerman@linux.ibm.com>, Anshuman Khandual <khandual@linux.vnet.ibm.com> Subject: [PATCH v4 14/16] powerpc/pseries/svm: Force SWIOTLB for secure guests Date: Mon, 19 Aug 2019 23:13:24 -0300 [thread overview] Message-ID: <20190820021326.6884-15-bauerman@linux.ibm.com> (raw) In-Reply-To: <20190820021326.6884-1-bauerman@linux.ibm.com> From: Anshuman Khandual <khandual@linux.vnet.ibm.com> SWIOTLB checks range of incoming CPU addresses to be bounced and sees if the device can access it through its DMA window without requiring bouncing. In such cases it just chooses to skip bouncing. But for cases like secure guests on powerpc platform all addresses need to be bounced into the shared pool of memory because the host cannot access it otherwise. Hence the need to do the bouncing is not related to device's DMA window and use of bounce buffers is forced by setting swiotlb_force. Also, connect the shared memory conversion functions into the ARCH_HAS_MEM_ENCRYPT hooks and call swiotlb_update_mem_attributes() to convert SWIOTLB's memory pool to shared memory. Signed-off-by: Anshuman Khandual <khandual@linux.vnet.ibm.com> [ bauerman: Use ARCH_HAS_MEM_ENCRYPT hooks to share swiotlb memory pool. ] Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com> --- arch/powerpc/include/asm/mem_encrypt.h | 26 +++++++++++++++ arch/powerpc/platforms/pseries/Kconfig | 3 ++ arch/powerpc/platforms/pseries/svm.c | 45 ++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) diff --git a/arch/powerpc/include/asm/mem_encrypt.h b/arch/powerpc/include/asm/mem_encrypt.h new file mode 100644 index 000000000000..ba9dab07c1be --- /dev/null +++ b/arch/powerpc/include/asm/mem_encrypt.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * SVM helper functions + * + * Copyright 2018 IBM Corporation + */ + +#ifndef _ASM_POWERPC_MEM_ENCRYPT_H +#define _ASM_POWERPC_MEM_ENCRYPT_H + +#include <asm/svm.h> + +static inline bool mem_encrypt_active(void) +{ + return is_secure_guest(); +} + +static inline bool force_dma_unencrypted(struct device *dev) +{ + return is_secure_guest(); +} + +int set_memory_encrypted(unsigned long addr, int numpages); +int set_memory_decrypted(unsigned long addr, int numpages); + +#endif /* _ASM_POWERPC_MEM_ENCRYPT_H */ diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index d09deb05bb66..9e35cddddf73 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig @@ -149,6 +149,9 @@ config PAPR_SCM config PPC_SVM bool "Secure virtual machine (SVM) support for POWER" depends on PPC_PSERIES + select SWIOTLB + select ARCH_HAS_MEM_ENCRYPT + select ARCH_HAS_FORCE_DMA_UNENCRYPTED help There are certain POWER platforms which support secure guests using the Protected Execution Facility, with the help of an Ultravisor diff --git a/arch/powerpc/platforms/pseries/svm.c b/arch/powerpc/platforms/pseries/svm.c index 2b2b1a77ca1e..40c0637203d5 100644 --- a/arch/powerpc/platforms/pseries/svm.c +++ b/arch/powerpc/platforms/pseries/svm.c @@ -7,8 +7,53 @@ */ #include <linux/mm.h> +#include <asm/machdep.h> +#include <asm/svm.h> +#include <asm/swiotlb.h> #include <asm/ultravisor.h> +static int __init init_svm(void) +{ + if (!is_secure_guest()) + return 0; + + /* Don't release the SWIOTLB buffer. */ + ppc_swiotlb_enable = 1; + + /* + * Since the guest memory is inaccessible to the host, devices always + * need to use the SWIOTLB buffer for DMA even if dma_capable() says + * otherwise. + */ + swiotlb_force = SWIOTLB_FORCE; + + /* Share the SWIOTLB buffer with the host. */ + swiotlb_update_mem_attributes(); + + return 0; +} +machine_early_initcall(pseries, init_svm); + +int set_memory_encrypted(unsigned long addr, int numpages) +{ + if (!PAGE_ALIGNED(addr)) + return -EINVAL; + + uv_unshare_page(PHYS_PFN(__pa(addr)), numpages); + + return 0; +} + +int set_memory_decrypted(unsigned long addr, int numpages) +{ + if (!PAGE_ALIGNED(addr)) + return -EINVAL; + + uv_share_page(PHYS_PFN(__pa(addr)), numpages); + + return 0; +} + /* There's one dispatch log per CPU. */ #define NR_DTL_PAGE (DISPATCH_LOG_BYTES * CONFIG_NR_CPUS / PAGE_SIZE)
next prev parent reply other threads:[~2019-08-20 2:17 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-20 2:13 [PATCH v4 00/16] Secure Virtual Machine Enablement Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 01/16] powerpc/kernel: Add ucall_norets() ultravisor call handler Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 02/16] powerpc/pseries: Introduce option to build secure virtual machines Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-09-02 3:29 ` Michael Ellerman 2019-09-03 18:53 ` Thiago Jung Bauermann 2019-09-03 18:53 ` Thiago Jung Bauermann 2019-09-05 4:03 ` Michael Ellerman 2019-09-05 4:03 ` Michael Ellerman 2019-09-05 16:06 ` Thiago Jung Bauermann 2019-09-05 16:06 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 03/16] powerpc: Add support for adding an ESM blob to the zImage wrapper Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 04/16] powerpc/prom_init: Add the ESM call to prom_init Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 05/16] powerpc/pseries/svm: Add helpers for UV_SHARE_PAGE and UV_UNSHARE_PAGE Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 06/16] powerpc: Introduce the MSR_S bit Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 07/16] powerpc/pseries: Add and use LPPACA_SIZE constant Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 08/16] powerpc/pseries/svm: Use shared memory for LPPACA structures Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 09/16] powerpc/pseries/svm: Use shared memory for Debug Trace Log (DTL) Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 10/16] powerpc/pseries/svm: Unshare all pages before kexecing a new kernel Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [RFC PATCH v4 11/16] powerpc/pseries/svm: Export guest SVM status to user space via sysfs Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 12/16] powerpc/pseries/svm: Disable doorbells in SVM guests Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 13/16] powerpc/pseries/iommu: Don't use dma_iommu_ops on secure guests Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann [this message] 2019-08-20 2:13 ` [PATCH v4 14/16] powerpc/pseries/svm: Force SWIOTLB for " Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 15/16] Documentation/powerpc: Ultravisor API Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann 2019-08-20 2:13 ` [PATCH v4 16/16] powerpc/configs: Enable secure guest support in pseries and ppc64 defconfigs Thiago Jung Bauermann 2019-08-20 2:13 ` Thiago Jung Bauermann
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=20190820021326.6884-15-bauerman@linux.ibm.com \ --to=bauerman@linux.ibm.com \ --cc=aik@ozlabs.ru \ --cc=andmike@linux.ibm.com \ --cc=anshuman.linux@gmail.com \ --cc=benh@kernel.crashing.org \ --cc=cclaudio@linux.ibm.com \ --cc=hch@lst.de \ --cc=khandual@linux.vnet.ibm.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=linuxram@us.ibm.com \ --cc=mpe@ellerman.id.au \ --cc=paulus@samba.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.