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

Commit efb8ad7e authored by Nathan Scott's avatar Nathan Scott Committed by Tim Shimmin
Browse files

[XFS] Add a debug flag for allocations which are known to be larger than 


one page.

SGI-PV: 955302
SGI-Modid: xfs-linux-melb:xfs-kern:26800a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 3f89243c

fs/xfs/linux-2.6/kmem.c

+8 −0
Original line number Diff line number Diff line
@@ -34,6 +34,14 @@ kmem_alloc(size_t size, unsigned int __nocast flags) 
	gfp_t	lflags = kmem_flags_convert(flags);

	void	*ptr;



#ifdef DEBUG

	if (unlikely(!(flags & KM_LARGE) && (size > PAGE_SIZE))) {

		printk(KERN_WARNING "Large %s attempt, size=%ld\n",

			__FUNCTION__, (long)size);

		dump_stack();

	}

#endif



	do {

		if (size < MAX_SLAB_SIZE || retries > MAX_VMALLOCS)

			ptr = kmalloc(size, lflags);

fs/xfs/linux-2.6/kmem.h

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#define KM_NOSLEEP	0x0002u

#define KM_NOFS		0x0004u

#define KM_MAYFAIL	0x0008u

#define KM_LARGE	0x0010u



/*

 * We use a special process flag to avoid recursive callbacks into
@@ -41,7 +42,7 @@ kmem_flags_convert(unsigned int __nocast flags) 
{

	gfp_t	lflags;



	BUG_ON(flags & ~(KM_SLEEP|KM_NOSLEEP|KM_NOFS|KM_MAYFAIL));

	BUG_ON(flags & ~(KM_SLEEP|KM_NOSLEEP|KM_NOFS|KM_MAYFAIL|KM_LARGE));



	if (flags & KM_NOSLEEP) {

		lflags = GFP_ATOMIC | __GFP_NOWARN;

fs/xfs/linux-2.6/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ xfs_buf_get_noaddr( 
	_xfs_buf_initialize(bp, target, 0, len, 0);



 try_again:

	data = kmem_alloc(malloc_len, KM_SLEEP | KM_MAYFAIL);

	data = kmem_alloc(malloc_len, KM_SLEEP | KM_MAYFAIL | KM_LARGE);

	if (unlikely(data == NULL))

		goto fail_free_buf;

fs/xfs/quota/xfs_qm.c

+3 −3
Original line number Diff line number Diff line
@@ -112,17 +112,17 @@ xfs_Gqm_init(void) 
{

	xfs_dqhash_t	*udqhash, *gdqhash;

	xfs_qm_t	*xqm;

	uint		i, hsize, flags = KM_SLEEP | KM_MAYFAIL;

	uint		i, hsize, flags = KM_SLEEP | KM_MAYFAIL | KM_LARGE;



	/*

	 * Initialize the dquot hash tables.

	 */

	hsize = XFS_QM_HASHSIZE_HIGH;

	while (!(udqhash = kmem_zalloc(hsize * sizeof(xfs_dqhash_t), flags))) {

	while (!(udqhash = kmem_zalloc(hsize * sizeof(*udqhash), flags))) {

		if ((hsize >>= 1) <= XFS_QM_HASHSIZE_LOW)

			flags = KM_SLEEP;

	}

	gdqhash = kmem_zalloc(hsize * sizeof(xfs_dqhash_t), KM_SLEEP);

	gdqhash = kmem_zalloc(hsize * sizeof(*gdqhash), KM_SLEEP | KM_LARGE);

	ndquot = hsize << 8;



	xqm = kmem_zalloc(sizeof(xfs_qm_t), KM_SLEEP);

fs/xfs/support/ktrace.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ ktrace_alloc(int nentries, unsigned int __nocast sleep) 
							    sleep);

	} else {

		ktep = (ktrace_entry_t*)kmem_zalloc((nentries * sizeof(*ktep)),

							    sleep);

							    sleep | KM_LARGE);

	}



	if (ktep == NULL) {