From: Tycho Andersen <tycho@docker.com>
To: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, kernel-hardening@lists.openwall.com,
Marco Benatto <marco.antonio.780@gmail.com>,
Juerg Haefliger <juerg.haefliger@canonical.com>,
Tycho Andersen <tycho@docker.com>,
linux-arm-kernel@lists.infradead.org, x86@kernel.org
Subject: [kernel-hardening] [PATCH v6 10/11] mm: add a user_virt_to_phys symbol
Date: Thu, 7 Sep 2017 11:36:08 -0600 [thread overview]
Message-ID: <20170907173609.22696-11-tycho@docker.com> (raw)
In-Reply-To: <20170907173609.22696-1-tycho@docker.com>
We need someting like this for testing XPFO. Since it's architecture
specific, putting it in the test code is slightly awkward, so let's make it
an arch-specific symbol and export it for use in LKDTM.
v6: * add a definition of user_virt_to_phys in the !CONFIG_XPFO case
CC: linux-arm-kernel@lists.infradead.org
CC: x86@kernel.org
Signed-off-by: Tycho Andersen <tycho@docker.com>
Tested-by: Marco Benatto <marco.antonio.780@gmail.com>
---
arch/arm64/mm/xpfo.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++
arch/x86/mm/xpfo.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/xpfo.h | 5 +++++
3 files changed, 113 insertions(+)
diff --git a/arch/arm64/mm/xpfo.c b/arch/arm64/mm/xpfo.c
index 342a9ccb93c1..94a667d94e15 100644
--- a/arch/arm64/mm/xpfo.c
+++ b/arch/arm64/mm/xpfo.c
@@ -74,3 +74,54 @@ void xpfo_dma_map_unmap_area(bool map, const void *addr, size_t size,
xpfo_temp_unmap(addr, size, mapping, sizeof(mapping[0]) * num_pages);
}
+
+/* Convert a user space virtual address to a physical address.
+ * Shamelessly copied from slow_virt_to_phys() and lookup_address() in
+ * arch/x86/mm/pageattr.c
+ */
+phys_addr_t user_virt_to_phys(unsigned long addr)
+{
+ phys_addr_t phys_addr;
+ unsigned long offset;
+ pgd_t *pgd;
+ p4d_t *p4d;
+ pud_t *pud;
+ pmd_t *pmd;
+ pte_t *pte;
+
+ pgd = pgd_offset(current->mm, addr);
+ if (pgd_none(*pgd))
+ return 0;
+
+ p4d = p4d_offset(pgd, addr);
+ if (p4d_none(*p4d))
+ return 0;
+
+ pud = pud_offset(p4d, addr);
+ if (pud_none(*pud))
+ return 0;
+
+ if (pud_sect(*pud) || !pud_present(*pud)) {
+ phys_addr = (unsigned long)pud_pfn(*pud) << PAGE_SHIFT;
+ offset = addr & ~PUD_MASK;
+ goto out;
+ }
+
+ pmd = pmd_offset(pud, addr);
+ if (pmd_none(*pmd))
+ return 0;
+
+ if (pmd_sect(*pmd) || !pmd_present(*pmd)) {
+ phys_addr = (unsigned long)pmd_pfn(*pmd) << PAGE_SHIFT;
+ offset = addr & ~PMD_MASK;
+ goto out;
+ }
+
+ pte = pte_offset_kernel(pmd, addr);
+ phys_addr = (phys_addr_t)pte_pfn(*pte) << PAGE_SHIFT;
+ offset = addr & ~PAGE_MASK;
+
+out:
+ return (phys_addr_t)(phys_addr | offset);
+}
+EXPORT_SYMBOL(user_virt_to_phys);
diff --git a/arch/x86/mm/xpfo.c b/arch/x86/mm/xpfo.c
index 6794d6724ab5..d24cf2c600e8 100644
--- a/arch/x86/mm/xpfo.c
+++ b/arch/x86/mm/xpfo.c
@@ -112,3 +112,60 @@ inline void xpfo_flush_kernel_tlb(struct page *page, int order)
flush_tlb_kernel_range(kaddr, kaddr + (1 << order) * size);
}
+
+/* Convert a user space virtual address to a physical address.
+ * Shamelessly copied from slow_virt_to_phys() and lookup_address() in
+ * arch/x86/mm/pageattr.c
+ */
+phys_addr_t user_virt_to_phys(unsigned long addr)
+{
+ phys_addr_t phys_addr;
+ unsigned long offset;
+ pgd_t *pgd;
+ p4d_t *p4d;
+ pud_t *pud;
+ pmd_t *pmd;
+ pte_t *pte;
+
+ pgd = pgd_offset(current->mm, addr);
+ if (pgd_none(*pgd))
+ return 0;
+
+ p4d = p4d_offset(pgd, addr);
+ if (p4d_none(*p4d))
+ return 0;
+
+ if (p4d_large(*p4d) || !p4d_present(*p4d)) {
+ phys_addr = (unsigned long)p4d_pfn(*p4d) << PAGE_SHIFT;
+ offset = addr & ~P4D_MASK;
+ goto out;
+ }
+
+ pud = pud_offset(p4d, addr);
+ if (pud_none(*pud))
+ return 0;
+
+ if (pud_large(*pud) || !pud_present(*pud)) {
+ phys_addr = (unsigned long)pud_pfn(*pud) << PAGE_SHIFT;
+ offset = addr & ~PUD_MASK;
+ goto out;
+ }
+
+ pmd = pmd_offset(pud, addr);
+ if (pmd_none(*pmd))
+ return 0;
+
+ if (pmd_large(*pmd) || !pmd_present(*pmd)) {
+ phys_addr = (unsigned long)pmd_pfn(*pmd) << PAGE_SHIFT;
+ offset = addr & ~PMD_MASK;
+ goto out;
+ }
+
+ pte = pte_offset_kernel(pmd, addr);
+ phys_addr = (phys_addr_t)pte_pfn(*pte) << PAGE_SHIFT;
+ offset = addr & ~PAGE_MASK;
+
+out:
+ return (phys_addr_t)(phys_addr | offset);
+}
+EXPORT_SYMBOL(user_virt_to_phys);
diff --git a/include/linux/xpfo.h b/include/linux/xpfo.h
index 1693af1a0293..be72da5fba26 100644
--- a/include/linux/xpfo.h
+++ b/include/linux/xpfo.h
@@ -19,6 +19,7 @@
#ifdef CONFIG_XPFO
#include <linux/dma-mapping.h>
+#include <linux/types.h>
extern struct page_ext_operations page_xpfo_ops;
@@ -45,6 +46,8 @@ void xpfo_temp_unmap(const void *addr, size_t size, void **mapping,
bool xpfo_enabled(void);
+phys_addr_t user_virt_to_phys(unsigned long addr);
+
#else /* !CONFIG_XPFO */
static inline void xpfo_kmap(void *kaddr, struct page *page) { }
@@ -69,6 +72,8 @@ static inline void xpfo_temp_unmap(const void *addr, size_t size,
static inline bool xpfo_enabled(void) { return false; }
+static inline phys_addr_t user_virt_to_phys(unsigned long addr) { return 0; }
+
#endif /* CONFIG_XPFO */
#endif /* _LINUX_XPFO_H */
--
2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: tycho@docker.com (Tycho Andersen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 10/11] mm: add a user_virt_to_phys symbol
Date: Thu, 7 Sep 2017 11:36:08 -0600 [thread overview]
Message-ID: <20170907173609.22696-11-tycho@docker.com> (raw)
In-Reply-To: <20170907173609.22696-1-tycho@docker.com>
We need someting like this for testing XPFO. Since it's architecture
specific, putting it in the test code is slightly awkward, so let's make it
an arch-specific symbol and export it for use in LKDTM.
v6: * add a definition of user_virt_to_phys in the !CONFIG_XPFO case
CC: linux-arm-kernel at lists.infradead.org
CC: x86 at kernel.org
Signed-off-by: Tycho Andersen <tycho@docker.com>
Tested-by: Marco Benatto <marco.antonio.780@gmail.com>
---
arch/arm64/mm/xpfo.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++
arch/x86/mm/xpfo.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/xpfo.h | 5 +++++
3 files changed, 113 insertions(+)
diff --git a/arch/arm64/mm/xpfo.c b/arch/arm64/mm/xpfo.c
index 342a9ccb93c1..94a667d94e15 100644
--- a/arch/arm64/mm/xpfo.c
+++ b/arch/arm64/mm/xpfo.c
@@ -74,3 +74,54 @@ void xpfo_dma_map_unmap_area(bool map, const void *addr, size_t size,
xpfo_temp_unmap(addr, size, mapping, sizeof(mapping[0]) * num_pages);
}
+
+/* Convert a user space virtual address to a physical address.
+ * Shamelessly copied from slow_virt_to_phys() and lookup_address() in
+ * arch/x86/mm/pageattr.c
+ */
+phys_addr_t user_virt_to_phys(unsigned long addr)
+{
+ phys_addr_t phys_addr;
+ unsigned long offset;
+ pgd_t *pgd;
+ p4d_t *p4d;
+ pud_t *pud;
+ pmd_t *pmd;
+ pte_t *pte;
+
+ pgd = pgd_offset(current->mm, addr);
+ if (pgd_none(*pgd))
+ return 0;
+
+ p4d = p4d_offset(pgd, addr);
+ if (p4d_none(*p4d))
+ return 0;
+
+ pud = pud_offset(p4d, addr);
+ if (pud_none(*pud))
+ return 0;
+
+ if (pud_sect(*pud) || !pud_present(*pud)) {
+ phys_addr = (unsigned long)pud_pfn(*pud) << PAGE_SHIFT;
+ offset = addr & ~PUD_MASK;
+ goto out;
+ }
+
+ pmd = pmd_offset(pud, addr);
+ if (pmd_none(*pmd))
+ return 0;
+
+ if (pmd_sect(*pmd) || !pmd_present(*pmd)) {
+ phys_addr = (unsigned long)pmd_pfn(*pmd) << PAGE_SHIFT;
+ offset = addr & ~PMD_MASK;
+ goto out;
+ }
+
+ pte = pte_offset_kernel(pmd, addr);
+ phys_addr = (phys_addr_t)pte_pfn(*pte) << PAGE_SHIFT;
+ offset = addr & ~PAGE_MASK;
+
+out:
+ return (phys_addr_t)(phys_addr | offset);
+}
+EXPORT_SYMBOL(user_virt_to_phys);
diff --git a/arch/x86/mm/xpfo.c b/arch/x86/mm/xpfo.c
index 6794d6724ab5..d24cf2c600e8 100644
--- a/arch/x86/mm/xpfo.c
+++ b/arch/x86/mm/xpfo.c
@@ -112,3 +112,60 @@ inline void xpfo_flush_kernel_tlb(struct page *page, int order)
flush_tlb_kernel_range(kaddr, kaddr + (1 << order) * size);
}
+
+/* Convert a user space virtual address to a physical address.
+ * Shamelessly copied from slow_virt_to_phys() and lookup_address() in
+ * arch/x86/mm/pageattr.c
+ */
+phys_addr_t user_virt_to_phys(unsigned long addr)
+{
+ phys_addr_t phys_addr;
+ unsigned long offset;
+ pgd_t *pgd;
+ p4d_t *p4d;
+ pud_t *pud;
+ pmd_t *pmd;
+ pte_t *pte;
+
+ pgd = pgd_offset(current->mm, addr);
+ if (pgd_none(*pgd))
+ return 0;
+
+ p4d = p4d_offset(pgd, addr);
+ if (p4d_none(*p4d))
+ return 0;
+
+ if (p4d_large(*p4d) || !p4d_present(*p4d)) {
+ phys_addr = (unsigned long)p4d_pfn(*p4d) << PAGE_SHIFT;
+ offset = addr & ~P4D_MASK;
+ goto out;
+ }
+
+ pud = pud_offset(p4d, addr);
+ if (pud_none(*pud))
+ return 0;
+
+ if (pud_large(*pud) || !pud_present(*pud)) {
+ phys_addr = (unsigned long)pud_pfn(*pud) << PAGE_SHIFT;
+ offset = addr & ~PUD_MASK;
+ goto out;
+ }
+
+ pmd = pmd_offset(pud, addr);
+ if (pmd_none(*pmd))
+ return 0;
+
+ if (pmd_large(*pmd) || !pmd_present(*pmd)) {
+ phys_addr = (unsigned long)pmd_pfn(*pmd) << PAGE_SHIFT;
+ offset = addr & ~PMD_MASK;
+ goto out;
+ }
+
+ pte = pte_offset_kernel(pmd, addr);
+ phys_addr = (phys_addr_t)pte_pfn(*pte) << PAGE_SHIFT;
+ offset = addr & ~PAGE_MASK;
+
+out:
+ return (phys_addr_t)(phys_addr | offset);
+}
+EXPORT_SYMBOL(user_virt_to_phys);
diff --git a/include/linux/xpfo.h b/include/linux/xpfo.h
index 1693af1a0293..be72da5fba26 100644
--- a/include/linux/xpfo.h
+++ b/include/linux/xpfo.h
@@ -19,6 +19,7 @@
#ifdef CONFIG_XPFO
#include <linux/dma-mapping.h>
+#include <linux/types.h>
extern struct page_ext_operations page_xpfo_ops;
@@ -45,6 +46,8 @@ void xpfo_temp_unmap(const void *addr, size_t size, void **mapping,
bool xpfo_enabled(void);
+phys_addr_t user_virt_to_phys(unsigned long addr);
+
#else /* !CONFIG_XPFO */
static inline void xpfo_kmap(void *kaddr, struct page *page) { }
@@ -69,6 +72,8 @@ static inline void xpfo_temp_unmap(const void *addr, size_t size,
static inline bool xpfo_enabled(void) { return false; }
+static inline phys_addr_t user_virt_to_phys(unsigned long addr) { return 0; }
+
#endif /* CONFIG_XPFO */
#endif /* _LINUX_XPFO_H */
--
2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Tycho Andersen <tycho@docker.com>
To: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, kernel-hardening@lists.openwall.com,
Marco Benatto <marco.antonio.780@gmail.com>,
Juerg Haefliger <juerg.haefliger@canonical.com>,
Tycho Andersen <tycho@docker.com>,
linux-arm-kernel@lists.infradead.org, x86@kernel.org
Subject: [PATCH v6 10/11] mm: add a user_virt_to_phys symbol
Date: Thu, 7 Sep 2017 11:36:08 -0600 [thread overview]
Message-ID: <20170907173609.22696-11-tycho@docker.com> (raw)
In-Reply-To: <20170907173609.22696-1-tycho@docker.com>
We need someting like this for testing XPFO. Since it's architecture
specific, putting it in the test code is slightly awkward, so let's make it
an arch-specific symbol and export it for use in LKDTM.
v6: * add a definition of user_virt_to_phys in the !CONFIG_XPFO case
CC: linux-arm-kernel@lists.infradead.org
CC: x86@kernel.org
Signed-off-by: Tycho Andersen <tycho@docker.com>
Tested-by: Marco Benatto <marco.antonio.780@gmail.com>
---
arch/arm64/mm/xpfo.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++
arch/x86/mm/xpfo.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/xpfo.h | 5 +++++
3 files changed, 113 insertions(+)
diff --git a/arch/arm64/mm/xpfo.c b/arch/arm64/mm/xpfo.c
index 342a9ccb93c1..94a667d94e15 100644
--- a/arch/arm64/mm/xpfo.c
+++ b/arch/arm64/mm/xpfo.c
@@ -74,3 +74,54 @@ void xpfo_dma_map_unmap_area(bool map, const void *addr, size_t size,
xpfo_temp_unmap(addr, size, mapping, sizeof(mapping[0]) * num_pages);
}
+
+/* Convert a user space virtual address to a physical address.
+ * Shamelessly copied from slow_virt_to_phys() and lookup_address() in
+ * arch/x86/mm/pageattr.c
+ */
+phys_addr_t user_virt_to_phys(unsigned long addr)
+{
+ phys_addr_t phys_addr;
+ unsigned long offset;
+ pgd_t *pgd;
+ p4d_t *p4d;
+ pud_t *pud;
+ pmd_t *pmd;
+ pte_t *pte;
+
+ pgd = pgd_offset(current->mm, addr);
+ if (pgd_none(*pgd))
+ return 0;
+
+ p4d = p4d_offset(pgd, addr);
+ if (p4d_none(*p4d))
+ return 0;
+
+ pud = pud_offset(p4d, addr);
+ if (pud_none(*pud))
+ return 0;
+
+ if (pud_sect(*pud) || !pud_present(*pud)) {
+ phys_addr = (unsigned long)pud_pfn(*pud) << PAGE_SHIFT;
+ offset = addr & ~PUD_MASK;
+ goto out;
+ }
+
+ pmd = pmd_offset(pud, addr);
+ if (pmd_none(*pmd))
+ return 0;
+
+ if (pmd_sect(*pmd) || !pmd_present(*pmd)) {
+ phys_addr = (unsigned long)pmd_pfn(*pmd) << PAGE_SHIFT;
+ offset = addr & ~PMD_MASK;
+ goto out;
+ }
+
+ pte = pte_offset_kernel(pmd, addr);
+ phys_addr = (phys_addr_t)pte_pfn(*pte) << PAGE_SHIFT;
+ offset = addr & ~PAGE_MASK;
+
+out:
+ return (phys_addr_t)(phys_addr | offset);
+}
+EXPORT_SYMBOL(user_virt_to_phys);
diff --git a/arch/x86/mm/xpfo.c b/arch/x86/mm/xpfo.c
index 6794d6724ab5..d24cf2c600e8 100644
--- a/arch/x86/mm/xpfo.c
+++ b/arch/x86/mm/xpfo.c
@@ -112,3 +112,60 @@ inline void xpfo_flush_kernel_tlb(struct page *page, int order)
flush_tlb_kernel_range(kaddr, kaddr + (1 << order) * size);
}
+
+/* Convert a user space virtual address to a physical address.
+ * Shamelessly copied from slow_virt_to_phys() and lookup_address() in
+ * arch/x86/mm/pageattr.c
+ */
+phys_addr_t user_virt_to_phys(unsigned long addr)
+{
+ phys_addr_t phys_addr;
+ unsigned long offset;
+ pgd_t *pgd;
+ p4d_t *p4d;
+ pud_t *pud;
+ pmd_t *pmd;
+ pte_t *pte;
+
+ pgd = pgd_offset(current->mm, addr);
+ if (pgd_none(*pgd))
+ return 0;
+
+ p4d = p4d_offset(pgd, addr);
+ if (p4d_none(*p4d))
+ return 0;
+
+ if (p4d_large(*p4d) || !p4d_present(*p4d)) {
+ phys_addr = (unsigned long)p4d_pfn(*p4d) << PAGE_SHIFT;
+ offset = addr & ~P4D_MASK;
+ goto out;
+ }
+
+ pud = pud_offset(p4d, addr);
+ if (pud_none(*pud))
+ return 0;
+
+ if (pud_large(*pud) || !pud_present(*pud)) {
+ phys_addr = (unsigned long)pud_pfn(*pud) << PAGE_SHIFT;
+ offset = addr & ~PUD_MASK;
+ goto out;
+ }
+
+ pmd = pmd_offset(pud, addr);
+ if (pmd_none(*pmd))
+ return 0;
+
+ if (pmd_large(*pmd) || !pmd_present(*pmd)) {
+ phys_addr = (unsigned long)pmd_pfn(*pmd) << PAGE_SHIFT;
+ offset = addr & ~PMD_MASK;
+ goto out;
+ }
+
+ pte = pte_offset_kernel(pmd, addr);
+ phys_addr = (phys_addr_t)pte_pfn(*pte) << PAGE_SHIFT;
+ offset = addr & ~PAGE_MASK;
+
+out:
+ return (phys_addr_t)(phys_addr | offset);
+}
+EXPORT_SYMBOL(user_virt_to_phys);
diff --git a/include/linux/xpfo.h b/include/linux/xpfo.h
index 1693af1a0293..be72da5fba26 100644
--- a/include/linux/xpfo.h
+++ b/include/linux/xpfo.h
@@ -19,6 +19,7 @@
#ifdef CONFIG_XPFO
#include <linux/dma-mapping.h>
+#include <linux/types.h>
extern struct page_ext_operations page_xpfo_ops;
@@ -45,6 +46,8 @@ void xpfo_temp_unmap(const void *addr, size_t size, void **mapping,
bool xpfo_enabled(void);
+phys_addr_t user_virt_to_phys(unsigned long addr);
+
#else /* !CONFIG_XPFO */
static inline void xpfo_kmap(void *kaddr, struct page *page) { }
@@ -69,6 +72,8 @@ static inline void xpfo_temp_unmap(const void *addr, size_t size,
static inline bool xpfo_enabled(void) { return false; }
+static inline phys_addr_t user_virt_to_phys(unsigned long addr) { return 0; }
+
#endif /* CONFIG_XPFO */
#endif /* _LINUX_XPFO_H */
--
2.11.0
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: Tycho Andersen <tycho@docker.com>
To: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, kernel-hardening@lists.openwall.com,
Marco Benatto <marco.antonio.780@gmail.com>,
Juerg Haefliger <juerg.haefliger@canonical.com>,
Tycho Andersen <tycho@docker.com>,
linux-arm-kernel@lists.infradead.org, x86@kernel.org
Subject: [PATCH v6 10/11] mm: add a user_virt_to_phys symbol
Date: Thu, 7 Sep 2017 11:36:08 -0600 [thread overview]
Message-ID: <20170907173609.22696-11-tycho@docker.com> (raw)
In-Reply-To: <20170907173609.22696-1-tycho@docker.com>
We need someting like this for testing XPFO. Since it's architecture
specific, putting it in the test code is slightly awkward, so let's make it
an arch-specific symbol and export it for use in LKDTM.
v6: * add a definition of user_virt_to_phys in the !CONFIG_XPFO case
CC: linux-arm-kernel@lists.infradead.org
CC: x86@kernel.org
Signed-off-by: Tycho Andersen <tycho@docker.com>
Tested-by: Marco Benatto <marco.antonio.780@gmail.com>
---
arch/arm64/mm/xpfo.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++
arch/x86/mm/xpfo.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/xpfo.h | 5 +++++
3 files changed, 113 insertions(+)
diff --git a/arch/arm64/mm/xpfo.c b/arch/arm64/mm/xpfo.c
index 342a9ccb93c1..94a667d94e15 100644
--- a/arch/arm64/mm/xpfo.c
+++ b/arch/arm64/mm/xpfo.c
@@ -74,3 +74,54 @@ void xpfo_dma_map_unmap_area(bool map, const void *addr, size_t size,
xpfo_temp_unmap(addr, size, mapping, sizeof(mapping[0]) * num_pages);
}
+
+/* Convert a user space virtual address to a physical address.
+ * Shamelessly copied from slow_virt_to_phys() and lookup_address() in
+ * arch/x86/mm/pageattr.c
+ */
+phys_addr_t user_virt_to_phys(unsigned long addr)
+{
+ phys_addr_t phys_addr;
+ unsigned long offset;
+ pgd_t *pgd;
+ p4d_t *p4d;
+ pud_t *pud;
+ pmd_t *pmd;
+ pte_t *pte;
+
+ pgd = pgd_offset(current->mm, addr);
+ if (pgd_none(*pgd))
+ return 0;
+
+ p4d = p4d_offset(pgd, addr);
+ if (p4d_none(*p4d))
+ return 0;
+
+ pud = pud_offset(p4d, addr);
+ if (pud_none(*pud))
+ return 0;
+
+ if (pud_sect(*pud) || !pud_present(*pud)) {
+ phys_addr = (unsigned long)pud_pfn(*pud) << PAGE_SHIFT;
+ offset = addr & ~PUD_MASK;
+ goto out;
+ }
+
+ pmd = pmd_offset(pud, addr);
+ if (pmd_none(*pmd))
+ return 0;
+
+ if (pmd_sect(*pmd) || !pmd_present(*pmd)) {
+ phys_addr = (unsigned long)pmd_pfn(*pmd) << PAGE_SHIFT;
+ offset = addr & ~PMD_MASK;
+ goto out;
+ }
+
+ pte = pte_offset_kernel(pmd, addr);
+ phys_addr = (phys_addr_t)pte_pfn(*pte) << PAGE_SHIFT;
+ offset = addr & ~PAGE_MASK;
+
+out:
+ return (phys_addr_t)(phys_addr | offset);
+}
+EXPORT_SYMBOL(user_virt_to_phys);
diff --git a/arch/x86/mm/xpfo.c b/arch/x86/mm/xpfo.c
index 6794d6724ab5..d24cf2c600e8 100644
--- a/arch/x86/mm/xpfo.c
+++ b/arch/x86/mm/xpfo.c
@@ -112,3 +112,60 @@ inline void xpfo_flush_kernel_tlb(struct page *page, int order)
flush_tlb_kernel_range(kaddr, kaddr + (1 << order) * size);
}
+
+/* Convert a user space virtual address to a physical address.
+ * Shamelessly copied from slow_virt_to_phys() and lookup_address() in
+ * arch/x86/mm/pageattr.c
+ */
+phys_addr_t user_virt_to_phys(unsigned long addr)
+{
+ phys_addr_t phys_addr;
+ unsigned long offset;
+ pgd_t *pgd;
+ p4d_t *p4d;
+ pud_t *pud;
+ pmd_t *pmd;
+ pte_t *pte;
+
+ pgd = pgd_offset(current->mm, addr);
+ if (pgd_none(*pgd))
+ return 0;
+
+ p4d = p4d_offset(pgd, addr);
+ if (p4d_none(*p4d))
+ return 0;
+
+ if (p4d_large(*p4d) || !p4d_present(*p4d)) {
+ phys_addr = (unsigned long)p4d_pfn(*p4d) << PAGE_SHIFT;
+ offset = addr & ~P4D_MASK;
+ goto out;
+ }
+
+ pud = pud_offset(p4d, addr);
+ if (pud_none(*pud))
+ return 0;
+
+ if (pud_large(*pud) || !pud_present(*pud)) {
+ phys_addr = (unsigned long)pud_pfn(*pud) << PAGE_SHIFT;
+ offset = addr & ~PUD_MASK;
+ goto out;
+ }
+
+ pmd = pmd_offset(pud, addr);
+ if (pmd_none(*pmd))
+ return 0;
+
+ if (pmd_large(*pmd) || !pmd_present(*pmd)) {
+ phys_addr = (unsigned long)pmd_pfn(*pmd) << PAGE_SHIFT;
+ offset = addr & ~PMD_MASK;
+ goto out;
+ }
+
+ pte = pte_offset_kernel(pmd, addr);
+ phys_addr = (phys_addr_t)pte_pfn(*pte) << PAGE_SHIFT;
+ offset = addr & ~PAGE_MASK;
+
+out:
+ return (phys_addr_t)(phys_addr | offset);
+}
+EXPORT_SYMBOL(user_virt_to_phys);
diff --git a/include/linux/xpfo.h b/include/linux/xpfo.h
index 1693af1a0293..be72da5fba26 100644
--- a/include/linux/xpfo.h
+++ b/include/linux/xpfo.h
@@ -19,6 +19,7 @@
#ifdef CONFIG_XPFO
#include <linux/dma-mapping.h>
+#include <linux/types.h>
extern struct page_ext_operations page_xpfo_ops;
@@ -45,6 +46,8 @@ void xpfo_temp_unmap(const void *addr, size_t size, void **mapping,
bool xpfo_enabled(void);
+phys_addr_t user_virt_to_phys(unsigned long addr);
+
#else /* !CONFIG_XPFO */
static inline void xpfo_kmap(void *kaddr, struct page *page) { }
@@ -69,6 +72,8 @@ static inline void xpfo_temp_unmap(const void *addr, size_t size,
static inline bool xpfo_enabled(void) { return false; }
+static inline phys_addr_t user_virt_to_phys(unsigned long addr) { return 0; }
+
#endif /* CONFIG_XPFO */
#endif /* _LINUX_XPFO_H */
--
2.11.0
next prev parent reply other threads:[~2017-09-07 17:36 UTC|newest]
Thread overview: 241+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-07 17:35 [kernel-hardening] [PATCH v6 00/11] Add support for eXclusive Page Frame Ownership Tycho Andersen
2017-09-07 17:35 ` Tycho Andersen
2017-09-07 17:35 ` Tycho Andersen
2017-09-07 17:35 ` [kernel-hardening] [PATCH v6 01/11] mm: add MAP_HUGETLB support to vm_mmap Tycho Andersen
2017-09-07 17:35 ` Tycho Andersen
2017-09-07 17:35 ` Tycho Andersen
2017-09-08 7:42 ` [kernel-hardening] " Christoph Hellwig
2017-09-08 7:42 ` Christoph Hellwig
2017-09-08 7:42 ` Christoph Hellwig
2017-09-07 17:36 ` [kernel-hardening] [PATCH v6 02/11] x86: always set IF before oopsing from page fault Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` [kernel-hardening] [PATCH v6 03/11] mm, x86: Add support for eXclusive Page Frame Ownership (XPFO) Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 18:33 ` [kernel-hardening] " Ralph Campbell
2017-09-07 18:33 ` Ralph Campbell
2017-09-07 18:33 ` Ralph Campbell
2017-09-07 18:50 ` [kernel-hardening] " Tycho Andersen
2017-09-07 18:50 ` Tycho Andersen
2017-09-07 18:50 ` Tycho Andersen
2017-09-08 7:51 ` [kernel-hardening] " Christoph Hellwig
2017-09-08 7:51 ` Christoph Hellwig
2017-09-08 7:51 ` Christoph Hellwig
2017-09-08 14:58 ` [kernel-hardening] " Tycho Andersen
2017-09-08 14:58 ` Tycho Andersen
2017-09-08 14:58 ` Tycho Andersen
2017-09-09 15:35 ` [kernel-hardening] " Laura Abbott
2017-09-09 15:35 ` Laura Abbott
2017-09-09 15:35 ` Laura Abbott
2017-09-11 15:03 ` [kernel-hardening] " Tycho Andersen
2017-09-11 15:03 ` Tycho Andersen
2017-09-11 15:03 ` Tycho Andersen
2017-09-11 7:24 ` [kernel-hardening] " Yisheng Xie
2017-09-11 7:24 ` Yisheng Xie
2017-09-11 7:24 ` Yisheng Xie
2017-09-11 14:50 ` [kernel-hardening] " Tycho Andersen
2017-09-11 14:50 ` Tycho Andersen
2017-09-11 14:50 ` Tycho Andersen
2017-09-11 16:03 ` [kernel-hardening] " Juerg Haefliger
2017-09-11 16:03 ` Juerg Haefliger
2017-09-11 16:03 ` Juerg Haefliger
2017-09-11 16:59 ` [kernel-hardening] " Tycho Andersen
2017-09-11 16:59 ` Tycho Andersen
2017-09-11 16:59 ` Tycho Andersen
2017-09-12 8:05 ` [kernel-hardening] " Yisheng Xie
2017-09-12 8:05 ` Yisheng Xie
2017-09-12 8:05 ` Yisheng Xie
2017-09-12 14:36 ` [kernel-hardening] " Tycho Andersen
2017-09-12 14:36 ` Tycho Andersen
2017-09-12 14:36 ` Tycho Andersen
2017-09-12 18:13 ` [kernel-hardening] " Tycho Andersen
2017-09-12 18:13 ` Tycho Andersen
2017-09-12 18:13 ` Tycho Andersen
2017-09-14 6:15 ` [kernel-hardening] " Yisheng Xie
2017-09-14 6:15 ` Yisheng Xie
2017-09-14 6:15 ` Yisheng Xie
2017-09-20 23:46 ` [kernel-hardening] " Dave Hansen
2017-09-20 23:46 ` Dave Hansen
2017-09-20 23:46 ` Dave Hansen
2017-09-21 0:02 ` [kernel-hardening] " Tycho Andersen
2017-09-21 0:02 ` Tycho Andersen
2017-09-21 0:02 ` Tycho Andersen
2017-09-21 0:04 ` [kernel-hardening] " Dave Hansen
2017-09-21 0:04 ` Dave Hansen
2017-09-21 0:04 ` Dave Hansen
2017-09-11 18:32 ` [kernel-hardening] " Tycho Andersen
2017-09-11 18:32 ` Tycho Andersen
2017-09-11 18:32 ` Tycho Andersen
2017-09-11 21:54 ` [kernel-hardening] " Marco Benatto
2017-09-11 21:54 ` Marco Benatto
2017-09-11 21:54 ` Marco Benatto
2017-09-20 15:48 ` [kernel-hardening] " Dave Hansen
2017-09-20 15:48 ` Dave Hansen
2017-09-20 15:48 ` Dave Hansen
2017-09-20 22:34 ` [kernel-hardening] " Tycho Andersen
2017-09-20 22:34 ` Tycho Andersen
2017-09-20 22:34 ` Tycho Andersen
2017-09-20 23:21 ` [kernel-hardening] " Dave Hansen
2017-09-20 23:21 ` Dave Hansen
2017-09-20 23:21 ` Dave Hansen
2017-09-21 0:09 ` [kernel-hardening] " Tycho Andersen
2017-09-21 0:09 ` Tycho Andersen
2017-09-21 0:09 ` Tycho Andersen
2017-09-21 0:27 ` [kernel-hardening] " Dave Hansen
2017-09-21 0:27 ` Dave Hansen
2017-09-21 0:27 ` Dave Hansen
2017-09-21 1:37 ` [kernel-hardening] " Tycho Andersen
2017-09-21 1:37 ` Tycho Andersen
2017-09-21 1:37 ` Tycho Andersen
2017-11-10 1:09 ` [kernel-hardening] " Tycho Andersen
2017-11-10 1:09 ` Tycho Andersen
2017-11-10 1:09 ` Tycho Andersen
2017-11-13 22:20 ` [kernel-hardening] " Dave Hansen
2017-11-13 22:20 ` Dave Hansen
2017-11-13 22:20 ` Dave Hansen
2017-11-13 22:46 ` [kernel-hardening] " Dave Hansen
2017-11-13 22:46 ` Dave Hansen
2017-11-13 22:46 ` Dave Hansen
2017-11-15 0:33 ` [kernel-hardening] " Tycho Andersen
2017-11-15 0:33 ` Tycho Andersen
2017-11-15 0:37 ` Dave Hansen
2017-11-15 0:37 ` Dave Hansen
2017-11-15 0:42 ` Tycho Andersen
2017-11-15 0:42 ` Tycho Andersen
2017-11-15 3:44 ` Matthew Wilcox
2017-11-15 3:44 ` Matthew Wilcox
2017-11-15 3:44 ` Matthew Wilcox
2017-11-15 7:00 ` [kernel-hardening] " Dave Hansen
2017-11-15 7:00 ` Dave Hansen
2017-11-15 7:00 ` Dave Hansen
2017-11-15 14:58 ` [kernel-hardening] " Matthew Wilcox
2017-11-15 14:58 ` Matthew Wilcox
2017-11-15 14:58 ` Matthew Wilcox
2017-11-15 16:20 ` [kernel-hardening] " Tycho Andersen
2017-11-15 16:20 ` Tycho Andersen
2017-11-15 21:34 ` Matthew Wilcox
2017-11-15 21:34 ` Matthew Wilcox
2017-09-21 0:03 ` Dave Hansen
2017-09-21 0:03 ` Dave Hansen
2017-09-21 0:03 ` Dave Hansen
2017-09-21 0:28 ` [kernel-hardening] " Dave Hansen
2017-09-21 0:28 ` Dave Hansen
2017-09-21 0:28 ` Dave Hansen
2017-09-21 1:04 ` [kernel-hardening] " Tycho Andersen
2017-09-21 1:04 ` Tycho Andersen
2017-09-21 1:04 ` Tycho Andersen
2017-09-07 17:36 ` [kernel-hardening] [PATCH v6 04/11] swiotlb: Map the buffer if it was unmapped by XPFO Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 18:10 ` [kernel-hardening] " Christoph Hellwig
2017-09-07 18:10 ` Christoph Hellwig
2017-09-07 18:10 ` Christoph Hellwig
2017-09-07 18:44 ` [kernel-hardening] " Tycho Andersen
2017-09-07 18:44 ` Tycho Andersen
2017-09-07 18:44 ` Tycho Andersen
2017-09-08 7:13 ` [kernel-hardening] " Christoph Hellwig
2017-09-08 7:13 ` Christoph Hellwig
2017-09-08 7:13 ` Christoph Hellwig
2017-09-07 17:36 ` [kernel-hardening] [PATCH v6 05/11] arm64/mm: Add support for XPFO Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-08 7:53 ` [kernel-hardening] " Christoph Hellwig
2017-09-08 7:53 ` Christoph Hellwig
2017-09-08 7:53 ` Christoph Hellwig
2017-09-08 7:53 ` Christoph Hellwig
2017-09-08 17:24 ` Tycho Andersen
2017-09-08 17:24 ` [kernel-hardening] " Tycho Andersen
2017-09-08 17:24 ` Tycho Andersen
2017-09-08 17:24 ` Tycho Andersen
2017-09-08 17:24 ` Tycho Andersen
2017-09-14 10:41 ` [kernel-hardening] " Julien Grall
2017-09-14 10:41 ` Julien Grall
2017-09-14 10:41 ` Julien Grall
2017-09-14 10:41 ` Julien Grall
2017-09-14 11:29 ` [kernel-hardening] " Juergen Gross
2017-09-14 11:29 ` Juergen Gross
2017-09-14 11:29 ` Juergen Gross
2017-09-14 11:29 ` Juergen Gross
2017-09-14 11:29 ` Juergen Gross
2017-09-14 10:41 ` Julien Grall
2017-09-14 18:22 ` [kernel-hardening] " Mark Rutland
2017-09-14 18:22 ` Mark Rutland
2017-09-14 18:22 ` Mark Rutland
2017-09-18 21:27 ` Tycho Andersen
2017-09-18 21:27 ` Tycho Andersen
2017-09-18 21:27 ` Tycho Andersen
2017-09-07 17:36 ` [kernel-hardening] [PATCH v6 06/11] xpfo: add primitives for mapping underlying memory Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` [kernel-hardening] [PATCH v6 07/11] arm64/mm, xpfo: temporarily map dcache regions Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-14 18:25 ` [kernel-hardening] " Mark Rutland
2017-09-14 18:25 ` Mark Rutland
2017-09-14 18:25 ` Mark Rutland
2017-09-14 18:25 ` Mark Rutland
2017-09-18 21:29 ` [kernel-hardening] " Tycho Andersen
2017-09-18 21:29 ` Tycho Andersen
2017-09-18 21:29 ` Tycho Andersen
2017-09-18 21:29 ` Tycho Andersen
2017-09-07 17:36 ` [kernel-hardening] [PATCH v6 08/11] arm64/mm: Add support for XPFO to swiotlb Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` [kernel-hardening] [PATCH v6 09/11] arm64/mm: disable section/contiguous mappings if XPFO is enabled Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-09 15:38 ` [kernel-hardening] " Laura Abbott
2017-09-09 15:38 ` Laura Abbott
2017-09-09 15:38 ` Laura Abbott
2017-09-09 15:38 ` Laura Abbott
2017-09-07 17:36 ` Tycho Andersen [this message]
2017-09-07 17:36 ` [PATCH v6 10/11] mm: add a user_virt_to_phys symbol Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-08 7:55 ` [kernel-hardening] " Christoph Hellwig
2017-09-08 7:55 ` Christoph Hellwig
2017-09-08 7:55 ` Christoph Hellwig
2017-09-08 7:55 ` Christoph Hellwig
2017-09-08 15:44 ` [kernel-hardening] " Kees Cook
2017-09-08 15:44 ` Kees Cook
2017-09-08 15:44 ` Kees Cook
2017-09-08 15:44 ` Kees Cook
2017-09-11 7:36 ` [kernel-hardening] " Christoph Hellwig
2017-09-11 7:36 ` Christoph Hellwig
2017-09-11 7:36 ` Christoph Hellwig
2017-09-11 7:36 ` Christoph Hellwig
2017-09-14 18:34 ` [kernel-hardening] " Mark Rutland
2017-09-14 18:34 ` Mark Rutland
2017-09-14 18:34 ` Mark Rutland
2017-09-18 20:56 ` Tycho Andersen
2017-09-18 20:56 ` Tycho Andersen
2017-09-18 20:56 ` Tycho Andersen
2017-09-07 17:36 ` [kernel-hardening] [PATCH v6 11/11] lkdtm: Add test for XPFO Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 17:36 ` Tycho Andersen
2017-09-07 19:08 ` [kernel-hardening] " Kees Cook
2017-09-07 19:08 ` Kees Cook
2017-09-07 19:08 ` Kees Cook
2017-09-10 0:57 ` [kernel-hardening] " kbuild test robot
2017-09-10 0:57 ` kbuild test robot
2017-09-10 0:57 ` kbuild test robot
2017-09-11 10:34 ` [kernel-hardening] Re: [PATCH v6 00/11] Add support for eXclusive Page Frame Ownership Yisheng Xie
2017-09-11 10:34 ` Yisheng Xie
2017-09-11 10:34 ` Yisheng Xie
2017-09-11 15:02 ` [kernel-hardening] " Tycho Andersen
2017-09-11 15:02 ` Tycho Andersen
2017-09-11 15:02 ` Tycho Andersen
2017-09-12 7:07 ` [kernel-hardening] " Yisheng Xie
2017-09-12 7:07 ` Yisheng Xie
2017-09-12 7:07 ` Yisheng Xie
2017-09-12 7:40 ` [kernel-hardening] " Juerg Haefliger
2017-09-12 7:40 ` Juerg Haefliger
2017-09-12 7:40 ` Juerg Haefliger
2017-09-12 8:11 ` [kernel-hardening] " Yisheng Xie
2017-09-12 8:11 ` Yisheng Xie
2017-09-12 8:11 ` Yisheng Xie
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=20170907173609.22696-11-tycho@docker.com \
--to=tycho@docker.com \
--cc=juerg.haefliger@canonical.com \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=marco.antonio.780@gmail.com \
--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 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.