98fe2c3cef
Since commit 59bb47985c ("mm, sl[aou]b: guarantee natural alignment
for kmalloc(power-of-two)"), the core slab code now guarantees slab
alignment in all situations sufficient for IO purposes (i.e. minimum
of 512 byte alignment of >= 512 byte sized heap allocations) we no
longer need the workaround in the XFS code to provide this
guarantee.
Replace the use of kmem_alloc_io() with kmem_alloc() or
kmem_alloc_large() appropriately, and remove the kmem_alloc_io()
interface altogether.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
71 lines
1.6 KiB
C
71 lines
1.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
|
|
* All Rights Reserved.
|
|
*/
|
|
#include "xfs.h"
|
|
#include <linux/backing-dev.h>
|
|
#include "xfs_message.h"
|
|
#include "xfs_trace.h"
|
|
|
|
void *
|
|
kmem_alloc(size_t size, xfs_km_flags_t flags)
|
|
{
|
|
int retries = 0;
|
|
gfp_t lflags = kmem_flags_convert(flags);
|
|
void *ptr;
|
|
|
|
trace_kmem_alloc(size, flags, _RET_IP_);
|
|
|
|
do {
|
|
ptr = kmalloc(size, lflags);
|
|
if (ptr || (flags & KM_MAYFAIL))
|
|
return ptr;
|
|
if (!(++retries % 100))
|
|
xfs_err(NULL,
|
|
"%s(%u) possible memory allocation deadlock size %u in %s (mode:0x%x)",
|
|
current->comm, current->pid,
|
|
(unsigned int)size, __func__, lflags);
|
|
congestion_wait(BLK_RW_ASYNC, HZ/50);
|
|
} while (1);
|
|
}
|
|
|
|
|
|
/*
|
|
* __vmalloc() will allocate data pages and auxiliary structures (e.g.
|
|
* pagetables) with GFP_KERNEL, yet we may be under GFP_NOFS context here. Hence
|
|
* we need to tell memory reclaim that we are in such a context via
|
|
* PF_MEMALLOC_NOFS to prevent memory reclaim re-entering the filesystem here
|
|
* and potentially deadlocking.
|
|
*/
|
|
static void *
|
|
__kmem_vmalloc(size_t size, xfs_km_flags_t flags)
|
|
{
|
|
unsigned nofs_flag = 0;
|
|
void *ptr;
|
|
gfp_t lflags = kmem_flags_convert(flags);
|
|
|
|
if (flags & KM_NOFS)
|
|
nofs_flag = memalloc_nofs_save();
|
|
|
|
ptr = __vmalloc(size, lflags);
|
|
|
|
if (flags & KM_NOFS)
|
|
memalloc_nofs_restore(nofs_flag);
|
|
|
|
return ptr;
|
|
}
|
|
|
|
void *
|
|
kmem_alloc_large(size_t size, xfs_km_flags_t flags)
|
|
{
|
|
void *ptr;
|
|
|
|
trace_kmem_alloc_large(size, flags, _RET_IP_);
|
|
|
|
ptr = kmem_alloc(size, flags | KM_MAYFAIL);
|
|
if (ptr)
|
|
return ptr;
|
|
return __kmem_vmalloc(size, flags);
|
|
}
|