Merge tag 'powerpc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman: - Wire up copy_file_range() syscall from Chandan Rajendra - Simplify module TOC handling from Alan Modra - Remove newly added extra definition of pmd_dirty from Stephen Rothwell - Allow user space to map rtas_rmo_buf from Vasant Hegde - Fix PE location code from Gavin Shan - Remove PPMU_HAS_SSLOT flag for Power8 from Madhavan Srinivasan - Fixup _HPAGE_CHG_MASK from Aneesh Kumar K.V * tag 'powerpc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/mm: Fixup _HPAGE_CHG_MASK powerpc/perf: Remove PPMU_HAS_SSLOT flag for Power8 powerpc/eeh: Fix PE location code powerpc/mm: Allow user space to map rtas_rmo_buf powerpc: Remove newly added extra definition of pmd_dirty powerpc: Simplify module TOC handling powerpc: Wire up copy_file_range() syscall

Merge tag 'powerpc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman: - Wire up copy_file_range() syscall from Chandan Rajendra - Simplify module TOC handling from Alan Modra - Remove newly added extra definition of pmd_dirty from Stephen Rothwell - Allow user space to map rtas_rmo_buf from Vasant Hegde - Fix PE location code from Gavin Shan - Remove PPMU_HAS_SSLOT flag for Power8 from Madhavan Srinivasan - Fixup _HPAGE_CHG_MASK from Aneesh Kumar K.V * tag 'powerpc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/mm: Fixup _HPAGE_CHG_MASK powerpc/perf: Remove PPMU_HAS_SSLOT flag for Power8 powerpc/eeh: Fix PE location code powerpc/mm: Allow user space to map rtas_rmo_buf powerpc: Remove newly added extra definition of pmd_dirty powerpc: Simplify module TOC handling powerpc: Wire up copy_file_range() syscall
Linus Torvalds
2 parents 6b292a8abd 2d19fc6395
Showing 11 changed files Side-by-side Diff
arch/powerpc/include/asm/book3s/64/hash.h
arch/powerpc/include/asm/book3s/64/pgtable.h
arch/powerpc/include/asm/systbl.h
arch/powerpc/include/asm/unistd.h
arch/powerpc/include/uapi/asm/unistd.h
arch/powerpc/kernel/eeh_pe.c
arch/powerpc/kernel/misc_64.S
arch/powerpc/kernel/module_64.c
arch/powerpc/mm/mem.c
arch/powerpc/perf/power8-pmu.c
scripts/mod/modpost.c
@@ -50,7 +50,9 @@
  * set of bits not changed in pmd_modify.
  */
 #define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \
-			 _PAGE_ACCESSED | _PAGE_THP_HUGE)
+			 _PAGE_ACCESSED | _PAGE_THP_HUGE | _PAGE_PTE | \
+			 _PAGE_SOFT_DIRTY)
+
  
 #ifdef CONFIG_PPC_64K_PAGES
 #include <asm/book3s/64/hash-64k.h>
@@ -223,7 +223,6 @@
 #define pmd_pfn(pmd)		pte_pfn(pmd_pte(pmd))
 #define pmd_dirty(pmd)		pte_dirty(pmd_pte(pmd))
 #define pmd_young(pmd)		pte_young(pmd_pte(pmd))
-#define pmd_dirty(pmd)		pte_dirty(pmd_pte(pmd))
 #define pmd_mkold(pmd)		pte_pmd(pte_mkold(pmd_pte(pmd)))
 #define pmd_wrprotect(pmd)	pte_pmd(pte_wrprotect(pmd_pte(pmd)))
 #define pmd_mkdirty(pmd)	pte_pmd(pte_mkdirty(pmd_pte(pmd)))
@@ -383,4 +383,5 @@
 SYSCALL(ni_syscall)
 SYSCALL(ni_syscall)
 SYSCALL(mlock2)
+SYSCALL(copy_file_range)
@@ -12,7 +12,7 @@
 #include <uapi/asm/unistd.h>
  
  
-#define NR_syscalls		379
+#define NR_syscalls		380
  
 #define __NR__exit __NR_exit
  
@@ -389,6 +389,7 @@
 #define __NR_userfaultfd	364
 #define __NR_membarrier		365
 #define __NR_mlock2		378
+#define __NR_copy_file_range	379
  
 #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */
