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

Commit 3b50b29a authored by Eric Biggers's avatar Eric Biggers Committed by Greg Kroah-Hartman
Browse files

f2fs: don't return vmalloc() memory from f2fs_kmalloc() 



[ Upstream commit 0b6d4ca04a86b9dababbb76e58d33c437e127b77 ]

kmalloc() returns kmalloc'ed memory, and kvmalloc() returns either
kmalloc'ed or vmalloc'ed memory.  But the f2fs wrappers, f2fs_kmalloc()
and f2fs_kvmalloc(), both return both kinds of memory.

It's redundant to have two functions that do the same thing, and also
breaking the standard naming convention is causing bugs since people
assume it's safe to kfree() memory allocated by f2fs_kmalloc().  See
e.g. the various allocations in fs/f2fs/compress.c.

Fix this by making f2fs_kmalloc() just use kmalloc().  And to avoid
re-introducing the allocation failures that the vmalloc fallback was
intended to fix, convert the largest allocations to use f2fs_kvmalloc().

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 37be9b71

fs/f2fs/checkpoint.c

+2 −2
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi) 
	int i;

	int err;



	sbi->ckpt = f2fs_kzalloc(sbi, array_size(blk_size, cp_blks),

	sbi->ckpt = f2fs_kvzalloc(sbi, array_size(blk_size, cp_blks),

				  GFP_KERNEL);

	if (!sbi->ckpt)

		return -ENOMEM;

fs/f2fs/f2fs.h

+1 −7
Original line number Diff line number Diff line
@@ -2790,18 +2790,12 @@ static inline bool f2fs_may_extent_tree(struct inode *inode) 
static inline void *f2fs_kmalloc(struct f2fs_sb_info *sbi,

					size_t size, gfp_t flags)

{

	void *ret;



	if (time_to_inject(sbi, FAULT_KMALLOC)) {

		f2fs_show_injection_info(FAULT_KMALLOC);

		return NULL;

	}



	ret = kmalloc(size, flags);

	if (ret)

		return ret;



	return kvmalloc(size, flags);

	return kmalloc(size, flags);

}



static inline void *f2fs_kzalloc(struct f2fs_sb_info *sbi,

fs/f2fs/node.c

+4 −4
Original line number Diff line number Diff line
@@ -2933,7 +2933,7 @@ static int __get_nat_bitmaps(struct f2fs_sb_info *sbi) 
		return 0;



	nm_i->nat_bits_blocks = F2FS_BLK_ALIGN((nat_bits_bytes << 1) + 8);

	nm_i->nat_bits = f2fs_kzalloc(sbi,

	nm_i->nat_bits = f2fs_kvzalloc(sbi,

			nm_i->nat_bits_blocks << F2FS_BLKSIZE_BITS, GFP_KERNEL);

	if (!nm_i->nat_bits)

		return -ENOMEM;
@@ -3066,7 +3066,7 @@ static int init_free_nid_cache(struct f2fs_sb_info *sbi) 
	int i;



	nm_i->free_nid_bitmap =

		f2fs_kzalloc(sbi, array_size(sizeof(unsigned char *),

		f2fs_kvzalloc(sbi, array_size(sizeof(unsigned char *),

					      nm_i->nat_blocks),

			      GFP_KERNEL);

	if (!nm_i->free_nid_bitmap)

fs/f2fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -2901,7 +2901,7 @@ static int init_blkz_info(struct f2fs_sb_info *sbi, int devi) 
	if (nr_sectors & (bdev_zone_sectors(bdev) - 1))

		FDEV(devi).nr_blkz++;



	FDEV(devi).blkz_seq = f2fs_kzalloc(sbi,

	FDEV(devi).blkz_seq = f2fs_kvzalloc(sbi,

					BITS_TO_LONGS(FDEV(devi).nr_blkz)

					* sizeof(unsigned long),

					GFP_KERNEL);