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

Commit 20c759ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge small final update from Andrew Morton:

 - DAX feature work: add fsync/msync support

 - kfree cleanup, MAINTAINERS update

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  MAINTAINERS: return arch/sh to maintained state, with new maintainers
  tree wide: use kvfree() than conditional kfree()/vfree()
  dax: never rely on bh.b_dev being set by get_block()
  xfs: call dax_pfn_mkwrite() for DAX fsync/msync
  ext4: call dax_pfn_mkwrite() for DAX fsync/msync
  ext2: call dax_pfn_mkwrite() for DAX fsync/msync
  dax: add support for fsync/sync
  mm: add find_get_entries_tag()
  dax: support dirty DAX entries in radix tree
  pmem: add wb_cache_pmem() to the PMEM API
  dax: fix conversion of holes to PMDs
  dax: fix NULL pointer dereference in __dax_dbg()
parents b82dde02 114bf37e

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -10453,9 +10453,11 @@ S: Maintained 
F:	drivers/net/ethernet/dlink/sundance.c



SUPERH

M:	Yoshinori Sato <ysato@users.sourceforge.jp>

M:	Rich Felker <dalias@libc.org>

L:	linux-sh@vger.kernel.org

Q:	http://patchwork.kernel.org/project/linux-sh/list/

S:	Orphan

S:	Maintained

F:	Documentation/sh/

F:	arch/sh/

F:	drivers/sh/

arch/arm/mm/dma-mapping.c

+2 −9
Original line number Diff line number Diff line
@@ -1200,10 +1200,7 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, 
	while (i--)

		if (pages[i])

			__free_pages(pages[i], 0);

	if (array_size <= PAGE_SIZE)

		kfree(pages);

	else

		vfree(pages);

	kvfree(pages);

	return NULL;

}
@@ -1211,7 +1208,6 @@ static int __iommu_free_buffer(struct device *dev, struct page **pages, 
			       size_t size, struct dma_attrs *attrs)

{

	int count = size >> PAGE_SHIFT;

	int array_size = count * sizeof(struct page *);

	int i;



	if (dma_get_attr(DMA_ATTR_FORCE_CONTIGUOUS, attrs)) {
@@ -1222,10 +1218,7 @@ static int __iommu_free_buffer(struct device *dev, struct page **pages, 
				__free_pages(pages[i], 0);

	}



	if (array_size <= PAGE_SIZE)

		kfree(pages);

	else

		vfree(pages);

	kvfree(pages);

	return 0;

}

arch/x86/include/asm/pmem.h

+6 −5
Original line number Diff line number Diff line
@@ -67,18 +67,19 @@ static inline void arch_wmb_pmem(void) 
}



/**

 * __arch_wb_cache_pmem - write back a cache range with CLWB

 * arch_wb_cache_pmem - write back a cache range with CLWB

 * @vaddr:	virtual start address

 * @size:	number of bytes to write back

 *

 * Write back a cache range using the CLWB (cache line write back)

 * instruction.  This function requires explicit ordering with an

 * arch_wmb_pmem() call.  This API is internal to the x86 PMEM implementation.

 * arch_wmb_pmem() call.

 */

static inline void __arch_wb_cache_pmem(void *vaddr, size_t size)

static inline void arch_wb_cache_pmem(void __pmem *addr, size_t size)

{

	u16 x86_clflush_size = boot_cpu_data.x86_clflush_size;

	unsigned long clflush_mask = x86_clflush_size - 1;

	void *vaddr = (void __force *)addr;

	void *vend = vaddr + size;

	void *p;
@@ -115,7 +116,7 @@ static inline size_t arch_copy_from_iter_pmem(void __pmem *addr, size_t bytes, 
	len = copy_from_iter_nocache(vaddr, bytes, i);



	if (__iter_needs_pmem_wb(i))

		__arch_wb_cache_pmem(vaddr, bytes);

		arch_wb_cache_pmem(addr, bytes);



	return len;

}
@@ -133,7 +134,7 @@ static inline void arch_clear_pmem(void __pmem *addr, size_t size) 
	void *vaddr = (void __force *)addr;



	memset(vaddr, 0, size);

	__arch_wb_cache_pmem(vaddr, size);

	arch_wb_cache_pmem(addr, size);

}



