Merge branch 'akpm' (patches from Andrew Morton)

Merge misc fixes from Andrew Morton: "7 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm/debug_pagealloc: fix build failure on ppc and some other archs nilfs2: fix deadlock of segment constructor over I_SYNC flag MAINTAINERS: remove SUPERH website memcg, shmem: fix shmem migration to use lrucare mm: export "high_memory" symbol on !MMU .mailmap: update Konstantin Khlebnikov's email address mm: pagewalk: call pte_hole() for VM_PFNMAP during walk_page_range

Merge branch 'akpm' (patches from Andrew Morton)
Merge misc fixes from Andrew Morton: "7 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm/debug_pagealloc: fix build failure on ppc and some other archs nilfs2: fix deadlock of segment constructor over I_SYNC flag MAINTAINERS: remove SUPERH website memcg, shmem: fix shmem migration to use lrucare mm: export "high_memory" symbol on !MMU .mailmap: update Konstantin Khlebnikov's email address mm: pagewalk: call pte_hole() for VM_PFNMAP during walk_page_range
Linus Torvalds
2 parents dbf3b7ddba 7b02190c27
Showing 13 changed files Side-by-side Diff
.mailmap
MAINTAINERS
arch/mn10300/include/asm/cacheflush.h
arch/powerpc/include/asm/cacheflush.h
arch/s390/include/asm/cacheflush.h
arch/sparc/include/asm/cacheflush_64.h
fs/nilfs2/nilfs.h
fs/nilfs2/segment.c
fs/nilfs2/segment.h
mm/memcontrol.c
mm/nommu.c
mm/pagewalk.c
mm/shmem.c
@@ -73,6 +73,7 @@
 Juha Yrjola <juha.yrjola@solidboot.com>
 Kay Sievers <kay.sievers@vrfy.org>
 Kenneth W Chen <kenneth.w.chen@intel.com>
+Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
 Koushik <raghavendra.koushik@neterion.com>
 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
 Leonid I Ananiev <leonid.i.ananiev@intel.com>
@@ -9241,7 +9241,6 @@
  
 SUPERH
 L:	linux-sh@vger.kernel.org
-W:	http://www.linux-sh.org
 Q:	http://patchwork.kernel.org/project/linux-sh/list/
 S:	Orphan
 F:	Documentation/sh/
@@ -159,13 +159,6 @@
 #define copy_from_user_page(vma, page, vaddr, dst, src, len) \
 	memcpy(dst, src, len)
  
-/*
- * Internal debugging function
- */
-#ifdef CONFIG_DEBUG_PAGEALLOC
-extern void kernel_map_pages(struct page *page, int numpages, int enable);
-#endif
-
 #endif /* __ASSEMBLY__ */
  
 #endif /* _ASM_CACHEFLUSH_H */
@@ -60,13 +60,6 @@
 #define copy_from_user_page(vma, page, vaddr, dst, src, len) \
 	memcpy(dst, src, len)
  
-
-
-#ifdef CONFIG_DEBUG_PAGEALLOC
-/* internal debugging function */
-void kernel_map_pages(struct page *page, int numpages, int enable);
-#endif
-
 #endif /* __KERNEL__ */
  
 #endif /* _ASM_POWERPC_CACHEFLUSH_H */
@@ -4,10 +4,6 @@
 /* Caches aren't brain-dead on the s390. */
 #include <asm-generic/cacheflush.h>
  
-#ifdef CONFIG_DEBUG_PAGEALLOC
-void kernel_map_pages(struct page *page, int numpages, int enable);
-#endif
-
 int set_memory_ro(unsigned long addr, int numpages);
 int set_memory_rw(unsigned long addr, int numpages);
 int set_memory_nx(unsigned long addr, int numpages);
@@ -74,11 +74,6 @@
 #define flush_cache_vmap(start, end)		do { } while (0)
 #define flush_cache_vunmap(start, end)		do { } while (0)
  
-#ifdef CONFIG_DEBUG_PAGEALLOC
-/* internal debugging function */
-void kernel_map_pages(struct page *page, int numpages, int enable);
-#endif
-
 #endif /* !__ASSEMBLY__ */
  
 #endif /* _SPARC64_CACHEFLUSH_H */
@@ -141,7 +141,6 @@
  * @ti_save: Backup of journal_info field of task_struct
  * @ti_flags: Flags
  * @ti_count: Nest level
