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

Commit c62d2555 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

mm, fs: introduce mapping_gfp_constraint() 



There are many places which use mapping_gfp_mask to restrict a more
generic gfp mask which would be used for allocations which are not
directly related to the page cache but they are performed in the same
context.

Let's introduce a helper function which makes the restriction explicit and
easier to track.  This patch doesn't introduce any functional changes.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarMichal Hocko <mhocko@suse.com>
Suggested-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 89903327

drivers/gpu/drm/drm_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj) 
		 * __GFP_DMA32 to be set in mapping_gfp_mask(inode->i_mapping)

		 * so shmem can relocate pages during swapin if required.

		 */

		BUG_ON((mapping_gfp_mask(mapping) & __GFP_DMA32) &&

		BUG_ON(mapping_gfp_constraint(mapping, __GFP_DMA32) &&

				(page_to_pfn(p) >= 0x00100000UL));

	}

drivers/gpu/drm/i915/i915_gem.c

+1 −2
Original line number Diff line number Diff line
@@ -2214,9 +2214,8 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
	 * Fail silently without starting the shrinker

	 */

	mapping = file_inode(obj->base.filp)->i_mapping;

	gfp = mapping_gfp_mask(mapping);

	gfp = mapping_gfp_constraint(mapping, ~(__GFP_IO | __GFP_RECLAIM));

	gfp |= __GFP_NORETRY | __GFP_NOWARN;

	gfp &= ~(__GFP_IO | __GFP_RECLAIM);

	sg = st->sgl;

	st->nents = 0;

	for (i = 0; i < page_count; i++) {

fs/btrfs/compression.c

+3 −4
Original line number Diff line number Diff line
@@ -482,13 +482,12 @@ static noinline int add_ra_bio_pages(struct inode *inode, 
			goto next;

		}



		page = __page_cache_alloc(mapping_gfp_mask(mapping) &

								~__GFP_FS);

		page = __page_cache_alloc(mapping_gfp_constraint(mapping,

								 ~__GFP_FS));

		if (!page)

			break;



		if (add_to_page_cache_lru(page, mapping, pg_index,

								GFP_NOFS)) {

		if (add_to_page_cache_lru(page, mapping, pg_index, GFP_NOFS)) {

			page_cache_release(page);

			goto next;

		}

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -3316,7 +3316,7 @@ static inline bool btrfs_mixed_space_info(struct btrfs_space_info *space_info) 


static inline gfp_t btrfs_alloc_write_mask(struct address_space *mapping)

{

	return mapping_gfp_mask(mapping) & ~__GFP_FS;

	return mapping_gfp_constraint(mapping, ~__GFP_FS);

}



/* extent-tree.c */

fs/btrfs/free-space-cache.c

+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root, 
	}



	mapping_set_gfp_mask(inode->i_mapping,

			mapping_gfp_mask(inode->i_mapping) &

			~(__GFP_FS | __GFP_HIGHMEM));

			mapping_gfp_constraint(inode->i_mapping,

			~(__GFP_FS | __GFP_HIGHMEM)));



	return inode;

}