static inline bool __arch_has_wmb_pmem(void)

drivers/acpi/apei/erst.c

+2 −4
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/hardirq.h>

#include <linux/pstore.h>

#include <linux/vmalloc.h>

#include <linux/mm.h> /* kvfree() */

#include <acpi/apei.h>



#include "apei-internal.h"
@@ -532,10 +533,7 @@ static int __erst_record_id_cache_add_one(void) 
			return -ENOMEM;

		memcpy(new_entries, entries,

		       erst_record_id_cache.len * sizeof(entries[0]));

		if (erst_record_id_cache.size < PAGE_SIZE)

			kfree(entries);

		else

			vfree(entries);

		kvfree(entries);

		erst_record_id_cache.entries = entries = new_entries;

		erst_record_id_cache.size = new_size;

	}

drivers/block/drbd/drbd_bitmap.c

+7 −19
Original line number Diff line number Diff line
@@ -364,12 +364,9 @@ static void bm_free_pages(struct page **pages, unsigned long number) 
	}

}



static void bm_vk_free(void *ptr, int v)

static inline void bm_vk_free(void *ptr)

{

	if (v)

		vfree(ptr);

	else

		kfree(ptr);

	kvfree(ptr);

}



/*
@@ -379,7 +376,7 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want) 
{

	struct page **old_pages = b->bm_pages;

	struct page **new_pages, *page;

	unsigned int i, bytes, vmalloced = 0;

	unsigned int i, bytes;

	unsigned long have = b->bm_number_of_pages;



	BUG_ON(have == 0 && old_pages != NULL);
@@ -401,7 +398,6 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want) 
				PAGE_KERNEL);

		if (!new_pages)

			return NULL;

		vmalloced = 1;

	}



	if (want >= have) {
@@ -411,7 +407,7 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want) 
			page = alloc_page(GFP_NOIO | __GFP_HIGHMEM);

			if (!page) {

				bm_free_pages(new_pages + have, i - have);

				bm_vk_free(new_pages, vmalloced);

				bm_vk_free(new_pages);

				return NULL;

			}

			/* we want to know which page it is
@@ -427,11 +423,6 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want) 
		*/

	}



	if (vmalloced)

		b->bm_flags |= BM_P_VMALLOCED;

	else

		b->bm_flags &= ~BM_P_VMALLOCED;



	return new_pages;

}
@@ -469,7 +460,7 @@ void drbd_bm_cleanup(struct drbd_device *device) 
	if (!expect(device->bitmap))

		return;

	bm_free_pages(device->bitmap->bm_pages, device->bitmap->bm_number_of_pages);

	bm_vk_free(device->bitmap->bm_pages, (BM_P_VMALLOCED & device->bitmap->bm_flags));

	bm_vk_free(device->bitmap->bm_pages);

	kfree(device->bitmap);

	device->bitmap = NULL;

}
@@ -643,7 +634,6 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi 
	unsigned long want, have, onpages; /* number of pages */

	struct page **npages, **opages = NULL;

	int err = 0, growing;

	int opages_vmalloced;



	if (!expect(b))

		return -ENOMEM;
@@ -656,8 +646,6 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi 
	if (capacity == b->bm_dev_capacity)

		goto out;



	opages_vmalloced = (BM_P_VMALLOCED & b->bm_flags);



	if (capacity == 0) {

		spin_lock_irq(&b->bm_lock);

		opages = b->bm_pages;
@@ -671,7 +659,7 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi 
		b->bm_dev_capacity = 0;

		spin_unlock_irq(&b->bm_lock);

		bm_free_pages(opages, onpages);

		bm_vk_free(opages, opages_vmalloced);

		bm_vk_free(opages);

		goto out;

	}

	bits  = BM_SECT_TO_BIT(ALIGN(capacity, BM_SECT_PER_BIT));
@@ -744,7 +732,7 @@ int drbd_bm_resize(struct drbd_device *device, sector_t capacity, int set_new_bi 


	spin_unlock_irq(&b->bm_lock);

	if (opages != npages)

		bm_vk_free(opages, opages_vmalloced);

		bm_vk_free(opages);

	if (!growing)

		b->bm_set = bm_count_bits(b);

	drbd_info(device, "resync bitmap: bits=%lu words=%lu pages=%lu\n", bits, words, want);