@@ -883,32 +883,29 @@
 const char *eeh_pe_loc_get(struct eeh_pe *pe)
 {
 	struct pci_bus *bus = eeh_pe_bus_get(pe);
-	struct device_node *dn = pci_bus_to_OF_node(bus);
+	struct device_node *dn;
 	const char *loc = NULL;
  
-	if (!dn)
-		goto out;
+	while (bus) {
+		dn = pci_bus_to_OF_node(bus);
+		if (!dn) {
+			bus = bus->parent;
+			continue;
+		}
  
-	/* PHB PE or root PE ? */
-	if (pci_is_root_bus(bus)) {
-		loc = of_get_property(dn, "ibm,loc-code", NULL);
-		if (!loc)
+		if (pci_is_root_bus(bus))
 			loc = of_get_property(dn, "ibm,io-base-loc-code", NULL);
+		else
+			loc = of_get_property(dn, "ibm,slot-location-code",
+					      NULL);
+
 		if (loc)
-			goto out;
+			return loc;
  
-		/* Check the root port */
-		dn = dn->child;
-		if (!dn)
-			goto out;
+		bus = bus->parent;
 	}
  
-	loc = of_get_property(dn, "ibm,loc-code", NULL);
-	if (!loc)
-		loc = of_get_property(dn, "ibm,slot-location-code", NULL);
-
-out:
-	return loc ? loc : "N/A";
+	return "N/A";
 }
  
 /**
@@ -701,32 +701,4 @@
 	li	r5,0
 	blr	/* image->start(physid, image->start, 0); */
 #endif /* CONFIG_KEXEC */
-
-#ifdef CONFIG_MODULES
-#if defined(_CALL_ELF) && _CALL_ELF == 2
-
-#ifdef CONFIG_MODVERSIONS
-.weak __crc_TOC.
-.section "___kcrctab+TOC.","a"
-.globl __kcrctab_TOC.
-__kcrctab_TOC.:
-	.llong	__crc_TOC.
-#endif
-
-/*
- * Export a fake .TOC. since both modpost and depmod will complain otherwise.
- * Both modpost and depmod strip the leading . so we do the same here.
- */
-.section "__ksymtab_strings","a"
-__kstrtab_TOC.:
-	.asciz "TOC."
-
-.section "___ksymtab+TOC.","a"
-/* This symbol name is important: it's used by modpost to find exported syms */
-.globl __ksymtab_TOC.
-__ksymtab_TOC.:
-	.llong 0 /* .value */
-	.llong __kstrtab_TOC.
-#endif /* ELFv2 */
-#endif /* MODULES */
@@ -326,7 +326,10 @@
 		}
 }
  
-/* Undefined symbols which refer to .funcname, hack to funcname (or .TOC.) */
+/*
+ * Undefined symbols which refer to .funcname, hack to funcname. Make .TOC.
+ * seem to be defined (value set later).
+ */
 static void dedotify(Elf64_Sym *syms, unsigned int numsyms, char *strtab)
 {
 	unsigned int i;
  
@@ -334,8 +337,11 @@
 	for (i = 1; i < numsyms; i++) {
 		if (syms[i].st_shndx == SHN_UNDEF) {
 			char *name = strtab + syms[i].st_name;
-			if (name[0] == '.')
+			if (name[0] == '.') {
+				if (strcmp(name+1, "TOC.") == 0)
+					syms[i].st_shndx = SHN_ABS;
 				memmove(name, name+1, strlen(name));
+			}
 		}
 	}
 }
@@ -351,7 +357,7 @@
 	numsyms = sechdrs[symindex].sh_size / sizeof(Elf64_Sym);
  
 	for (i = 1; i < numsyms; i++) {
-		if (syms[i].st_shndx == SHN_UNDEF
+		if (syms[i].st_shndx == SHN_ABS
 		    && strcmp(strtab + syms[i].st_name, "TOC.") == 0)
 			return &syms[i];
 	}
@@ -560,11 +560,11 @@
  */
 int devmem_is_allowed(unsigned long pfn)
 {
+	if (page_is_rtas_user_buf(pfn))
+		return 1;
 	if (iomem_is_exclusive(PFN_PHYS(pfn)))
 		return 0;
 	if (!page_is_ram(pfn))
-		return 1;
-	if (page_is_rtas_user_buf(pfn))
 		return 1;
 	return 0;
 }
@@ -816,7 +816,7 @@
 	.get_constraint		= power8_get_constraint,
 	.get_alternatives	= power8_get_alternatives,
 	.disable_pmc		= power8_disable_pmc,
-	.flags			= PPMU_HAS_SSLOT | PPMU_HAS_SIER | PPMU_ARCH_207S,
+	.flags			= PPMU_HAS_SIER | PPMU_ARCH_207S,
 	.n_generic		= ARRAY_SIZE(power8_generic_events),
 	.generic_events		= power8_generic_events,
 	.cache_events		= &power8_cache_events,
@@ -594,7 +594,8 @@
 		if (strncmp(symname, "_restgpr0_", sizeof("_restgpr0_") - 1) == 0 ||
 		    strncmp(symname, "_savegpr0_", sizeof("_savegpr0_") - 1) == 0 ||
 		    strncmp(symname, "_restvr_", sizeof("_restvr_") - 1) == 0 ||
-		    strncmp(symname, "_savevr_", sizeof("_savevr_") - 1) == 0)
+		    strncmp(symname, "_savevr_", sizeof("_savevr_") - 1) == 0 ||
+		    strcmp(symname, ".TOC.") == 0)
 			return 1;
 	/* Do not ignore this symbol */
 	return 0;