- * @ti_garbage:	List of inode to be put when releasing semaphore
  */
 struct nilfs_transaction_info {
 	u32			ti_magic;
@@ -150,7 +149,6 @@
 				   one of other filesystems has a bug. */
 	unsigned short		ti_flags;
 	unsigned short		ti_count;
-	struct list_head	ti_garbage;
 };
  
 /* ti_magic */
@@ -305,7 +305,6 @@
 	ti->ti_count = 0;
 	ti->ti_save = cur_ti;
 	ti->ti_magic = NILFS_TI_MAGIC;
-	INIT_LIST_HEAD(&ti->ti_garbage);
 	current->journal_info = ti;
  
 	for (;;) {
@@ -332,8 +331,6 @@
  
 	up_write(&nilfs->ns_segctor_sem);
 	current->journal_info = ti->ti_save;
-	if (!list_empty(&ti->ti_garbage))
-		nilfs_dispose_list(nilfs, &ti->ti_garbage, 0);
 }
  
 static void *nilfs_segctor_map_segsum_entry(struct nilfs_sc_info *sci,
@@ -746,6 +743,15 @@
 	}
 }
  
+static void nilfs_iput_work_func(struct work_struct *work)
+{
+	struct nilfs_sc_info *sci = container_of(work, struct nilfs_sc_info,
+						 sc_iput_work);
+	struct the_nilfs *nilfs = sci->sc_super->s_fs_info;
+
+	nilfs_dispose_list(nilfs, &sci->sc_iput_queue, 0);
+}
+
 static int nilfs_test_metadata_dirty(struct the_nilfs *nilfs,
 				     struct nilfs_root *root)
 {
  
@@ -1900,8 +1906,8 @@
 static void nilfs_segctor_drop_written_files(struct nilfs_sc_info *sci,
 					     struct the_nilfs *nilfs)
 {
-	struct nilfs_transaction_info *ti = current->journal_info;
 	struct nilfs_inode_info *ii, *n;
+	int defer_iput = false;
  
 	spin_lock(&nilfs->ns_inode_lock);
 	list_for_each_entry_safe(ii, n, &sci->sc_dirty_files, i_dirty) {
  
@@ -1912,9 +1918,24 @@
 		clear_bit(NILFS_I_BUSY, &ii->i_state);
 		brelse(ii->i_bh);
 		ii->i_bh = NULL;
-		list_move_tail(&ii->i_dirty, &ti->ti_garbage);
+		list_del_init(&ii->i_dirty);
+		if (!ii->vfs_inode.i_nlink) {
+			/*
+			 * Defer calling iput() to avoid a deadlock
+			 * over I_SYNC flag for inodes with i_nlink == 0
+			 */
+			list_add_tail(&ii->i_dirty, &sci->sc_iput_queue);
+			defer_iput = true;
+		} else {
+			spin_unlock(&nilfs->ns_inode_lock);
+			iput(&ii->vfs_inode);
+			spin_lock(&nilfs->ns_inode_lock);
+		}
 	}
 	spin_unlock(&nilfs->ns_inode_lock);
+
+	if (defer_iput)
+		schedule_work(&sci->sc_iput_work);
 }
  
 /*
@@ -2583,6 +2604,8 @@
 	INIT_LIST_HEAD(&sci->sc_segbufs);
 	INIT_LIST_HEAD(&sci->sc_write_logs);
 	INIT_LIST_HEAD(&sci->sc_gc_inodes);
+	INIT_LIST_HEAD(&sci->sc_iput_queue);
+	INIT_WORK(&sci->sc_iput_work, nilfs_iput_work_func);
 	init_timer(&sci->sc_timer);
  
 	sci->sc_interval = HZ * NILFS_SC_DEFAULT_TIMEOUT;
@@ -2609,6 +2632,8 @@
 		ret = nilfs_segctor_construct(sci, SC_LSEG_SR);
 		nilfs_transaction_unlock(sci->sc_super);
  
+		flush_work(&sci->sc_iput_work);
+
 	} while (ret && retrycount-- > 0);
 }
  
@@ -2633,6 +2658,9 @@
 		|| sci->sc_seq_request != sci->sc_seq_done);
 	spin_unlock(&sci->sc_state_lock);
  
+	if (flush_work(&sci->sc_iput_work))
+		flag = true;
+
 	if (flag || !nilfs_segctor_confirm(sci))
 		nilfs_segctor_write_out(sci);
  
@@ -2640,6 +2668,12 @@
 		nilfs_warning(sci->sc_super, __func__,
 			      "dirty file(s) after the final construction\n");
 		nilfs_dispose_list(nilfs, &sci->sc_dirty_files, 1);
+	}
+
+	if (!list_empty(&sci->sc_iput_queue)) {
+		nilfs_warning(sci->sc_super, __func__,
+			      "iput queue is not empty\n");
+		nilfs_dispose_list(nilfs, &sci->sc_iput_queue, 1);
 	}
  
 	WARN_ON(!list_empty(&sci->sc_segbufs));
@@ -26,6 +26,7 @@
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/buffer_head.h>
+#include <linux/workqueue.h>
 #include <linux/nilfs2_fs.h>
 #include "nilfs.h"
  
@@ -92,6 +93,8 @@
  * @sc_nblk_inc: Block count of current generation
  * @sc_dirty_files: List of files to be written
  * @sc_gc_inodes: List of GC inodes having blocks to be written
+ * @sc_iput_queue: list of inodes for which iput should be done
+ * @sc_iput_work: work struct to defer iput call
  * @sc_freesegs: array of segment numbers to be freed
  * @sc_nfreesegs: number of segments on @sc_freesegs
  * @sc_dsync_inode: inode whose data pages are written for a sync operation
@@ -135,6 +138,8 @@
  
 	struct list_head	sc_dirty_files;
 	struct list_head	sc_gc_inodes;
+	struct list_head	sc_iput_queue;
+	struct work_struct	sc_iput_work;
  
 	__u64		       *sc_freesegs;
 	size_t			sc_nfreesegs;
@@ -5773,7 +5773,7 @@
  * mem_cgroup_migrate - migrate a charge to another page
  * @oldpage: currently charged page
  * @newpage: page to transfer the charge to
- * @lrucare: both pages might be on the LRU already
+ * @lrucare: either or both pages might be on the LRU already
  *
  * Migrate the charge from @oldpage to @newpage.
  *
@@ -59,6 +59,7 @@
 #endif
  
 void *high_memory;
+EXPORT_SYMBOL(high_memory);
 struct page *mem_map;
 unsigned long max_mapnr;
 unsigned long highest_memmap_pfn;
@@ -199,7 +199,10 @@
 			 */
 			if ((vma->vm_start <= addr) &&
 			    (vma->vm_flags & VM_PFNMAP)) {
-				next = vma->vm_end;
+				if (walk->pte_hole)
+					err = walk->pte_hole(addr, next, walk);
+				if (err)
+					break;
 				pgd = pgd_offset(walk->mm, next);
 				continue;
 			}
@@ -1013,7 +1013,7 @@
 		 */
 		oldpage = newpage;
 	} else {
-		mem_cgroup_migrate(oldpage, newpage, false);
+		mem_cgroup_migrate(oldpage, newpage, true);
 		lru_cache_add_anon(newpage);
 		*pagep = newpage;
 	}
