From: Alexey Kardashevskiy <aik@ozlabs.ru> To: linuxppc-dev@lists.ozlabs.org Cc: Alexey Kardashevskiy <aik@ozlabs.ru>, David Gibson <david@gibson.dropbear.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Alex Williamson <alex.williamson@redhat.com>, Gavin Shan <gwshan@linux.vnet.ibm.com>, Wei Yang <weiyang@linux.vnet.ibm.com>, linux-kernel@vger.kernel.org Subject: [PATCH kernel v10 13/34] powerpc/powernv: Do not set "read" flag if direction==DMA_NONE Date: Tue, 12 May 2015 01:39:02 +1000 [thread overview] Message-ID: <1431358763-24371-14-git-send-email-aik@ozlabs.ru> (raw) In-Reply-To: <1431358763-24371-1-git-send-email-aik@ozlabs.ru> Normally a bitmap from the iommu_table is used to track what TCE entry is in use. Since we are going to use iommu_table without its locks and do xchg() instead, it becomes essential not to put bits which are not implied in the direction flag as the old TCE value (more precisely - the permission bits) will be used to decide whether to put the page or not. This adds iommu_direction_to_tce_perm() (its counterpart is there already) and uses it for powernv's pnv_tce_build(). Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> --- Changes: v9: * added comment why we must put only valid permission bits --- arch/powerpc/include/asm/iommu.h | 1 + arch/powerpc/kernel/iommu.c | 15 +++++++++++++++ arch/powerpc/platforms/powernv/pci.c | 7 +------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h index e94a5e3..d91bd69 100644 --- a/arch/powerpc/include/asm/iommu.h +++ b/arch/powerpc/include/asm/iommu.h @@ -200,6 +200,7 @@ extern int iommu_take_ownership(struct iommu_table *tbl); extern void iommu_release_ownership(struct iommu_table *tbl); extern enum dma_data_direction iommu_tce_direction(unsigned long tce); +extern unsigned long iommu_direction_to_tce_perm(enum dma_data_direction dir); #endif /* __KERNEL__ */ #endif /* _ASM_IOMMU_H */ diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c index 8673c94..31319f8 100644 --- a/arch/powerpc/kernel/iommu.c +++ b/arch/powerpc/kernel/iommu.c @@ -863,6 +863,21 @@ void iommu_free_coherent(struct iommu_table *tbl, size_t size, } } +unsigned long iommu_direction_to_tce_perm(enum dma_data_direction dir) +{ + switch (dir) { + case DMA_BIDIRECTIONAL: + return TCE_PCI_READ | TCE_PCI_WRITE; + case DMA_FROM_DEVICE: + return TCE_PCI_WRITE; + case DMA_TO_DEVICE: + return TCE_PCI_READ; + default: + return 0; + } +} +EXPORT_SYMBOL_GPL(iommu_direction_to_tce_perm); + #ifdef CONFIG_IOMMU_API /* * SPAPR TCE API diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c index bca2aeb..b7ea245 100644 --- a/arch/powerpc/platforms/powernv/pci.c +++ b/arch/powerpc/platforms/powernv/pci.c @@ -576,15 +576,10 @@ static int pnv_tce_build(struct iommu_table *tbl, long index, long npages, unsigned long uaddr, enum dma_data_direction direction, struct dma_attrs *attrs, bool rm) { - u64 proto_tce; + u64 proto_tce = iommu_direction_to_tce_perm(direction); __be64 *tcep, *tces; u64 rpn; - proto_tce = TCE_PCI_READ; // Read allowed - - if (direction != DMA_TO_DEVICE) - proto_tce |= TCE_PCI_WRITE; - tces = tcep = ((__be64 *)tbl->it_base) + index - tbl->it_offset; rpn = __pa(uaddr) >> tbl->it_page_shift; -- 2.4.0.rc3.8.gfb3e7d5
WARNING: multiple messages have this Message-ID (diff)
From: Alexey Kardashevskiy <aik@ozlabs.ru> To: linuxppc-dev@lists.ozlabs.org Cc: Wei Yang <weiyang@linux.vnet.ibm.com>, Alexey Kardashevskiy <aik@ozlabs.ru>, Gavin Shan <gwshan@linux.vnet.ibm.com>, linux-kernel@vger.kernel.org, Alex Williamson <alex.williamson@redhat.com>, Paul Mackerras <paulus@samba.org>, David Gibson <david@gibson.dropbear.id.au> Subject: [PATCH kernel v10 13/34] powerpc/powernv: Do not set "read" flag if direction==DMA_NONE Date: Tue, 12 May 2015 01:39:02 +1000 [thread overview] Message-ID: <1431358763-24371-14-git-send-email-aik@ozlabs.ru> (raw) In-Reply-To: <1431358763-24371-1-git-send-email-aik@ozlabs.ru> Normally a bitmap from the iommu_table is used to track what TCE entry is in use. Since we are going to use iommu_table without its locks and do xchg() instead, it becomes essential not to put bits which are not implied in the direction flag as the old TCE value (more precisely - the permission bits) will be used to decide whether to put the page or not. This adds iommu_direction_to_tce_perm() (its counterpart is there already) and uses it for powernv's pnv_tce_build(). Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> --- Changes: v9: * added comment why we must put only valid permission bits --- arch/powerpc/include/asm/iommu.h | 1 + arch/powerpc/kernel/iommu.c | 15 +++++++++++++++ arch/powerpc/platforms/powernv/pci.c | 7 +------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h index e94a5e3..d91bd69 100644 --- a/arch/powerpc/include/asm/iommu.h +++ b/arch/powerpc/include/asm/iommu.h @@ -200,6 +200,7 @@ extern int iommu_take_ownership(struct iommu_table *tbl); extern void iommu_release_ownership(struct iommu_table *tbl); extern enum dma_data_direction iommu_tce_direction(unsigned long tce); +extern unsigned long iommu_direction_to_tce_perm(enum dma_data_direction dir); #endif /* __KERNEL__ */ #endif /* _ASM_IOMMU_H */ diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c index 8673c94..31319f8 100644 --- a/arch/powerpc/kernel/iommu.c +++ b/arch/powerpc/kernel/iommu.c @@ -863,6 +863,21 @@ void iommu_free_coherent(struct iommu_table *tbl, size_t size, } } +unsigned long iommu_direction_to_tce_perm(enum dma_data_direction dir) +{ + switch (dir) { + case DMA_BIDIRECTIONAL: + return TCE_PCI_READ | TCE_PCI_WRITE; + case DMA_FROM_DEVICE: + return TCE_PCI_WRITE; + case DMA_TO_DEVICE: + return TCE_PCI_READ; + default: + return 0; + } +} +EXPORT_SYMBOL_GPL(iommu_direction_to_tce_perm); + #ifdef CONFIG_IOMMU_API /* * SPAPR TCE API diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c index bca2aeb..b7ea245 100644 --- a/arch/powerpc/platforms/powernv/pci.c +++ b/arch/powerpc/platforms/powernv/pci.c @@ -576,15 +576,10 @@ static int pnv_tce_build(struct iommu_table *tbl, long index, long npages, unsigned long uaddr, enum dma_data_direction direction, struct dma_attrs *attrs, bool rm) { - u64 proto_tce; + u64 proto_tce = iommu_direction_to_tce_perm(direction); __be64 *tcep, *tces; u64 rpn; - proto_tce = TCE_PCI_READ; // Read allowed - - if (direction != DMA_TO_DEVICE) - proto_tce |= TCE_PCI_WRITE; - tces = tcep = ((__be64 *)tbl->it_base) + index - tbl->it_offset; rpn = __pa(uaddr) >> tbl->it_page_shift; -- 2.4.0.rc3.8.gfb3e7d5
next prev parent reply other threads:[~2015-05-11 15:45 UTC|newest] Thread overview: 163+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-11 15:38 [PATCH kernel v10 00/34] powerpc/iommu/vfio: Enable Dynamic DMA windows Alexey Kardashevskiy 2015-05-11 15:38 ` Alexey Kardashevskiy 2015-05-11 15:38 ` [PATCH kernel v10 01/34] powerpc/eeh/ioda2: Use device::iommu_group to check IOMMU group Alexey Kardashevskiy 2015-05-11 15:38 ` Alexey Kardashevskiy 2015-05-12 1:51 ` Gavin Shan 2015-05-12 1:51 ` Gavin Shan 2015-05-11 15:38 ` [PATCH kernel v10 02/34] powerpc/iommu/powernv: Get rid of set_iommu_table_base_and_group Alexey Kardashevskiy 2015-05-11 15:38 ` Alexey Kardashevskiy 2015-05-13 5:18 ` Gavin Shan 2015-05-13 5:18 ` Gavin Shan 2015-05-13 7:26 ` Alexey Kardashevskiy 2015-05-13 7:26 ` Alexey Kardashevskiy 2015-05-11 15:38 ` [PATCH kernel v10 03/34] powerpc/powernv/ioda: Clean up IOMMU group registration Alexey Kardashevskiy 2015-05-11 15:38 ` Alexey Kardashevskiy 2015-05-13 5:21 ` Gavin Shan 2015-05-13 5:21 ` Gavin Shan 2015-05-11 15:38 ` [PATCH kernel v10 04/34] powerpc/iommu: Put IOMMU group explicitly Alexey Kardashevskiy 2015-05-11 15:38 ` Alexey Kardashevskiy 2015-05-13 5:27 ` Gavin Shan 2015-05-13 5:27 ` Gavin Shan 2015-05-11 15:38 ` [PATCH kernel v10 05/34] powerpc/iommu: Always release iommu_table in iommu_free_table() Alexey Kardashevskiy 2015-05-11 15:38 ` Alexey Kardashevskiy 2015-05-13 5:33 ` Gavin Shan 2015-05-13 5:33 ` Gavin Shan 2015-05-13 6:30 ` Alexey Kardashevskiy 2015-05-13 6:30 ` Alexey Kardashevskiy 2015-05-13 12:51 ` Thomas Huth 2015-05-13 12:51 ` Thomas Huth 2015-05-13 23:27 ` Gavin Shan 2015-05-13 23:27 ` Gavin Shan 2015-05-14 2:34 ` Alexey Kardashevskiy 2015-05-14 2:53 ` Alex Williamson 2015-05-14 2:53 ` Alex Williamson 2015-05-14 6:29 ` Alexey Kardashevskiy 2015-05-14 6:29 ` Alexey Kardashevskiy 2015-05-11 15:38 ` [PATCH kernel v10 06/34] vfio: powerpc/spapr: Move page pinning from arch code to VFIO IOMMU driver Alexey Kardashevskiy 2015-05-11 15:38 ` Alexey Kardashevskiy 2015-05-13 5:58 ` Gavin Shan 2015-05-13 5:58 ` Gavin Shan 2015-05-13 6:32 ` Alexey Kardashevskiy 2015-05-13 6:32 ` Alexey Kardashevskiy 2015-05-11 15:38 ` [PATCH kernel v10 07/34] vfio: powerpc/spapr: Check that IOMMU page is fully contained by system page Alexey Kardashevskiy 2015-05-11 15:38 ` Alexey Kardashevskiy 2015-05-13 6:06 ` Gavin Shan 2015-05-13 6:06 ` Gavin Shan 2015-05-11 15:38 ` [PATCH kernel v10 08/34] vfio: powerpc/spapr: Use it_page_size Alexey Kardashevskiy 2015-05-11 15:38 ` Alexey Kardashevskiy 2015-05-13 6:12 ` Gavin Shan 2015-05-13 6:12 ` Gavin Shan 2015-05-11 15:38 ` [PATCH kernel v10 09/34] vfio: powerpc/spapr: Move locked_vm accounting to helpers Alexey Kardashevskiy 2015-05-11 15:38 ` Alexey Kardashevskiy 2015-05-13 6:18 ` Gavin Shan 2015-05-13 6:18 ` Gavin Shan 2015-05-11 15:38 ` [PATCH kernel v10 10/34] vfio: powerpc/spapr: Disable DMA mappings on disabled container Alexey Kardashevskiy 2015-05-11 15:38 ` Alexey Kardashevskiy 2015-05-13 6:20 ` Gavin Shan 2015-05-13 6:20 ` Gavin Shan 2015-05-11 15:39 ` [PATCH kernel v10 11/34] vfio: powerpc/spapr: Moving pinning/unpinning to helpers Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-13 6:32 ` Gavin Shan 2015-05-13 6:32 ` Gavin Shan 2015-05-13 7:30 ` Alexey Kardashevskiy 2015-05-13 7:30 ` Alexey Kardashevskiy 2015-05-11 15:39 ` [PATCH kernel v10 12/34] vfio: powerpc/spapr: Rework groups attaching Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-13 23:35 ` Gavin Shan 2015-05-13 23:35 ` Gavin Shan 2015-05-11 15:39 ` Alexey Kardashevskiy [this message] 2015-05-11 15:39 ` [PATCH kernel v10 13/34] powerpc/powernv: Do not set "read" flag if direction==DMA_NONE Alexey Kardashevskiy 2015-05-14 0:00 ` Gavin Shan 2015-05-14 0:00 ` Gavin Shan 2015-05-14 2:51 ` Alexey Kardashevskiy 2015-05-14 2:51 ` Alexey Kardashevskiy 2015-05-11 15:39 ` [PATCH kernel v10 14/34] powerpc/iommu: Move tce_xxx callbacks from ppc_md to iommu_table Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-14 0:23 ` Gavin Shan 2015-05-14 0:23 ` Gavin Shan 2015-05-14 3:07 ` Alexey Kardashevskiy 2015-05-14 3:07 ` Alexey Kardashevskiy 2015-05-11 15:39 ` [PATCH kernel v10 15/34] powerpc/powernv/ioda/ioda2: Rework TCE invalidation in tce_build()/tce_free() Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-14 0:48 ` Gavin Shan 2015-05-14 0:48 ` Gavin Shan 2015-05-14 3:19 ` Alexey Kardashevskiy 2015-05-14 3:19 ` Alexey Kardashevskiy 2015-05-11 15:39 ` [PATCH kernel v10 16/34] powerpc/spapr: vfio: Replace iommu_table with iommu_table_group Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-13 21:30 ` Alex Williamson 2015-05-13 21:30 ` Alex Williamson 2015-05-14 1:21 ` Gavin Shan 2015-05-14 1:21 ` Gavin Shan 2015-05-14 3:31 ` Alexey Kardashevskiy 2015-05-14 3:31 ` Alexey Kardashevskiy 2015-05-11 15:39 ` [PATCH kernel v10 17/34] powerpc/spapr: vfio: Switch from iommu_table to new iommu_table_group Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-14 1:52 ` Gavin Shan 2015-05-14 1:52 ` Gavin Shan 2015-05-11 15:39 ` [PATCH kernel v10 18/34] vfio: powerpc/spapr/iommu/powernv/ioda2: Rework IOMMU ownership control Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-14 2:01 ` Gavin Shan 2015-05-14 2:01 ` Gavin Shan 2015-05-11 15:39 ` [PATCH kernel v10 19/34] powerpc/iommu: Fix IOMMU ownership control functions Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-14 3:36 ` Gavin Shan 2015-05-14 3:36 ` Gavin Shan 2015-05-11 15:39 ` [PATCH kernel v10 20/34] powerpc/powernv/ioda2: Move TCE kill register address to PE Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-14 2:10 ` Gavin Shan 2015-05-14 2:10 ` Gavin Shan 2015-05-14 3:39 ` Alexey Kardashevskiy 2015-05-14 3:39 ` Alexey Kardashevskiy 2015-05-11 15:39 ` [PATCH kernel v10 21/34] powerpc/powernv/ioda2: Add TCE invalidation for all attached groups Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-14 2:22 ` Gavin Shan 2015-05-14 2:22 ` Gavin Shan 2015-05-14 3:50 ` Alexey Kardashevskiy 2015-05-14 3:50 ` Alexey Kardashevskiy 2015-05-11 15:39 ` [PATCH kernel v10 22/34] powerpc/powernv: Implement accessor to TCE entry Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-14 2:34 ` Gavin Shan 2015-05-14 2:34 ` Gavin Shan 2015-05-11 15:39 ` [PATCH kernel v10 23/34] powerpc/iommu/powernv: Release replaced TCE Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-13 15:00 ` Thomas Huth 2015-05-13 15:00 ` Thomas Huth 2015-05-14 3:53 ` Alexey Kardashevskiy 2015-05-14 3:53 ` Alexey Kardashevskiy 2015-05-15 8:09 ` Thomas Huth 2015-05-15 8:09 ` Thomas Huth 2015-05-11 15:39 ` [PATCH kernel v10 24/34] powerpc/powernv/ioda2: Rework iommu_table creation Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-14 4:14 ` Gavin Shan 2015-05-14 4:14 ` Gavin Shan 2015-05-11 15:39 ` [PATCH kernel v10 25/34] powerpc/powernv/ioda2: Introduce helpers to allocate TCE pages Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-14 4:31 ` Gavin Shan 2015-05-14 4:31 ` Gavin Shan 2015-05-11 15:39 ` [PATCH kernel v10 26/34] powerpc/powernv/ioda2: Introduce pnv_pci_ioda2_set_window Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-14 5:01 ` Gavin Shan 2015-05-14 5:01 ` Gavin Shan 2015-05-11 15:39 ` [PATCH kernel v10 27/34] powerpc/powernv: Implement multilevel TCE tables Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-11 15:39 ` [PATCH kernel v10 28/34] vfio: powerpc/spapr: powerpc/powernv/ioda: Define and implement DMA windows API Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-13 21:30 ` Alex Williamson 2015-05-13 21:30 ` Alex Williamson 2015-05-11 15:39 ` [PATCH kernel v10 29/34] powerpc/powernv/ioda2: Use new helpers to do proper cleanup on PE release Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-11 15:39 ` [PATCH kernel v10 30/34] powerpc/iommu/ioda2: Add get_table_size() to calculate the size of future table Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-11 15:39 ` [PATCH kernel v10 31/34] vfio: powerpc/spapr: powerpc/powernv/ioda2: Use DMA windows API in ownership control Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-11 15:39 ` [PATCH kernel v10 32/34] powerpc/mmu: Add userspace-to-physical addresses translation cache Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-11 15:39 ` [PATCH kernel v10 33/34] vfio: powerpc/spapr: Register memory and define IOMMU v2 Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy 2015-05-13 21:30 ` Alex Williamson 2015-05-13 21:30 ` Alex Williamson 2015-05-14 6:08 ` Alexey Kardashevskiy 2015-05-14 6:08 ` Alexey Kardashevskiy 2015-05-11 15:39 ` [PATCH kernel v10 34/34] vfio: powerpc/spapr: Support Dynamic DMA windows Alexey Kardashevskiy 2015-05-11 15:39 ` Alexey Kardashevskiy
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=1431358763-24371-14-git-send-email-aik@ozlabs.ru \ --to=aik@ozlabs.ru \ --cc=alex.williamson@redhat.com \ --cc=benh@kernel.crashing.org \ --cc=david@gibson.dropbear.id.au \ --cc=gwshan@linux.vnet.ibm.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=paulus@samba.org \ --cc=weiyang@linux.vnet.ibm.com \ /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.