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>
Subject: [PATCH v2 11/13] powerpc/pseries/iommu: Don't use dma_iommu_ops on secure guests
Date: Sat, 13 Jul 2019 03:00:21 -0300 [thread overview]
Message-ID: <20190713060023.8479-12-bauerman@linux.ibm.com> (raw)
In-Reply-To: <20190713060023.8479-1-bauerman@linux.ibm.com>
Secure guest memory is inacessible to devices so regular DMA isn't
possible.
In that case set devices' dma_map_ops to NULL so that the generic
DMA code path will use SWIOTLB and DMA to bounce buffers.
Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
---
arch/powerpc/platforms/pseries/iommu.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 03bbb299320e..7d9550edb700 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -50,6 +50,7 @@
#include <asm/udbg.h>
#include <asm/mmzone.h>
#include <asm/plpar_wrappers.h>
+#include <asm/svm.h>
#include "pseries.h"
@@ -1332,7 +1333,10 @@ void iommu_init_early_pSeries(void)
of_reconfig_notifier_register(&iommu_reconfig_nb);
register_memory_notifier(&iommu_mem_nb);
- set_pci_dma_ops(&dma_iommu_ops);
+ if (is_secure_guest())
+ set_pci_dma_ops(NULL);
+ else
+ set_pci_dma_ops(&dma_iommu_ops);
}
static int __init disable_multitce(char *str)
WARNING: multiple messages have this Message-ID (diff)
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>,
Thiago Jung Bauermann <bauerman@linux.ibm.com>
Subject: [PATCH v2 11/13] powerpc/pseries/iommu: Don't use dma_iommu_ops on secure guests
Date: Sat, 13 Jul 2019 03:00:21 -0300 [thread overview]
Message-ID: <20190713060023.8479-12-bauerman@linux.ibm.com> (raw)
In-Reply-To: <20190713060023.8479-1-bauerman@linux.ibm.com>
Secure guest memory is inacessible to devices so regular DMA isn't
possible.
In that case set devices' dma_map_ops to NULL so that the generic
DMA code path will use SWIOTLB and DMA to bounce buffers.
Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
---
arch/powerpc/platforms/pseries/iommu.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 03bbb299320e..7d9550edb700 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -50,6 +50,7 @@
#include <asm/udbg.h>
#include <asm/mmzone.h>
#include <asm/plpar_wrappers.h>
+#include <asm/svm.h>
#include "pseries.h"
@@ -1332,7 +1333,10 @@ void iommu_init_early_pSeries(void)
of_reconfig_notifier_register(&iommu_reconfig_nb);
register_memory_notifier(&iommu_mem_nb);
- set_pci_dma_ops(&dma_iommu_ops);
+ if (is_secure_guest())
+ set_pci_dma_ops(NULL);
+ else
+ set_pci_dma_ops(&dma_iommu_ops);
}
static int __init disable_multitce(char *str)
next prev parent reply other threads:[~2019-07-13 6:23 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-13 6:00 [PATCH v2 00/13] Secure Virtual Machine Enablement Thiago Jung Bauermann
2019-07-13 6:00 ` Thiago Jung Bauermann
2019-07-13 6:00 ` [PATCH v2 01/13] powerpc/pseries: Introduce option to build secure virtual machines Thiago Jung Bauermann
2019-07-13 6:00 ` Thiago Jung Bauermann
2019-07-13 6:00 ` [RFC PATCH v2 02/13] powerpc: Add support for adding an ESM blob to the zImage wrapper Thiago Jung Bauermann
2019-07-13 6:00 ` Thiago Jung Bauermann
2019-07-13 6:00 ` [PATCH v2 03/13] powerpc/prom_init: Add the ESM call to prom_init Thiago Jung Bauermann
2019-07-13 6:00 ` Thiago Jung Bauermann
2019-07-18 8:11 ` Alexey Kardashevskiy
2019-07-18 8:11 ` Alexey Kardashevskiy
2019-07-18 19:58 ` Segher Boessenkool
2019-07-18 19:58 ` Segher Boessenkool
2019-07-18 21:28 ` Thiago Jung Bauermann
2019-07-18 21:28 ` Thiago Jung Bauermann
2019-07-19 0:09 ` Alexey Kardashevskiy
2019-07-19 0:09 ` Alexey Kardashevskiy
2019-07-19 0:48 ` Thiago Jung Bauermann
2019-07-19 0:48 ` Thiago Jung Bauermann
2019-07-13 6:00 ` [PATCH v2 04/13] powerpc/pseries/svm: Add helpers for UV_SHARE_PAGE and UV_UNSHARE_PAGE Thiago Jung Bauermann
2019-07-13 6:00 ` Thiago Jung Bauermann
2019-07-18 8:13 ` Alexey Kardashevskiy
2019-07-18 8:13 ` Alexey Kardashevskiy
2019-07-18 20:12 ` Thiago Jung Bauermann
2019-07-18 20:12 ` Thiago Jung Bauermann
2019-07-13 6:00 ` [PATCH v2 05/13] powerpc/pseries: Add and use LPPACA_SIZE constant Thiago Jung Bauermann
2019-07-13 6:00 ` Thiago Jung Bauermann
2019-07-13 6:00 ` [PATCH v2 06/13] powerpc/pseries/svm: Use shared memory for LPPACA structures Thiago Jung Bauermann
2019-07-13 6:00 ` Thiago Jung Bauermann
2019-07-13 6:00 ` [PATCH v2 07/13] powerpc/pseries/svm: Use shared memory for Debug Trace Log (DTL) Thiago Jung Bauermann
2019-07-13 6:00 ` Thiago Jung Bauermann
2019-07-13 6:00 ` [PATCH v2 08/13] powerpc/pseries/svm: Unshare all pages before kexecing a new kernel Thiago Jung Bauermann
2019-07-13 6:00 ` Thiago Jung Bauermann
2019-07-13 6:00 ` [PATCH v2 09/13] powerpc/pseries/svm: Export guest SVM status to user space via sysfs Thiago Jung Bauermann
2019-07-13 6:00 ` Thiago Jung Bauermann
2019-07-13 6:00 ` [PATCH v2 10/13] powerpc/pseries/svm: Disable doorbells in SVM guests Thiago Jung Bauermann
2019-07-13 6:00 ` Thiago Jung Bauermann
2019-07-13 6:00 ` Thiago Jung Bauermann [this message]
2019-07-13 6:00 ` [PATCH v2 11/13] powerpc/pseries/iommu: Don't use dma_iommu_ops on secure guests Thiago Jung Bauermann
2019-07-13 6:00 ` [PATCH v2 12/13] powerpc/pseries/svm: Force SWIOTLB for " Thiago Jung Bauermann
2019-07-13 6:00 ` Thiago Jung Bauermann
2019-07-13 6:00 ` [PATCH v2 13/13] powerpc/configs: Enable secure guest support in pseries and ppc64 defconfigs Thiago Jung Bauermann
2019-07-13 6:00 ` 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=20190713060023.8479-12-bauerman@linux.ibm.com \
--to=bauerman@linux.ibm.com \
--cc=aik@ozlabs.ru \
--cc=andmike@linux.ibm.com \
--cc=anshuman.linux@gmail.com \
--cc=cclaudio@linux.ibm.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=linuxram@us.ibm.com \
--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: link
Be 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.