...	...	@@ -73,6 +73,7 @@
73	73	Juha Yrjola <juha.yrjola@solidboot.com>
74	74	Kay Sievers <kay.sievers@vrfy.org>
75	75	Kenneth W Chen <kenneth.w.chen@intel.com>
	76	+Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
76	77	Koushik <raghavendra.koushik@neterion.com>
77	78	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
78	79	Leonid I Ananiev <leonid.i.ananiev@intel.com>
...	...	@@ -9241,7 +9241,6 @@
9241	9241
9242	9242	SUPERH
9243	9243	L: linux-sh@vger.kernel.org
9244		-W: http://www.linux-sh.org
9245	9244	Q: http://patchwork.kernel.org/project/linux-sh/list/
9246	9245	S: Orphan
9247	9246	F: Documentation/sh/
...	...	@@ -159,13 +159,6 @@
159	159	#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
160	160	memcpy(dst, src, len)
161	161
162		-/*
163		- * Internal debugging function
164		- */
165		-#ifdef CONFIG_DEBUG_PAGEALLOC
166		-extern void kernel_map_pages(struct page *page, int numpages, int enable);
167		-#endif
168		-
169	162	#endif /* __ASSEMBLY__ */
170	163
171	164	#endif /* _ASM_CACHEFLUSH_H */
...	...	@@ -60,13 +60,6 @@
60	60	#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
61	61	memcpy(dst, src, len)
62	62
63		-
64		-
65		-#ifdef CONFIG_DEBUG_PAGEALLOC
66		-/* internal debugging function */
67		-void kernel_map_pages(struct page *page, int numpages, int enable);
68		-#endif
69		-
70	63	#endif /* __KERNEL__ */
71	64
72	65	#endif /* _ASM_POWERPC_CACHEFLUSH_H */
...	...	@@ -4,10 +4,6 @@
4	4	/* Caches aren't brain-dead on the s390. */
5	5	#include <asm-generic/cacheflush.h>
6	6
7		-#ifdef CONFIG_DEBUG_PAGEALLOC
8		-void kernel_map_pages(struct page *page, int numpages, int enable);
9		-#endif
10		-
11	7	int set_memory_ro(unsigned long addr, int numpages);
12	8	int set_memory_rw(unsigned long addr, int numpages);
13	9	int set_memory_nx(unsigned long addr, int numpages);
...	...	@@ -74,11 +74,6 @@
74	74	#define flush_cache_vmap(start, end) do { } while (0)
75	75	#define flush_cache_vunmap(start, end) do { } while (0)
76	76
77		-#ifdef CONFIG_DEBUG_PAGEALLOC
78		-/* internal debugging function */
79		-void kernel_map_pages(struct page *page, int numpages, int enable);
80		-#endif
81		-
82	77	#endif /* !__ASSEMBLY__ */
83	78
84	79	#endif /* _SPARC64_CACHEFLUSH_H */
...	...	@@ -141,7 +141,6 @@
141	141	* @ti_save: Backup of journal_info field of task_struct
142	142	* @ti_flags: Flags
143	143	* @ti_count: Nest level
144		- * @ti_garbage: List of inode to be put when releasing semaphore
145	144	*/
146	145	struct nilfs_transaction_info {
147	146	u32 ti_magic;
...	...	@@ -150,7 +149,6 @@
150	149	one of other filesystems has a bug. */
151	150	unsigned short ti_flags;
152	151	unsigned short ti_count;
153		- struct list_head ti_garbage;
154	152	};
155	153
156	154	/* ti_magic */
...	...	@@ -305,7 +305,6 @@
305	305	ti->ti_count = 0;
306	306	ti->ti_save = cur_ti;
307	307	ti->ti_magic = NILFS_TI_MAGIC;
308		- INIT_LIST_HEAD(&ti->ti_garbage);
309	308	current->journal_info = ti;
310	309
311	310	for (;;) {
...	...	@@ -332,8 +331,6 @@
332	331
333	332	up_write(&nilfs->ns_segctor_sem);
334	333	current->journal_info = ti->ti_save;
335		- if (!list_empty(&ti->ti_garbage))
336		- nilfs_dispose_list(nilfs, &ti->ti_garbage, 0);
337	334	}
338	335
339	336	static void nilfs_segctor_map_segsum_entry(struct nilfs_sc_info sci,
...	...	@@ -746,6 +743,15 @@
746	743	}
747	744	}
748	745
	746	+static void nilfs_iput_work_func(struct work_struct *work)
	747	+{
	748	+ struct nilfs_sc_info *sci = container_of(work, struct nilfs_sc_info,
	749	+ sc_iput_work);
	750	+ struct the_nilfs *nilfs = sci->sc_super->s_fs_info;
	751	+
	752	+ nilfs_dispose_list(nilfs, &sci->sc_iput_queue, 0);
	753	+}
	754	+
