Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3c0e7b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libnvdimm-fixes-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm 

More libnvdimm updates from Dan Williams:

 - Complete the reworks to interoperate with powerpc dynamic huge page
   sizes

 - Fix a crash due to missed accounting for the powerpc 'struct
   page'-memmap mapping granularity

 - Fix badblock initialization for volatile (DRAM emulated) pmem ranges

 - Stop triggering request_key() notifications to userspace when
   NVDIMM-security is disabled / not present

 - Miscellaneous small fixups

* tag 'libnvdimm-fixes-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  libnvdimm/region: Enable MAP_SYNC for volatile regions
  libnvdimm: prevent nvdimm from requesting key when security is disabled
  libnvdimm/region: Initialize bad block for volatile namespaces
  libnvdimm/nfit_test: Fix acpi_handle redefinition
  libnvdimm/altmap: Track namespace boundaries in altmap
  libnvdimm: Fix endian conversion issues 
  libnvdimm/dax: Pick the right alignment default when creating dax devices
  powerpc/book3s64: Export has_transparent_hugepage() related functions.
parents 939ca9f1 4c806b89

arch/powerpc/include/asm/book3s/64/radix.h

+7 −1
Original line number Diff line number Diff line
@@ -254,7 +254,13 @@ extern void radix__pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp, 
extern pgtable_t radix__pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp);

extern pmd_t radix__pmdp_huge_get_and_clear(struct mm_struct *mm,

				      unsigned long addr, pmd_t *pmdp);

extern int radix__has_transparent_hugepage(void);

static inline int radix__has_transparent_hugepage(void)

{

	/* For radix 2M at PMD level means thp */

	if (mmu_psize_defs[MMU_PAGE_2M].shift == PMD_SHIFT)

		return 1;

	return 0;

}

#endif



extern int __meminit radix__vmemmap_create_mapping(unsigned long start,

arch/powerpc/mm/book3s64/hash_pgtable.c

+2 −0
Original line number Diff line number Diff line
@@ -406,6 +406,8 @@ int hash__has_transparent_hugepage(void) 


	return 1;

}

EXPORT_SYMBOL_GPL(hash__has_transparent_hugepage);



#endif /* CONFIG_TRANSPARENT_HUGEPAGE */



#ifdef CONFIG_STRICT_KERNEL_RWX

arch/powerpc/mm/book3s64/radix_pgtable.c

+0 −7
Original line number Diff line number Diff line
@@ -1027,13 +1027,6 @@ pmd_t radix__pmdp_huge_get_and_clear(struct mm_struct *mm, 
	return old_pmd;

}



int radix__has_transparent_hugepage(void)

{

	/* For radix 2M at PMD level means thp */

	if (mmu_psize_defs[MMU_PAGE_2M].shift == PMD_SHIFT)

		return 1;

	return 0;

}

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */



void radix__ptep_set_access_flags(struct vm_area_struct *vma, pte_t *ptep,

arch/powerpc/mm/init_64.c

+16 −1
Original line number Diff line number Diff line
@@ -172,6 +172,21 @@ static __meminit void vmemmap_list_populate(unsigned long phys, 
	vmemmap_list = vmem_back;

}



static bool altmap_cross_boundary(struct vmem_altmap *altmap, unsigned long start,

				unsigned long page_size)

{

	unsigned long nr_pfn = page_size / sizeof(struct page);

	unsigned long start_pfn = page_to_pfn((struct page *)start);



	if ((start_pfn + nr_pfn) > altmap->end_pfn)

		return true;



	if (start_pfn < altmap->base_pfn)

		return true;



	return false;

}



int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,

		struct vmem_altmap *altmap)

{
@@ -194,7 +209,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, 
		 * fail due to alignment issues when using 16MB hugepages, so

		 * fall back to system memory if the altmap allocation fail.

		 */

		if (altmap) {

		if (altmap && !altmap_cross_boundary(altmap, start, page_size)) {

			p = altmap_alloc_block_buf(page_size, altmap);

			if (!p)

				pr_debug("altmap block allocation failed, falling back to system memory");

drivers/nvdimm/btt.c

+4 −4
Original line number Diff line number Diff line
@@ -392,9 +392,9 @@ static int btt_flog_write(struct arena_info *arena, u32 lane, u32 sub, 
	arena->freelist[lane].sub = 1 - arena->freelist[lane].sub;

	if (++(arena->freelist[lane].seq) == 4)

		arena->freelist[lane].seq = 1;

	if (ent_e_flag(ent->old_map))

	if (ent_e_flag(le32_to_cpu(ent->old_map)))

		arena->freelist[lane].has_err = 1;

	arena->freelist[lane].block = le32_to_cpu(ent_lba(ent->old_map));

	arena->freelist[lane].block = ent_lba(le32_to_cpu(ent->old_map));



	return ret;

}
@@ -560,8 +560,8 @@ static int btt_freelist_init(struct arena_info *arena) 
		 * FIXME: if error clearing fails during init, we want to make

		 * the BTT read-only

		 */

		if (ent_e_flag(log_new.old_map) &&

				!ent_normal(log_new.old_map)) {

		if (ent_e_flag(le32_to_cpu(log_new.old_map)) &&

		    !ent_normal(le32_to_cpu(log_new.old_map))) {

			arena->freelist[i].has_err = 1;

			ret = arena_clear_freelist_error(arena, i);

			if (ret)