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

Commit 99d56ff7 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: Always try kmalloc first for OBD_ALLOC_LARGE 



Create libcfs_kvzalloc and libcfs_kvzalloc_cpt that
are designed to replace OBD_ALLOC_LARGE and OBD_CPT_ALLOC_LARGE.

Not a drop-in replacement as they also take gfp flags armument
for more flexibility.

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 640f7d69

drivers/staging/lustre/include/linux/libcfs/libcfs.h

+4 −0
Original line number Diff line number Diff line
@@ -184,4 +184,8 @@ static inline void *__container_of(void *ptr, unsigned long shift) 


#define _LIBCFS_H



void *libcfs_kvzalloc(size_t size, gfp_t flags);

void *libcfs_kvzalloc_cpt(struct cfs_cpt_table *cptab, int cpt, size_t size,

			  gfp_t flags);



#endif /* _LIBCFS_H */

drivers/staging/lustre/lustre/include/obd_support.h

+3 −21
Original line number Diff line number Diff line
@@ -676,37 +676,19 @@ do { \ 
	 __OBD_VMALLOC_VEROBSE(ptr, cptab, cpt, size)





/* Allocations above this size are considered too big and could not be done

 * atomically.

 *

 * Be very careful when changing this value, especially when decreasing it,

 * since vmalloc in Linux doesn't perform well on multi-cores system, calling

 * vmalloc in critical path would hurt performance badly. See LU-66.

 */

#define OBD_ALLOC_BIG (4 * PAGE_CACHE_SIZE)



#define OBD_ALLOC_LARGE(ptr, size)					    \

do {									  \

	if (size > OBD_ALLOC_BIG)					     \

		OBD_VMALLOC(ptr, size);				       \

	else								  \

		OBD_ALLOC(ptr, size);					 \

	ptr = libcfs_kvzalloc(size, GFP_NOFS);				  \

} while (0)



#define OBD_CPT_ALLOC_LARGE(ptr, cptab, cpt, size)			      \

do {									      \

	if (size > OBD_ALLOC_BIG)					      \

		OBD_CPT_VMALLOC(ptr, cptab, cpt, size);			      \

	else								      \

		OBD_CPT_ALLOC(ptr, cptab, cpt, size);			      \

	ptr = libcfs_kvzalloc_cpt(cptab, cpt, size, GFP_NOFS);		      \

} while (0)



#define OBD_FREE_LARGE(ptr, size)					     \

do {									  \

	if (size > OBD_ALLOC_BIG)					     \

		OBD_VFREE(ptr, size);					 \

	else								  \

		OBD_FREE(ptr, size);					  \

	kvfree(ptr);							  \

} while (0)

drivers/staging/lustre/lustre/libcfs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ libcfs-linux-objs += linux-curproc.o 
libcfs-linux-objs += linux-module.o

libcfs-linux-objs += linux-crypto.o

libcfs-linux-objs += linux-crypto-adler.o

libcfs-linux-objs += linux-mem.o



libcfs-linux-objs := $(addprefix linux/,$(libcfs-linux-objs))

drivers/staging/lustre/lustre/libcfs/linux/linux-mem.c

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 only,

 * as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License version 2 for more details (a copy is included

 * in the LICENSE file that accompanied this code).

 *

 * You should have received a copy of the GNU General Public License

 * version 2 along with this program; If not, see

 * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf

 *

 */

/*

 * This file creates a memory allocation primitive for Lustre, that

 * allows to fallback to vmalloc allocations should regular kernel allocations

 * fail due to size or system memory fragmentation.

 *

 * Author: Oleg Drokin <green@linuxhacker.ru>

 *

 */

/*

 * This file is part of Lustre, http://www.lustre.org/

 * Lustre is a trademark of Seagate Technology.

 */

#include <linux/slab.h>

#include <linux/vmalloc.h>



#include "../../../include/linux/libcfs/libcfs.h"



void *libcfs_kvzalloc(size_t size, gfp_t flags)

{

	void *ret;



	ret = kzalloc(size, flags | __GFP_NOWARN);

	if (!ret)

		ret = __vmalloc(size, flags | __GFP_ZERO, PAGE_KERNEL);

	return ret;

}

EXPORT_SYMBOL(libcfs_kvzalloc);



void *libcfs_kvzalloc_cpt(struct cfs_cpt_table *cptab, int cpt, size_t size,

			  gfp_t flags)

{

	void *ret;



	ret = kzalloc_node(size, flags | __GFP_NOWARN,

			   cfs_cpt_spread_node(cptab, cpt));

	if (!ret) {

		WARN_ON(!(flags & (__GFP_FS|__GFP_HIGH)));

		ret = vmalloc_node(size, cfs_cpt_spread_node(cptab, cpt));

	}



	return ret;

}

EXPORT_SYMBOL(libcfs_kvzalloc_cpt);