...	...	@@ -50,7 +50,9 @@
50	50	* set of bits not changed in pmd_modify.
51	51	*/
52	52	#define _HPAGE_CHG_MASK (PTE_RPN_MASK \| _PAGE_HPTEFLAGS \| _PAGE_DIRTY \| \
53		- _PAGE_ACCESSED \| _PAGE_THP_HUGE)
	53	+ _PAGE_ACCESSED \| _PAGE_THP_HUGE \| _PAGE_PTE \| \
	54	+ _PAGE_SOFT_DIRTY)
	55	+
54	56
55	57	#ifdef CONFIG_PPC_64K_PAGES
56	58	#include <asm/book3s/64/hash-64k.h>
...	...	@@ -223,7 +223,6 @@
223	223	#define pmd_pfn(pmd) pte_pfn(pmd_pte(pmd))
224	224	#define pmd_dirty(pmd) pte_dirty(pmd_pte(pmd))
225	225	#define pmd_young(pmd) pte_young(pmd_pte(pmd))
226		-#define pmd_dirty(pmd) pte_dirty(pmd_pte(pmd))
227	226	#define pmd_mkold(pmd) pte_pmd(pte_mkold(pmd_pte(pmd)))
228	227	#define pmd_wrprotect(pmd) pte_pmd(pte_wrprotect(pmd_pte(pmd)))
229	228	#define pmd_mkdirty(pmd) pte_pmd(pte_mkdirty(pmd_pte(pmd)))
...	...	@@ -383,4 +383,5 @@
383	383	SYSCALL(ni_syscall)
384	384	SYSCALL(ni_syscall)
385	385	SYSCALL(mlock2)
	386	+SYSCALL(copy_file_range)
...	...	@@ -12,7 +12,7 @@
12	12	#include <uapi/asm/unistd.h>
13	13
14	14
15		-#define NR_syscalls 379
	15	+#define NR_syscalls 380
16	16
17	17	#define __NR__exit __NR_exit
18	18
...	...	@@ -389,6 +389,7 @@
389	389	#define __NR_userfaultfd 364
390	390	#define __NR_membarrier 365
391	391	#define __NR_mlock2 378
	392	+#define __NR_copy_file_range 379
