[kernel/f21] arm64-revert-tlb-rcu_table_free.patch: revert 5e5f6dc1 which causes
Kyle McMartin
kyle at fedoraproject.org
Fri Mar 13 16:53:46 UTC 2015
commit 6dfd0117846b5f25258390042178907f4784ff13
Author: Kyle McMartin <kmcmarti at redhat.com>
Date: Fri Mar 13 12:52:43 2015 -0400
arm64-revert-tlb-rcu_table_free.patch: revert 5e5f6dc1 which causes
lockups on arm64 machines.
.gitignore | 2 +-
arm64-revert-tlb-rcu_table_free.patch | 151 ++++++++++++++++++++++++++++++++++
kernel.spec | 18 ++--
3 files changed, 165 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b30f1f6..2a888b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,5 @@ clog
*.bz2
*.rpm
*.orig
-kernel-[23].*/
+kernel-[234].*/
perf-man-*.tar.gz
diff --git a/arm64-revert-tlb-rcu_table_free.patch b/arm64-revert-tlb-rcu_table_free.patch
new file mode 100644
index 0000000..1de4723
--- /dev/null
+++ b/arm64-revert-tlb-rcu_table_free.patch
@@ -0,0 +1,151 @@
+diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
+index 9532f8d..2c9530e 100644
+--- a/arch/arm64/Kconfig
++++ b/arch/arm64/Kconfig
+@@ -58,7 +58,6 @@ config ARM64
+ select HAVE_PERF_EVENTS
+ select HAVE_PERF_REGS
+ select HAVE_PERF_USER_STACK_DUMP
+- select HAVE_RCU_TABLE_FREE
+ select HAVE_SYSCALL_TRACEPOINTS
+ select IRQ_DOMAIN
+ select MODULES_USE_ELF_RELA
+@@ -112,9 +111,6 @@ config GENERIC_CALIBRATE_DELAY
+ config ZONE_DMA
+ def_bool y
+
+-config HAVE_GENERIC_RCU_GUP
+- def_bool y
+-
+ config ARCH_DMA_ADDR_T_64BIT
+ def_bool y
+
+diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
+index 41a43bf..39f3ad6 100644
+--- a/arch/arm64/include/asm/pgtable.h
++++ b/arch/arm64/include/asm/pgtable.h
+@@ -244,16 +244,6 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
+
+ #define __HAVE_ARCH_PTE_SPECIAL
+
+-static inline pte_t pud_pte(pud_t pud)
+-{
+- return __pte(pud_val(pud));
+-}
+-
+-static inline pmd_t pud_pmd(pud_t pud)
+-{
+- return __pmd(pud_val(pud));
+-}
+-
+ static inline pte_t pmd_pte(pmd_t pmd)
+ {
+ return __pte(pmd_val(pmd));
+@@ -271,13 +261,7 @@ static inline pmd_t pte_pmd(pte_t pte)
+ #ifdef CONFIG_TRANSPARENT_HUGEPAGE
+ #define pmd_trans_huge(pmd) (pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT))
+ #define pmd_trans_splitting(pmd) pte_special(pmd_pte(pmd))
+-#ifdef CONFIG_HAVE_RCU_TABLE_FREE
+-#define __HAVE_ARCH_PMDP_SPLITTING_FLUSH
+-struct vm_area_struct;
+-void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address,
+- pmd_t *pmdp);
+-#endif /* CONFIG_HAVE_RCU_TABLE_FREE */
+-#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
++#endif
+
+ #define pmd_young(pmd) pte_young(pmd_pte(pmd))
+ #define pmd_wrprotect(pmd) pte_pmd(pte_wrprotect(pmd_pte(pmd)))
+@@ -298,7 +282,6 @@ void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address,
+ #define mk_pmd(page,prot) pfn_pmd(page_to_pfn(page),prot)
+
+ #define pmd_page(pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd) & PHYS_MASK))
+-#define pud_write(pud) pte_write(pud_pte(pud))
+ #define pud_pfn(pud) (((pud_val(pud) & PUD_MASK) & PHYS_MASK) >> PAGE_SHIFT)
+
+ #define set_pmd_at(mm, addr, pmdp, pmd) set_pte_at(mm, addr, (pte_t *)pmdp, pmd_pte(pmd))
+@@ -400,8 +383,6 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)
+ return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(addr);
+ }
+
+-#define pud_page(pud) pmd_page(pud_pmd(pud))
+-
+ #endif /* CONFIG_ARM64_PGTABLE_LEVELS > 2 */
+
+ #if CONFIG_ARM64_PGTABLE_LEVELS > 3
+diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h
+index a82c0c5..62731ef 100644
+--- a/arch/arm64/include/asm/tlb.h
++++ b/arch/arm64/include/asm/tlb.h
+@@ -23,20 +23,6 @@
+
+ #include <asm-generic/tlb.h>
+
+-#include <linux/pagemap.h>
+-#include <linux/swap.h>
+-
+-#ifdef CONFIG_HAVE_RCU_TABLE_FREE
+-
+-#define tlb_remove_entry(tlb, entry) tlb_remove_table(tlb, entry)
+-static inline void __tlb_remove_table(void *_table)
+-{
+- free_page_and_swap_cache((struct page *)_table);
+-}
+-#else
+-#define tlb_remove_entry(tlb, entry) tlb_remove_page(tlb, entry)
+-#endif /* CONFIG_HAVE_RCU_TABLE_FREE */
+-
+ /*
+ * There's three ways the TLB shootdown code is used:
+ * 1. Unmapping a range of vmas. See zap_page_range(), unmap_region().
+@@ -102,7 +88,7 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,
+ {
+ pgtable_page_dtor(pte);
+ tlb_add_flush(tlb, addr);
+- tlb_remove_entry(tlb, pte);
++ tlb_remove_page(tlb, pte);
+ }
+
+ #if CONFIG_ARM64_PGTABLE_LEVELS > 2
+@@ -110,7 +96,7 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp,
+ unsigned long addr)
+ {
+ tlb_add_flush(tlb, addr);
+- tlb_remove_entry(tlb, virt_to_page(pmdp));
++ tlb_remove_page(tlb, virt_to_page(pmdp));
+ }
+ #endif
+
+@@ -119,7 +105,7 @@ static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pudp,
+ unsigned long addr)
+ {
+ tlb_add_flush(tlb, addr);
+- tlb_remove_entry(tlb, virt_to_page(pudp));
++ tlb_remove_page(tlb, virt_to_page(pudp));
+ }
+ #endif
+
+diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c
+index b6f14e8..0d64089 100644
+--- a/arch/arm64/mm/flush.c
++++ b/arch/arm64/mm/flush.c
+@@ -104,19 +104,3 @@ EXPORT_SYMBOL(flush_dcache_page);
+ */
+ EXPORT_SYMBOL(flush_cache_all);
+ EXPORT_SYMBOL(flush_icache_range);
+-
+-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+-#ifdef CONFIG_HAVE_RCU_TABLE_FREE
+-void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address,
+- pmd_t *pmdp)
+-{
+- pmd_t pmd = pmd_mksplitting(*pmdp);
+-
+- VM_BUG_ON(address & ~PMD_MASK);
+- set_pmd_at(vma->vm_mm, address, pmdp, pmd);
+-
+- /* dummy IPI to serialise against fast_gup */
+- kick_all_cpus_sync();
+-}
+-#endif /* CONFIG_HAVE_RCU_TABLE_FREE */
+-#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
diff --git a/kernel.spec b/kernel.spec
index 2cc9404..10ab42d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -624,14 +624,11 @@ Patch26130: acpi-video-Add-disable_native_backlight-quirk-for-De.patch
#rhbz 1094948
Patch26131: acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
-# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
-Patch30000: kernel-arm64.patch
-
# Fix for big-endian arches, already upstream
-Patch30001: mpssd-x86-only.patch
+Patch26134: mpssd-x86-only.patch
#rhbz 1186097
-Patch30004: acpi-video-add-disable_native_backlight_quirk_for_samsung_510r.patch
+Patch26135: acpi-video-add-disable_native_backlight_quirk_for_samsung_510r.patch
#CVE-XXXX-XXXX rhbz 1189864 1192079
Patch26136: vhost-scsi-potential-memory-corruption.patch
@@ -676,6 +673,10 @@ Patch26167: IB-core-Prevent-integer-overflow-in-ib_umem_get-addr.patch
#rhbz 1201532
Patch26168: HID-multitouch-add-support-of-clickpads.patch
+# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
+Patch30000: kernel-arm64.patch
+Patch30001: arm64-revert-tlb-rcu_table_free.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1459,8 +1460,10 @@ ApplyPatch HID-multitouch-add-support-of-clickpads.patch
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
+ApplyPatch arm64-revert-tlb-rcu_table_free.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
ApplyPatch kernel-arm64.patch -R
+ApplyPatch arm64-revert-tlb-rcu_table_free.patch -R
%else
# solved with SPCR in future
%endif
@@ -2327,6 +2330,11 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Mar 13 2015 Kyle McMartin <kyle at fedoraproject.org>
+- arm64-revert-tlb-rcu_table_free.patch: revert 5e5f6dc1 which causes
+ lockups on arm64 machines.
+- Add kernel-4* to .gitignore.
+
* Fri Mar 13 2015 Josh Boyer <jwboyer at fedoraproject.org>
- Add patch to support clickpads (rhbz 1201532)
More information about the scm-commits
mailing list