749	755	static int nilfs_test_metadata_dirty(struct the_nilfs *nilfs,
750	756	struct nilfs_root *root)
751	757	{
752	758
...	...	@@ -1900,8 +1906,8 @@
1900	1906	static void nilfs_segctor_drop_written_files(struct nilfs_sc_info *sci,
1901	1907	struct the_nilfs *nilfs)
1902	1908	{
1903		- struct nilfs_transaction_info *ti = current->journal_info;
1904	1909	struct nilfs_inode_info ii, n;
	1910	+ int defer_iput = false;
1905	1911
1906	1912	spin_lock(&nilfs->ns_inode_lock);
1907	1913	list_for_each_entry_safe(ii, n, &sci->sc_dirty_files, i_dirty) {
1908	1914
...	...	@@ -1912,9 +1918,24 @@
1912	1918	clear_bit(NILFS_I_BUSY, &ii->i_state);
1913	1919	brelse(ii->i_bh);
1914	1920	ii->i_bh = NULL;
1915		- list_move_tail(&ii->i_dirty, &ti->ti_garbage);
	1921	+ list_del_init(&ii->i_dirty);
	1922	+ if (!ii->vfs_inode.i_nlink) {
	1923	+ /*
	1924	+ * Defer calling iput() to avoid a deadlock
	1925	+ * over I_SYNC flag for inodes with i_nlink == 0
	1926	+ */
	1927	+ list_add_tail(&ii->i_dirty, &sci->sc_iput_queue);
	1928	+ defer_iput = true;
	1929	+ } else {
	1930	+ spin_unlock(&nilfs->ns_inode_lock);
	1931	+ iput(&ii->vfs_inode);
	1932	+ spin_lock(&nilfs->ns_inode_lock);
	1933	+ }
1916	1934	}
1917	1935	spin_unlock(&nilfs->ns_inode_lock);
	1936	+
	1937	+ if (defer_iput)
	1938	+ schedule_work(&sci->sc_iput_work);
1918	1939	}
1919	1940
1920	1941	/*
...	...	@@ -2583,6 +2604,8 @@
2583	2604	INIT_LIST_HEAD(&sci->sc_segbufs);
2584	2605	INIT_LIST_HEAD(&sci->sc_write_logs);
2585	2606	INIT_LIST_HEAD(&sci->sc_gc_inodes);
	2607	+ INIT_LIST_HEAD(&sci->sc_iput_queue);
	2608	+ INIT_WORK(&sci->sc_iput_work, nilfs_iput_work_func);
2586	2609	init_timer(&sci->sc_timer);
2587	2610
2588	2611	sci->sc_interval = HZ * NILFS_SC_DEFAULT_TIMEOUT;
...	...	@@ -2609,6 +2632,8 @@
2609	2632	ret = nilfs_segctor_construct(sci, SC_LSEG_SR);
2610	2633	nilfs_transaction_unlock(sci->sc_super);
2611	2634
	2635	+ flush_work(&sci->sc_iput_work);
	2636	+
2612	2637	} while (ret && retrycount-- > 0);
2613	2638	}
2614	2639
...	...	@@ -2633,6 +2658,9 @@
2633	2658	\|\| sci->sc_seq_request != sci->sc_seq_done);
2634	2659	spin_unlock(&sci->sc_state_lock);
2635	2660
	2661	+ if (flush_work(&sci->sc_iput_work))
	2662	+ flag = true;
	2663	+
2636	2664	if (flag \|\| !nilfs_segctor_confirm(sci))
2637	2665	nilfs_segctor_write_out(sci);
2638	2666
...	...	@@ -2640,6 +2668,12 @@
2640	2668	nilfs_warning(sci->sc_super, __func__,
2641	2669	"dirty file(s) after the final construction\n");
2642	2670	nilfs_dispose_list(nilfs, &sci->sc_dirty_files, 1);
	2671	+ }
	2672	+
	2673	+ if (!list_empty(&sci->sc_iput_queue)) {
	2674	+ nilfs_warning(sci->sc_super, __func__,
	2675	+ "iput queue is not empty\n");
	2676	+ nilfs_dispose_list(nilfs, &sci->sc_iput_queue, 1);
2643	2677	}
2644	2678
2645	2679	WARN_ON(!list_empty(&sci->sc_segbufs));
...	...	@@ -26,6 +26,7 @@
26	26	#include <linux/types.h>
27	27	#include <linux/fs.h>
28	28	#include <linux/buffer_head.h>
	29	+#include <linux/workqueue.h>
29	30	#include <linux/nilfs2_fs.h>
30	31	#include "nilfs.h"
31	32
...	...	@@ -92,6 +93,8 @@
92	93	* @sc_nblk_inc: Block count of current generation
93	94	* @sc_dirty_files: List of files to be written
94	95	* @sc_gc_inodes: List of GC inodes having blocks to be written
	96	+ * @sc_iput_queue: list of inodes for which iput should be done
	97	+ * @sc_iput_work: work struct to defer iput call
95	98	* @sc_freesegs: array of segment numbers to be freed
96	99	* @sc_nfreesegs: number of segments on @sc_freesegs
97	100	* @sc_dsync_inode: inode whose data pages are written for a sync operation
...	...	@@ -135,6 +138,8 @@
135	138
136	139	struct list_head sc_dirty_files;
137	140	struct list_head sc_gc_inodes;
	141	+ struct list_head sc_iput_queue;
	142	+ struct work_struct sc_iput_work;
138	143
139	144	__u64 *sc_freesegs;
140	145	size_t sc_nfreesegs;
...	...	@@ -5773,7 +5773,7 @@
5773	5773	* mem_cgroup_migrate - migrate a charge to another page
5774	5774	* @oldpage: currently charged page
5775	5775	* @newpage: page to transfer the charge to
5776		- * @lrucare: both pages might be on the LRU already
	5776	+ * @lrucare: either or both pages might be on the LRU already
5777	5777	*
5778	5778	* Migrate the charge from @oldpage to @newpage.
5779	5779	*