392	393
393	394	#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */
...	...	@@ -883,32 +883,29 @@
883	883	const char eeh_pe_loc_get(struct eeh_pe pe)
884	884	{
885	885	struct pci_bus *bus = eeh_pe_bus_get(pe);
886		- struct device_node *dn = pci_bus_to_OF_node(bus);
	886	+ struct device_node *dn;
887	887	const char *loc = NULL;
888	888
889		- if (!dn)
890		- goto out;
	889	+ while (bus) {
	890	+ dn = pci_bus_to_OF_node(bus);
	891	+ if (!dn) {
	892	+ bus = bus->parent;
	893	+ continue;
	894	+ }
891	895
892		- /* PHB PE or root PE ? */
893		- if (pci_is_root_bus(bus)) {
894		- loc = of_get_property(dn, "ibm,loc-code", NULL);
895		- if (!loc)
	896	+ if (pci_is_root_bus(bus))
896	897	loc = of_get_property(dn, "ibm,io-base-loc-code", NULL);
	898	+ else
	899	+ loc = of_get_property(dn, "ibm,slot-location-code",
	900	+ NULL);
	901	+
897	902	if (loc)
898		- goto out;
	903	+ return loc;
899	904
900		- /* Check the root port */
901		- dn = dn->child;
902		- if (!dn)
903		- goto out;
	905	+ bus = bus->parent;
904	906	}
905	907
906		- loc = of_get_property(dn, "ibm,loc-code", NULL);
907		- if (!loc)
908		- loc = of_get_property(dn, "ibm,slot-location-code", NULL);
909		-
910		-out:
911		- return loc ? loc : "N/A";
	908	+ return "N/A";
912	909	}
913	910
914	911	/**
...	...	@@ -701,32 +701,4 @@
701	701	li r5,0
702	702	blr /* image->start(physid, image->start, 0); */
703	703	#endif /* CONFIG_KEXEC */
704		-
705		-#ifdef CONFIG_MODULES
706		-#if defined(_CALL_ELF) && _CALL_ELF == 2
707		-
708		-#ifdef CONFIG_MODVERSIONS
709		-.weak __crc_TOC.
710		-.section "___kcrctab+TOC.","a"
711		-.globl __kcrctab_TOC.
712		-__kcrctab_TOC.:
713		- .llong __crc_TOC.
714		-#endif
715		-
716		-/*
717		- * Export a fake .TOC. since both modpost and depmod will complain otherwise.
718		- * Both modpost and depmod strip the leading . so we do the same here.
719		- */
720		-.section "__ksymtab_strings","a"
721		-__kstrtab_TOC.:
722		- .asciz "TOC."
723		-
724		-.section "___ksymtab+TOC.","a"
725		-/* This symbol name is important: it's used by modpost to find exported syms */
726		-.globl __ksymtab_TOC.
727		-__ksymtab_TOC.:
728		- .llong 0 /* .value */
729		- .llong __kstrtab_TOC.
730		-#endif /* ELFv2 */
731		-#endif /* MODULES */
...	...	@@ -326,7 +326,10 @@
326	326	}
327	327	}
328	328
329		-/* Undefined symbols which refer to .funcname, hack to funcname (or .TOC.) */
	329	+/*
	330	+ * Undefined symbols which refer to .funcname, hack to funcname. Make .TOC.
	331	+ * seem to be defined (value set later).
	332	+ */
330	333	static void dedotify(Elf64_Sym syms, unsigned int numsyms, char strtab)
331	334	{
332	335	unsigned int i;
333	336
...	...	@@ -334,8 +337,11 @@
334	337	for (i = 1; i < numsyms; i++) {
335	338	if (syms[i].st_shndx == SHN_UNDEF) {
336	339	char *name = strtab + syms[i].st_name;
337		- if (name[0] == '.')
	340	+ if (name[0] == '.') {
	341	+ if (strcmp(name+1, "TOC.") == 0)
	342	+ syms[i].st_shndx = SHN_ABS;
338	343	memmove(name, name+1, strlen(name));
	344	+ }
339	345	}
340	346	}
341	347	}
...	...	@@ -351,7 +357,7 @@
351	357	numsyms = sechdrs[symindex].sh_size / sizeof(Elf64_Sym);
352	358
353	359	for (i = 1; i < numsyms; i++) {
354		- if (syms[i].st_shndx == SHN_UNDEF
	360	+ if (syms[i].st_shndx == SHN_ABS
355	361	&& strcmp(strtab + syms[i].st_name, "TOC.") == 0)
356	362	return &syms[i];
357	363	}
...	...	@@ -560,11 +560,11 @@
560	560	*/
561	561	int devmem_is_allowed(unsigned long pfn)
562	562	{
	563	+ if (page_is_rtas_user_buf(pfn))
	564	+ return 1;
563	565	if (iomem_is_exclusive(PFN_PHYS(pfn)))
564	566	return 0;
565	567	if (!page_is_ram(pfn))
566		- return 1;
567		- if (page_is_rtas_user_buf(pfn))
568	568	return 1;
569	569	return 0;
570	570	}
...	...	@@ -816,7 +816,7 @@
816	816	.get_constraint = power8_get_constraint,
817	817	.get_alternatives = power8_get_alternatives,
818	818	.disable_pmc = power8_disable_pmc,
819		- .flags = PPMU_HAS_SSLOT \| PPMU_HAS_SIER \| PPMU_ARCH_207S,
	819	+ .flags = PPMU_HAS_SIER \| PPMU_ARCH_207S,
820	820	.n_generic = ARRAY_SIZE(power8_generic_events),
821	821	.generic_events = power8_generic_events,
822	822	.cache_events = &power8_cache_events,