* [PATCH V2 1/5] xfs: Remove kmem_zone_alloc() usage
2020-07-10 9:15 [PATCH 0/5] Continue xfs kmem cleanup - V2 Carlos Maiolino
@ 2020-07-10 9:15 ` Carlos Maiolino
2020-07-10 16:08 ` Christoph Hellwig
2020-07-10 9:15 ` [PATCH V2 2/5] xfs: Remove kmem_zone_zalloc() usage Carlos Maiolino
` (3 subsequent siblings)
4 siblings, 1 reply; 21+ messages in thread
From: Carlos Maiolino @ 2020-07-10 9:15 UTC (permalink / raw)
To: linux-xfs
Use kmem_cache_alloc() directly.
All kmem_zone_alloc() users pass 0 as flags, which are translated into:
GFP_KERNEL | __GFP_NOWARN, and kmem_zone_alloc() loops forever until the
allocation succeeds.
We can use __GFP_NOFAIL to tell the allocator to loop forever rather
than doing it ourself, and because the allocation will never fail, we do
not need to use __GFP_NOWARN anymore. Hence, all callers can be
converted to use GFP_KERNEL | __GFP_NOFAIL
Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
---
Changelog:
V2: - Wire up xfs_inode_alloc to use __GFP_NOFAIL
if it's called inside a transaction
- Rewrite changelog in a more decent way.
fs/xfs/libxfs/xfs_alloc.c | 3 ++-
fs/xfs/libxfs/xfs_bmap.c | 3 ++-
fs/xfs/xfs_icache.c | 13 +++++++++----
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
index 203e74fa64aa6..583242253c027 100644
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -2467,7 +2467,8 @@ xfs_defer_agfl_block(
ASSERT(xfs_bmap_free_item_zone != NULL);
ASSERT(oinfo != NULL);
- new = kmem_zone_alloc(xfs_bmap_free_item_zone, 0);
+ new = kmem_cache_alloc(xfs_bmap_free_item_zone,
+ GFP_KERNEL | __GFP_NOFAIL);
new->xefi_startblock = XFS_AGB_TO_FSB(mp, agno, agbno);
new->xefi_blockcount = 1;
new->xefi_oinfo = *oinfo;
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 667cdd0dfdf4a..fd5c0d669d0d7 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -553,7 +553,8 @@ __xfs_bmap_add_free(
#endif
ASSERT(xfs_bmap_free_item_zone != NULL);
- new = kmem_zone_alloc(xfs_bmap_free_item_zone, 0);
+ new = kmem_cache_alloc(xfs_bmap_free_item_zone,
+ GFP_KERNEL | __GFP_NOFAIL);
new->xefi_startblock = bno;
new->xefi_blockcount = (xfs_extlen_t)len;
if (oinfo)
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index 5daef654956cb..8c3fe7ef56e27 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -35,15 +35,20 @@ xfs_inode_alloc(
xfs_ino_t ino)
{
struct xfs_inode *ip;
+ gfp_t gfp_mask = GFP_KERNEL;
/*
- * if this didn't occur in transactions, we could use
- * KM_MAYFAIL and return NULL here on ENOMEM. Set the
- * code up to do this anyway.
+ * If this is inside a transaction, we can not fail here,
+ * otherwise we can return NULL on ENOMEM.
*/
- ip = kmem_zone_alloc(xfs_inode_zone, 0);
+
+ if (current->flags & PF_MEMALLOC_NOFS)
+ gfp_mask |= __GFP_NOFAIL;
+
+ ip = kmem_cache_alloc(xfs_inode_zone, gfp_mask);
if (!ip)
return NULL;
+
if (inode_init_always(mp->m_super, VFS_I(ip))) {
kmem_cache_free(xfs_inode_zone, ip);
return NULL;
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH V2 1/5] xfs: Remove kmem_zone_alloc() usage
2020-07-10 9:15 ` [PATCH V2 1/5] xfs: Remove kmem_zone_alloc() usage Carlos Maiolino
@ 2020-07-10 16:08 ` Christoph Hellwig
2020-07-10 22:21 ` Dave Chinner
0 siblings, 1 reply; 21+ messages in thread
From: Christoph Hellwig @ 2020-07-10 16:08 UTC (permalink / raw)
To: Carlos Maiolino; +Cc: linux-xfs
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index 5daef654956cb..8c3fe7ef56e27 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
> @@ -35,15 +35,20 @@ xfs_inode_alloc(
> xfs_ino_t ino)
> {
> struct xfs_inode *ip;
> + gfp_t gfp_mask = GFP_KERNEL;
>
> /*
> - * if this didn't occur in transactions, we could use
> - * KM_MAYFAIL and return NULL here on ENOMEM. Set the
> - * code up to do this anyway.
> + * If this is inside a transaction, we can not fail here,
> + * otherwise we can return NULL on ENOMEM.
> */
> - ip = kmem_zone_alloc(xfs_inode_zone, 0);
> +
> + if (current->flags & PF_MEMALLOC_NOFS)
> + gfp_mask |= __GFP_NOFAIL;
I'm a little worried about this change in beavior here. Can we
just keep the unconditional __GFP_NOFAIL and if we really care do the
change separately after the series? At that point it should probably
use the re-added PF_FSTRANS flag as well.
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH V2 1/5] xfs: Remove kmem_zone_alloc() usage
2020-07-10 16:08 ` Christoph Hellwig
@ 2020-07-10 22:21 ` Dave Chinner
2020-07-13 9:16 ` Carlos Maiolino
0 siblings, 1 reply; 21+ messages in thread
From: Dave Chinner @ 2020-07-10 22:21 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: Carlos Maiolino, linux-xfs
On Fri, Jul 10, 2020 at 05:08:04PM +0100, Christoph Hellwig wrote:
> > diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> > index 5daef654956cb..8c3fe7ef56e27 100644
> > --- a/fs/xfs/xfs_icache.c
> > +++ b/fs/xfs/xfs_icache.c
> > @@ -35,15 +35,20 @@ xfs_inode_alloc(
> > xfs_ino_t ino)
> > {
> > struct xfs_inode *ip;
> > + gfp_t gfp_mask = GFP_KERNEL;
> >
> > /*
> > - * if this didn't occur in transactions, we could use
> > - * KM_MAYFAIL and return NULL here on ENOMEM. Set the
> > - * code up to do this anyway.
> > + * If this is inside a transaction, we can not fail here,
> > + * otherwise we can return NULL on ENOMEM.
> > */
> > - ip = kmem_zone_alloc(xfs_inode_zone, 0);
> > +
> > + if (current->flags & PF_MEMALLOC_NOFS)
> > + gfp_mask |= __GFP_NOFAIL;
>
> I'm a little worried about this change in beavior here. Can we
> just keep the unconditional __GFP_NOFAIL and if we really care do the
> change separately after the series? At that point it should probably
> use the re-added PF_FSTRANS flag as well.
Checking PF_FSTRANS was what I suggested should be done here, not
PF_MEMALLOC_NOFS...
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH V2 1/5] xfs: Remove kmem_zone_alloc() usage
2020-07-10 22:21 ` Dave Chinner
@ 2020-07-13 9:16 ` Carlos Maiolino
2020-07-13 16:17 ` Darrick J. Wong
0 siblings, 1 reply; 21+ messages in thread
From: Carlos Maiolino @ 2020-07-13 9:16 UTC (permalink / raw)
To: Dave Chinner; +Cc: Christoph Hellwig, linux-xfs
Hi Dave, Christoph.
> > > - ip = kmem_zone_alloc(xfs_inode_zone, 0);
> > > +
> > > + if (current->flags & PF_MEMALLOC_NOFS)
> > > + gfp_mask |= __GFP_NOFAIL;
> >
> > I'm a little worried about this change in beavior here. Can we
> > just keep the unconditional __GFP_NOFAIL and if we really care do the
> > change separately after the series? At that point it should probably
> > use the re-added PF_FSTRANS flag as well.
> Checking PF_FSTRANS was what I suggested should be done here, not
> PF_MEMALLOC_NOFS...
No problem in splitting this change into 2 patches, 1 by unconditionally use
__GFP_NOFAIL, and another changing the behavior to use NOFAIL only inside a
transaction.
Regarding the PF_FSTRANS flag, I opted by PF_MEMALLOC_NOFS after reading the
commit which removed PF_FSTRANS initially (didn't mean to ignore your suggestion
Dave, my apologies if I sounded like that), but I actually didn't find any commit
re-adding PF_FSTRANS back. I searched most trees but couldn't find any commit
re-adding it back, could you guys please point me out where is the commit adding
it back?
>
> Cheers,
>
> Dave.
> --
> Dave Chinner
> david@fromorbit.com
>
--
Carlos
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH V2 1/5] xfs: Remove kmem_zone_alloc() usage
2020-07-13 9:16 ` Carlos Maiolino
@ 2020-07-13 16:17 ` Darrick J. Wong
2020-07-15 15:06 ` Carlos Maiolino
0 siblings, 1 reply; 21+ messages in thread
From: Darrick J. Wong @ 2020-07-13 16:17 UTC (permalink / raw)
To: Dave Chinner, Christoph Hellwig, linux-xfs
On Mon, Jul 13, 2020 at 11:16:10AM +0200, Carlos Maiolino wrote:
> Hi Dave, Christoph.
>
> > > > - ip = kmem_zone_alloc(xfs_inode_zone, 0);
> > > > +
> > > > + if (current->flags & PF_MEMALLOC_NOFS)
> > > > + gfp_mask |= __GFP_NOFAIL;
> > >
> > > I'm a little worried about this change in beavior here. Can we
> > > just keep the unconditional __GFP_NOFAIL and if we really care do the
> > > change separately after the series? At that point it should probably
> > > use the re-added PF_FSTRANS flag as well.
>
> > Checking PF_FSTRANS was what I suggested should be done here, not
> > PF_MEMALLOC_NOFS...
>
>
> No problem in splitting this change into 2 patches, 1 by unconditionally use
> __GFP_NOFAIL, and another changing the behavior to use NOFAIL only inside a
> transaction.
>
> Regarding the PF_FSTRANS flag, I opted by PF_MEMALLOC_NOFS after reading the
> commit which removed PF_FSTRANS initially (didn't mean to ignore your suggestion
> Dave, my apologies if I sounded like that), but I actually didn't find any commit
> re-adding PF_FSTRANS back. I searched most trees but couldn't find any commit
> re-adding it back, could you guys please point me out where is the commit adding
> it back?
I suspect Dave is referring to:
"xfs: reintroduce PF_FSTRANS for transaction reservation recursion
protection" by Yang Shao.
AFAICT it hasn't cleared akpm yet, so it's not in his quiltpile, and as
he doesn't use git there won't be a commit until it ends up in
mainline...
--D
> >
> > Cheers,
> >
> > Dave.
> > --
> > Dave Chinner
> > david@fromorbit.com
> >
>
> --
> Carlos
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH V2 1/5] xfs: Remove kmem_zone_alloc() usage
2020-07-13 16:17 ` Darrick J. Wong
@ 2020-07-15 15:06 ` Carlos Maiolino
2020-07-15 15:37 ` Darrick J. Wong
0 siblings, 1 reply; 21+ messages in thread
From: Carlos Maiolino @ 2020-07-15 15:06 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: Dave Chinner, Christoph Hellwig, linux-xfs
> > No problem in splitting this change into 2 patches, 1 by unconditionally use
> > __GFP_NOFAIL, and another changing the behavior to use NOFAIL only inside a
> > transaction.
> >
> > Regarding the PF_FSTRANS flag, I opted by PF_MEMALLOC_NOFS after reading the
> > commit which removed PF_FSTRANS initially (didn't mean to ignore your suggestion
> > Dave, my apologies if I sounded like that), but I actually didn't find any commit
> > re-adding PF_FSTRANS back. I searched most trees but couldn't find any commit
> > re-adding it back, could you guys please point me out where is the commit adding
> > it back?
>
> I suspect Dave is referring to:
>
> "xfs: reintroduce PF_FSTRANS for transaction reservation recursion
> protection" by Yang Shao.
>
> AFAICT it hasn't cleared akpm yet, so it's not in his quiltpile, and as
> he doesn't use git there won't be a commit until it ends up in
> mainline...
>
Thanks, I think I'll wait until it hits the mainline before trying to push this
series then.
--
Carlos
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH V2 1/5] xfs: Remove kmem_zone_alloc() usage
2020-07-15 15:06 ` Carlos Maiolino
@ 2020-07-15 15:37 ` Darrick J. Wong
2020-07-15 17:32 ` Christoph Hellwig
0 siblings, 1 reply; 21+ messages in thread
From: Darrick J. Wong @ 2020-07-15 15:37 UTC (permalink / raw)
To: Dave Chinner, Christoph Hellwig, linux-xfs
On Wed, Jul 15, 2020 at 05:06:59PM +0200, Carlos Maiolino wrote:
> > > No problem in splitting this change into 2 patches, 1 by unconditionally use
> > > __GFP_NOFAIL, and another changing the behavior to use NOFAIL only inside a
> > > transaction.
> > >
> > > Regarding the PF_FSTRANS flag, I opted by PF_MEMALLOC_NOFS after reading the
> > > commit which removed PF_FSTRANS initially (didn't mean to ignore your suggestion
> > > Dave, my apologies if I sounded like that), but I actually didn't find any commit
> > > re-adding PF_FSTRANS back. I searched most trees but couldn't find any commit
> > > re-adding it back, could you guys please point me out where is the commit adding
> > > it back?
> >
> > I suspect Dave is referring to:
> >
> > "xfs: reintroduce PF_FSTRANS for transaction reservation recursion
> > protection" by Yang Shao.
> >
> > AFAICT it hasn't cleared akpm yet, so it's not in his quiltpile, and as
> > he doesn't use git there won't be a commit until it ends up in
> > mainline...
> >
>
> Thanks, I think I'll wait until it hits the mainline before trying to push this
> series then.
FWIW I could be persuaded to take that one via one of the xfs/iomap
trees if the author puts out a revised patch.
--D
>
> --
> Carlos
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH V2 1/5] xfs: Remove kmem_zone_alloc() usage
2020-07-15 15:37 ` Darrick J. Wong
@ 2020-07-15 17:32 ` Christoph Hellwig
0 siblings, 0 replies; 21+ messages in thread
From: Christoph Hellwig @ 2020-07-15 17:32 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: Dave Chinner, Christoph Hellwig, linux-xfs
On Wed, Jul 15, 2020 at 08:37:21AM -0700, Darrick J. Wong wrote:
> On Wed, Jul 15, 2020 at 05:06:59PM +0200, Carlos Maiolino wrote:
> > > > No problem in splitting this change into 2 patches, 1 by unconditionally use
> > > > __GFP_NOFAIL, and another changing the behavior to use NOFAIL only inside a
> > > > transaction.
> > > >
> > > > Regarding the PF_FSTRANS flag, I opted by PF_MEMALLOC_NOFS after reading the
> > > > commit which removed PF_FSTRANS initially (didn't mean to ignore your suggestion
> > > > Dave, my apologies if I sounded like that), but I actually didn't find any commit
> > > > re-adding PF_FSTRANS back. I searched most trees but couldn't find any commit
> > > > re-adding it back, could you guys please point me out where is the commit adding
> > > > it back?
> > >
> > > I suspect Dave is referring to:
> > >
> > > "xfs: reintroduce PF_FSTRANS for transaction reservation recursion
> > > protection" by Yang Shao.
> > >
> > > AFAICT it hasn't cleared akpm yet, so it's not in his quiltpile, and as
> > > he doesn't use git there won't be a commit until it ends up in
> > > mainline...
> > >
> >
> > Thanks, I think I'll wait until it hits the mainline before trying to push this
> > series then.
>
> FWIW I could be persuaded to take that one via one of the xfs/iomap
> trees if the author puts out a revised patch.
Let's just defer that part of the patch. It really shouldn't be mixed
with an API cleanup as it is significant behavior change.
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH V2 2/5] xfs: Remove kmem_zone_zalloc() usage
2020-07-10 9:15 [PATCH 0/5] Continue xfs kmem cleanup - V2 Carlos Maiolino
2020-07-10 9:15 ` [PATCH V2 1/5] xfs: Remove kmem_zone_alloc() usage Carlos Maiolino
@ 2020-07-10 9:15 ` Carlos Maiolino
2020-07-10 16:09 ` Christoph Hellwig
2020-07-10 9:15 ` [PATCH V3 3/5] xfs: Modify xlog_ticket_alloc() to use kernel's MM API Carlos Maiolino
` (2 subsequent siblings)
4 siblings, 1 reply; 21+ messages in thread
From: Carlos Maiolino @ 2020-07-10 9:15 UTC (permalink / raw)
To: linux-xfs
Use kmem_cache_zalloc() directly.
With the exception of xlog_ticket_alloc() which will be dealt on the
next patch for readability.
Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
---
Changelog:
V2:
- Remove comment left by mistake on previous patch
- Keep the same logic in _xfs_buf_alloc, not allowing
its allocation to fail
- Fix some line breaks keeping them inside the 80char
rule.
fs/xfs/libxfs/xfs_alloc_btree.c | 2 +-
fs/xfs/libxfs/xfs_bmap.c | 5 ++++-
fs/xfs/libxfs/xfs_bmap_btree.c | 2 +-
fs/xfs/libxfs/xfs_da_btree.c | 2 +-
fs/xfs/libxfs/xfs_ialloc_btree.c | 2 +-
fs/xfs/libxfs/xfs_inode_fork.c | 6 +++---
fs/xfs/libxfs/xfs_refcount_btree.c | 2 +-
fs/xfs/libxfs/xfs_rmap_btree.c | 2 +-
fs/xfs/xfs_bmap_item.c | 4 ++--
fs/xfs/xfs_buf.c | 4 +---
fs/xfs/xfs_buf_item.c | 2 +-
fs/xfs/xfs_dquot.c | 2 +-
fs/xfs/xfs_extfree_item.c | 6 ++++--
fs/xfs/xfs_icreate_item.c | 2 +-
fs/xfs/xfs_inode_item.c | 3 ++-
fs/xfs/xfs_refcount_item.c | 5 +++--
fs/xfs/xfs_rmap_item.c | 5 +++--
fs/xfs/xfs_trans.c | 4 ++--
fs/xfs/xfs_trans_dquot.c | 3 ++-
19 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_alloc_btree.c b/fs/xfs/libxfs/xfs_alloc_btree.c
index 60c453cb3ee37..57f8b16a6ea44 100644
--- a/fs/xfs/libxfs/xfs_alloc_btree.c
+++ b/fs/xfs/libxfs/xfs_alloc_btree.c
@@ -484,7 +484,7 @@ xfs_allocbt_init_common(
ASSERT(btnum == XFS_BTNUM_BNO || btnum == XFS_BTNUM_CNT);
- cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_NOFS);
+ cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);
cur->bc_tp = tp;
cur->bc_mp = mp;
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index fd5c0d669d0d7..9c40d59710357 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -1099,7 +1099,10 @@ xfs_bmap_add_attrfork(
if (error)
goto trans_cancel;
ASSERT(ip->i_afp == NULL);
- ip->i_afp = kmem_zone_zalloc(xfs_ifork_zone, 0);
+
+ ip->i_afp = kmem_cache_zalloc(xfs_ifork_zone,
+ GFP_KERNEL | __GFP_NOFAIL);
+
ip->i_afp->if_format = XFS_DINODE_FMT_EXTENTS;
ip->i_afp->if_flags = XFS_IFEXTENTS;
logflags = 0;
diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c
index d9c63f17d2dec..ecec604e6e4d7 100644
--- a/fs/xfs/libxfs/xfs_bmap_btree.c
+++ b/fs/xfs/libxfs/xfs_bmap_btree.c
@@ -552,7 +552,7 @@ xfs_bmbt_init_cursor(
struct xfs_btree_cur *cur;
ASSERT(whichfork != XFS_COW_FORK);
- cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_NOFS);
+ cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);
cur->bc_tp = tp;
cur->bc_mp = mp;
diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
index 897749c41f36e..a4e1f01daf3d8 100644
--- a/fs/xfs/libxfs/xfs_da_btree.c
+++ b/fs/xfs/libxfs/xfs_da_btree.c
@@ -81,7 +81,7 @@ kmem_zone_t *xfs_da_state_zone; /* anchor for state struct zone */
xfs_da_state_t *
xfs_da_state_alloc(void)
{
- return kmem_zone_zalloc(xfs_da_state_zone, KM_NOFS);
+ return kmem_cache_zalloc(xfs_da_state_zone, GFP_NOFS | __GFP_NOFAIL);
}
/*
diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c
index b2c122ad8f0e9..3c8aebc36e643 100644
--- a/fs/xfs/libxfs/xfs_ialloc_btree.c
+++ b/fs/xfs/libxfs/xfs_ialloc_btree.c
@@ -411,7 +411,7 @@ xfs_inobt_init_common(
{
struct xfs_btree_cur *cur;
- cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_NOFS);
+ cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);
cur->bc_tp = tp;
cur->bc_mp = mp;
cur->bc_btnum = btnum;
diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
index 28b366275ae0e..0cf853d42d622 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.c
+++ b/fs/xfs/libxfs/xfs_inode_fork.c
@@ -291,7 +291,7 @@ xfs_iformat_attr_fork(
* Initialize the extent count early, as the per-format routines may
* depend on it.
*/
- ip->i_afp = kmem_zone_zalloc(xfs_ifork_zone, KM_NOFS);
+ ip->i_afp = kmem_cache_zalloc(xfs_ifork_zone, GFP_NOFS | __GFP_NOFAIL);
ip->i_afp->if_format = dip->di_aformat;
if (unlikely(ip->i_afp->if_format == 0)) /* pre IRIX 6.2 file system */
ip->i_afp->if_format = XFS_DINODE_FMT_EXTENTS;
@@ -673,8 +673,8 @@ xfs_ifork_init_cow(
if (ip->i_cowfp)
return;
- ip->i_cowfp = kmem_zone_zalloc(xfs_ifork_zone,
- KM_NOFS);
+ ip->i_cowfp = kmem_cache_zalloc(xfs_ifork_zone,
+ GFP_NOFS | __GFP_NOFAIL);
ip->i_cowfp->if_flags = XFS_IFEXTENTS;
ip->i_cowfp->if_format = XFS_DINODE_FMT_EXTENTS;
}
diff --git a/fs/xfs/libxfs/xfs_refcount_btree.c b/fs/xfs/libxfs/xfs_refcount_btree.c
index 7fd6044a4f780..fde21b5e82ed0 100644
--- a/fs/xfs/libxfs/xfs_refcount_btree.c
+++ b/fs/xfs/libxfs/xfs_refcount_btree.c
@@ -325,7 +325,7 @@ xfs_refcountbt_init_common(
ASSERT(agno != NULLAGNUMBER);
ASSERT(agno < mp->m_sb.sb_agcount);
- cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_NOFS);
+ cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);
cur->bc_tp = tp;
cur->bc_mp = mp;
cur->bc_btnum = XFS_BTNUM_REFC;
diff --git a/fs/xfs/libxfs/xfs_rmap_btree.c b/fs/xfs/libxfs/xfs_rmap_btree.c
index b7c05314d07c9..caf0d799c1f42 100644
--- a/fs/xfs/libxfs/xfs_rmap_btree.c
+++ b/fs/xfs/libxfs/xfs_rmap_btree.c
@@ -457,7 +457,7 @@ xfs_rmapbt_init_common(
{
struct xfs_btree_cur *cur;
- cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_NOFS);
+ cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);
cur->bc_tp = tp;
cur->bc_mp = mp;
/* Overlapping btree; 2 keys per pointer. */
diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
index 6736c5ab188f2..ec3691372e7c0 100644
--- a/fs/xfs/xfs_bmap_item.c
+++ b/fs/xfs/xfs_bmap_item.c
@@ -138,7 +138,7 @@ xfs_bui_init(
{
struct xfs_bui_log_item *buip;
- buip = kmem_zone_zalloc(xfs_bui_zone, 0);
+ buip = kmem_cache_zalloc(xfs_bui_zone, GFP_KERNEL | __GFP_NOFAIL);
xfs_log_item_init(mp, &buip->bui_item, XFS_LI_BUI, &xfs_bui_item_ops);
buip->bui_format.bui_nextents = XFS_BUI_MAX_FAST_EXTENTS;
@@ -215,7 +215,7 @@ xfs_trans_get_bud(
{
struct xfs_bud_log_item *budp;
- budp = kmem_zone_zalloc(xfs_bud_zone, 0);
+ budp = kmem_cache_zalloc(xfs_bud_zone, GFP_KERNEL | __GFP_NOFAIL);
xfs_log_item_init(tp->t_mountp, &budp->bud_item, XFS_LI_BUD,
&xfs_bud_item_ops);
budp->bud_buip = buip;
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 20b748f7e1862..bd07eefa6c875 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -211,9 +211,7 @@ _xfs_buf_alloc(
int i;
*bpp = NULL;
- bp = kmem_zone_zalloc(xfs_buf_zone, KM_NOFS);
- if (unlikely(!bp))
- return -ENOMEM;
+ bp = kmem_cache_zalloc(xfs_buf_zone, GFP_NOFS | __GFP_NOFAIL);
/*
* We don't want certain flags to appear in b_flags unless they are
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 9e75e8d6042ec..ae226292bf903 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -734,7 +734,7 @@ xfs_buf_item_init(
return 0;
}
- bip = kmem_zone_zalloc(xfs_buf_item_zone, 0);
+ bip = kmem_cache_zalloc(xfs_buf_item_zone, GFP_KERNEL | __GFP_NOFAIL);
xfs_log_item_init(mp, &bip->bli_item, XFS_LI_BUF, &xfs_buf_item_ops);
bip->bli_buf = bp;
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index d5b7f03e93c8d..1be11f51afb56 100644
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -475,7 +475,7 @@ xfs_dquot_alloc(
{
struct xfs_dquot *dqp;
- dqp = kmem_zone_zalloc(xfs_qm_dqzone, 0);
+ dqp = kmem_cache_zalloc(xfs_qm_dqzone, GFP_KERNEL | __GFP_NOFAIL);
dqp->dq_flags = type;
dqp->q_core.d_id = cpu_to_be32(id);
diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index b9c333bae0a12..6cb8cd11072a3 100644
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -161,7 +161,8 @@ xfs_efi_init(
((nextents - 1) * sizeof(xfs_extent_t)));
efip = kmem_zalloc(size, 0);
} else {
- efip = kmem_zone_zalloc(xfs_efi_zone, 0);
+ efip = kmem_cache_zalloc(xfs_efi_zone,
+ GFP_KERNEL | __GFP_NOFAIL);
}
xfs_log_item_init(mp, &efip->efi_item, XFS_LI_EFI, &xfs_efi_item_ops);
@@ -332,7 +333,8 @@ xfs_trans_get_efd(
(nextents - 1) * sizeof(struct xfs_extent),
0);
} else {
- efdp = kmem_zone_zalloc(xfs_efd_zone, 0);
+ efdp = kmem_cache_zalloc(xfs_efd_zone,
+ GFP_KERNEL | __GFP_NOFAIL);
}
xfs_log_item_init(tp->t_mountp, &efdp->efd_item, XFS_LI_EFD,
diff --git a/fs/xfs/xfs_icreate_item.c b/fs/xfs/xfs_icreate_item.c
index 287a9e5c7d758..9b3994b9c716d 100644
--- a/fs/xfs/xfs_icreate_item.c
+++ b/fs/xfs/xfs_icreate_item.c
@@ -97,7 +97,7 @@ xfs_icreate_log(
{
struct xfs_icreate_item *icp;
- icp = kmem_zone_zalloc(xfs_icreate_zone, 0);
+ icp = kmem_cache_zalloc(xfs_icreate_zone, GFP_KERNEL | __GFP_NOFAIL);
xfs_log_item_init(tp->t_mountp, &icp->ic_item, XFS_LI_ICREATE,
&xfs_icreate_item_ops);
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index ba47bf65b772b..972a26d056576 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -636,7 +636,8 @@ xfs_inode_item_init(
struct xfs_inode_log_item *iip;
ASSERT(ip->i_itemp == NULL);
- iip = ip->i_itemp = kmem_zone_zalloc(xfs_ili_zone, 0);
+ iip = ip->i_itemp = kmem_cache_zalloc(xfs_ili_zone,
+ GFP_KERNEL | __GFP_NOFAIL);
iip->ili_inode = ip;
xfs_log_item_init(mp, &iip->ili_item, XFS_LI_INODE,
diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c
index c81639891e298..7b2c72bc28582 100644
--- a/fs/xfs/xfs_refcount_item.c
+++ b/fs/xfs/xfs_refcount_item.c
@@ -143,7 +143,8 @@ xfs_cui_init(
cuip = kmem_zalloc(xfs_cui_log_item_sizeof(nextents),
0);
else
- cuip = kmem_zone_zalloc(xfs_cui_zone, 0);
+ cuip = kmem_cache_zalloc(xfs_cui_zone,
+ GFP_KERNEL | __GFP_NOFAIL);
xfs_log_item_init(mp, &cuip->cui_item, XFS_LI_CUI, &xfs_cui_item_ops);
cuip->cui_format.cui_nextents = nextents;
@@ -220,7 +221,7 @@ xfs_trans_get_cud(
{
struct xfs_cud_log_item *cudp;
- cudp = kmem_zone_zalloc(xfs_cud_zone, 0);
+ cudp = kmem_cache_zalloc(xfs_cud_zone, GFP_KERNEL | __GFP_NOFAIL);
xfs_log_item_init(tp->t_mountp, &cudp->cud_item, XFS_LI_CUD,
&xfs_cud_item_ops);
cudp->cud_cuip = cuip;
diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c
index a86599db20a6f..dc5b0753cd519 100644
--- a/fs/xfs/xfs_rmap_item.c
+++ b/fs/xfs/xfs_rmap_item.c
@@ -141,7 +141,8 @@ xfs_rui_init(
if (nextents > XFS_RUI_MAX_FAST_EXTENTS)
ruip = kmem_zalloc(xfs_rui_log_item_sizeof(nextents), 0);
else
- ruip = kmem_zone_zalloc(xfs_rui_zone, 0);
+ ruip = kmem_cache_zalloc(xfs_rui_zone,
+ GFP_KERNEL | __GFP_NOFAIL);
xfs_log_item_init(mp, &ruip->rui_item, XFS_LI_RUI, &xfs_rui_item_ops);
ruip->rui_format.rui_nextents = nextents;
@@ -243,7 +244,7 @@ xfs_trans_get_rud(
{
struct xfs_rud_log_item *rudp;
- rudp = kmem_zone_zalloc(xfs_rud_zone, 0);
+ rudp = kmem_cache_zalloc(xfs_rud_zone, GFP_KERNEL | __GFP_NOFAIL);
xfs_log_item_init(tp->t_mountp, &rudp->rud_item, XFS_LI_RUD,
&xfs_rud_item_ops);
rudp->rud_ruip = ruip;
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 3c94e5ff43160..a53d9aa27d3ed 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -90,7 +90,7 @@ xfs_trans_dup(
trace_xfs_trans_dup(tp, _RET_IP_);
- ntp = kmem_zone_zalloc(xfs_trans_zone, 0);
+ ntp = kmem_cache_zalloc(xfs_trans_zone, GFP_KERNEL | __GFP_NOFAIL);
/*
* Initialize the new transaction structure.
@@ -262,7 +262,7 @@ xfs_trans_alloc(
* GFP_NOFS allocation context so that we avoid lockdep false positives
* by doing GFP_KERNEL allocations inside sb_start_intwrite().
*/
- tp = kmem_zone_zalloc(xfs_trans_zone, 0);
+ tp = kmem_cache_zalloc(xfs_trans_zone, GFP_KERNEL | __GFP_NOFAIL);
if (!(flags & XFS_TRANS_NO_WRITECOUNT))
sb_start_intwrite(mp->m_super);
diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index c0f73b82c0551..394d6a0aa18dc 100644
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -860,7 +860,8 @@ STATIC void
xfs_trans_alloc_dqinfo(
xfs_trans_t *tp)
{
- tp->t_dqinfo = kmem_zone_zalloc(xfs_qm_dqtrxzone, 0);
+ tp->t_dqinfo = kmem_cache_zalloc(xfs_qm_dqtrxzone,
+ GFP_KERNEL | __GFP_NOFAIL);
}
void
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH V3 3/5] xfs: Modify xlog_ticket_alloc() to use kernel's MM API
2020-07-10 9:15 [PATCH 0/5] Continue xfs kmem cleanup - V2 Carlos Maiolino
2020-07-10 9:15 ` [PATCH V2 1/5] xfs: Remove kmem_zone_alloc() usage Carlos Maiolino
2020-07-10 9:15 ` [PATCH V2 2/5] xfs: Remove kmem_zone_zalloc() usage Carlos Maiolino
@ 2020-07-10 9:15 ` Carlos Maiolino
2020-07-10 9:23 ` Carlos Maiolino
2020-07-10 16:09 ` Christoph Hellwig
2020-07-10 9:15 ` [PATCH 4/5] xfs: remove xfs_zone_{alloc,zalloc} helpers Carlos Maiolino
2020-07-10 9:15 ` [PATCH 5/5] xfs: Remove xfs_da_state_alloc() helper Carlos Maiolino
4 siblings, 2 replies; 21+ messages in thread
From: Carlos Maiolino @ 2020-07-10 9:15 UTC (permalink / raw)
To: linux-xfs
xlog_ticket_alloc() is always called under NOFS context, except from
unmount path, which eitherway is holding many FS locks, so, there is no
need for its callers to keep passing allocation flags into it.
change xlog_ticket_alloc() to use default kmem_cache_zalloc(), remove
its alloc_flags argument, and always use GFP_NOFS | __GFP_NOFAIL flags.
Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
---
Changelog:
V2:
- Remove alloc_flags argument from xlog_ticket_alloc()
and update patch description accordingly.
fs/xfs/xfs_log.c | 9 +++------
fs/xfs/xfs_log_cil.c | 3 +--
fs/xfs/xfs_log_priv.h | 4 +---
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 00fda2e8e7380..ad0c69ee89475 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -433,7 +433,7 @@ xfs_log_reserve(
XFS_STATS_INC(mp, xs_try_logspace);
ASSERT(*ticp == NULL);
- tic = xlog_ticket_alloc(log, unit_bytes, cnt, client, permanent, 0);
+ tic = xlog_ticket_alloc(log, unit_bytes, cnt, client, permanent);
*ticp = tic;
xlog_grant_push_ail(log, tic->t_cnt ? tic->t_unit_res * tic->t_cnt
@@ -3408,15 +3408,12 @@ xlog_ticket_alloc(
int unit_bytes,
int cnt,
char client,
- bool permanent,
- xfs_km_flags_t alloc_flags)
+ bool permanent)
{
struct xlog_ticket *tic;
int unit_res;
- tic = kmem_zone_zalloc(xfs_log_ticket_zone, alloc_flags);
- if (!tic)
- return NULL;
+ tic = kmem_cache_zalloc(xfs_log_ticket_zone, GFP_NOFS | __GFP_NOFAIL);
unit_res = xfs_log_calc_unit_res(log->l_mp, unit_bytes);
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index 9ed90368ab311..56c32eecffead 100644
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -37,8 +37,7 @@ xlog_cil_ticket_alloc(
{
struct xlog_ticket *tic;
- tic = xlog_ticket_alloc(log, 0, 1, XFS_TRANSACTION, 0,
- KM_NOFS);
+ tic = xlog_ticket_alloc(log, 0, 1, XFS_TRANSACTION, 0);
/*
* set the current reservation to zero so we know to steal the basic
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index 75a62870b63af..1c6fdbf3d5066 100644
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -464,9 +464,7 @@ xlog_ticket_alloc(
int unit_bytes,
int count,
char client,
- bool permanent,
- xfs_km_flags_t alloc_flags);
-
+ bool permanent);
static inline void
xlog_write_adv_cnt(void **ptr, int *len, int *off, size_t bytes)
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH V3 3/5] xfs: Modify xlog_ticket_alloc() to use kernel's MM API
2020-07-10 9:15 ` [PATCH V3 3/5] xfs: Modify xlog_ticket_alloc() to use kernel's MM API Carlos Maiolino
@ 2020-07-10 9:23 ` Carlos Maiolino
2020-07-10 16:09 ` Christoph Hellwig
1 sibling, 0 replies; 21+ messages in thread
From: Carlos Maiolino @ 2020-07-10 9:23 UTC (permalink / raw)
To: linux-xfs
This is supposed to be V2, I mistyped the subject's tag, my apologies.
On Fri, Jul 10, 2020 at 11:15:34AM +0200, Carlos Maiolino wrote:
> xlog_ticket_alloc() is always called under NOFS context, except from
> unmount path, which eitherway is holding many FS locks, so, there is no
> need for its callers to keep passing allocation flags into it.
>
> change xlog_ticket_alloc() to use default kmem_cache_zalloc(), remove
> its alloc_flags argument, and always use GFP_NOFS | __GFP_NOFAIL flags.
>
> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
> ---
>
> Changelog:
> V2:
> - Remove alloc_flags argument from xlog_ticket_alloc()
> and update patch description accordingly.
>
> fs/xfs/xfs_log.c | 9 +++------
> fs/xfs/xfs_log_cil.c | 3 +--
> fs/xfs/xfs_log_priv.h | 4 +---
> 3 files changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index 00fda2e8e7380..ad0c69ee89475 100644
> --- a/fs/xfs/xfs_log.c
> +++ b/fs/xfs/xfs_log.c
> @@ -433,7 +433,7 @@ xfs_log_reserve(
> XFS_STATS_INC(mp, xs_try_logspace);
>
> ASSERT(*ticp == NULL);
> - tic = xlog_ticket_alloc(log, unit_bytes, cnt, client, permanent, 0);
> + tic = xlog_ticket_alloc(log, unit_bytes, cnt, client, permanent);
> *ticp = tic;
>
> xlog_grant_push_ail(log, tic->t_cnt ? tic->t_unit_res * tic->t_cnt
> @@ -3408,15 +3408,12 @@ xlog_ticket_alloc(
> int unit_bytes,
> int cnt,
> char client,
> - bool permanent,
> - xfs_km_flags_t alloc_flags)
> + bool permanent)
> {
> struct xlog_ticket *tic;
> int unit_res;
>
> - tic = kmem_zone_zalloc(xfs_log_ticket_zone, alloc_flags);
> - if (!tic)
> - return NULL;
> + tic = kmem_cache_zalloc(xfs_log_ticket_zone, GFP_NOFS | __GFP_NOFAIL);
>
> unit_res = xfs_log_calc_unit_res(log->l_mp, unit_bytes);
>
> diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
> index 9ed90368ab311..56c32eecffead 100644
> --- a/fs/xfs/xfs_log_cil.c
> +++ b/fs/xfs/xfs_log_cil.c
> @@ -37,8 +37,7 @@ xlog_cil_ticket_alloc(
> {
> struct xlog_ticket *tic;
>
> - tic = xlog_ticket_alloc(log, 0, 1, XFS_TRANSACTION, 0,
> - KM_NOFS);
> + tic = xlog_ticket_alloc(log, 0, 1, XFS_TRANSACTION, 0);
>
> /*
> * set the current reservation to zero so we know to steal the basic
> diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
> index 75a62870b63af..1c6fdbf3d5066 100644
> --- a/fs/xfs/xfs_log_priv.h
> +++ b/fs/xfs/xfs_log_priv.h
> @@ -464,9 +464,7 @@ xlog_ticket_alloc(
> int unit_bytes,
> int count,
> char client,
> - bool permanent,
> - xfs_km_flags_t alloc_flags);
> -
> + bool permanent);
>
> static inline void
> xlog_write_adv_cnt(void **ptr, int *len, int *off, size_t bytes)
> --
> 2.26.2
>
--
Carlos
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH V3 3/5] xfs: Modify xlog_ticket_alloc() to use kernel's MM API
2020-07-10 9:15 ` [PATCH V3 3/5] xfs: Modify xlog_ticket_alloc() to use kernel's MM API Carlos Maiolino
2020-07-10 9:23 ` Carlos Maiolino
@ 2020-07-10 16:09 ` Christoph Hellwig
1 sibling, 0 replies; 21+ messages in thread
From: Christoph Hellwig @ 2020-07-10 16:09 UTC (permalink / raw)
To: Carlos Maiolino; +Cc: linux-xfs
On Fri, Jul 10, 2020 at 11:15:34AM +0200, Carlos Maiolino wrote:
> xlog_ticket_alloc() is always called under NOFS context, except from
> unmount path, which eitherway is holding many FS locks, so, there is no
> need for its callers to keep passing allocation flags into it.
>
> change xlog_ticket_alloc() to use default kmem_cache_zalloc(), remove
> its alloc_flags argument, and always use GFP_NOFS | __GFP_NOFAIL flags.
>
> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 4/5] xfs: remove xfs_zone_{alloc,zalloc} helpers
2020-07-10 9:15 [PATCH 0/5] Continue xfs kmem cleanup - V2 Carlos Maiolino
` (2 preceding siblings ...)
2020-07-10 9:15 ` [PATCH V3 3/5] xfs: Modify xlog_ticket_alloc() to use kernel's MM API Carlos Maiolino
@ 2020-07-10 9:15 ` Carlos Maiolino
2020-07-10 16:09 ` Christoph Hellwig
2020-07-10 9:15 ` [PATCH 5/5] xfs: Remove xfs_da_state_alloc() helper Carlos Maiolino
4 siblings, 1 reply; 21+ messages in thread
From: Carlos Maiolino @ 2020-07-10 9:15 UTC (permalink / raw)
To: linux-xfs
All their users have been converted to use MM API directly, no need to
keep them around anymore.
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
---
fs/xfs/kmem.c | 21 ---------------------
fs/xfs/kmem.h | 8 --------
fs/xfs/xfs_trace.h | 1 -
3 files changed, 30 deletions(-)
diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
index f1366475c389c..e841ed781a257 100644
--- a/fs/xfs/kmem.c
+++ b/fs/xfs/kmem.c
@@ -115,24 +115,3 @@ kmem_realloc(const void *old, size_t newsize, xfs_km_flags_t flags)
congestion_wait(BLK_RW_ASYNC, HZ/50);
} while (1);
}
-
-void *
-kmem_zone_alloc(kmem_zone_t *zone, xfs_km_flags_t flags)
-{
- int retries = 0;
- gfp_t lflags = kmem_flags_convert(flags);
- void *ptr;
-
- trace_kmem_zone_alloc(kmem_cache_size(zone), flags, _RET_IP_);
- do {
- ptr = kmem_cache_alloc(zone, lflags);
- if (ptr || (flags & KM_MAYFAIL))
- return ptr;
- if (!(++retries % 100))
- xfs_err(NULL,
- "%s(%u) possible memory allocation deadlock in %s (mode:0x%x)",
- current->comm, current->pid,
- __func__, lflags);
- congestion_wait(BLK_RW_ASYNC, HZ/50);
- } while (1);
-}
diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h
index 34cbcfde92281..8e8555817e6d3 100644
--- a/fs/xfs/kmem.h
+++ b/fs/xfs/kmem.h
@@ -85,14 +85,6 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
#define kmem_zone kmem_cache
#define kmem_zone_t struct kmem_cache
-extern void *kmem_zone_alloc(kmem_zone_t *, xfs_km_flags_t);
-
-static inline void *
-kmem_zone_zalloc(kmem_zone_t *zone, xfs_km_flags_t flags)
-{
- return kmem_zone_alloc(zone, flags | KM_ZERO);
-}
-
static inline struct page *
kmem_to_page(void *addr)
{
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 460136628a795..d8f5f3d99bb8f 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -3582,7 +3582,6 @@ DEFINE_KMEM_EVENT(kmem_alloc);
DEFINE_KMEM_EVENT(kmem_alloc_io);
DEFINE_KMEM_EVENT(kmem_alloc_large);
DEFINE_KMEM_EVENT(kmem_realloc);
-DEFINE_KMEM_EVENT(kmem_zone_alloc);
TRACE_EVENT(xfs_check_new_dalign,
TP_PROTO(struct xfs_mount *mp, int new_dalign, xfs_ino_t calc_rootino),
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 5/5] xfs: Remove xfs_da_state_alloc() helper
2020-07-10 9:15 [PATCH 0/5] Continue xfs kmem cleanup - V2 Carlos Maiolino
` (3 preceding siblings ...)
2020-07-10 9:15 ` [PATCH 4/5] xfs: remove xfs_zone_{alloc,zalloc} helpers Carlos Maiolino
@ 2020-07-10 9:15 ` Carlos Maiolino
2020-07-10 16:11 ` Christoph Hellwig
4 siblings, 1 reply; 21+ messages in thread
From: Carlos Maiolino @ 2020-07-10 9:15 UTC (permalink / raw)
To: linux-xfs
xfs_da_state_alloc() can simply be replaced by kmem_cache_zalloc()
calls directly. No need to keep this helper around.
Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
---
fs/xfs/libxfs/xfs_attr.c | 9 +++++----
fs/xfs/libxfs/xfs_da_btree.c | 10 ----------
fs/xfs/libxfs/xfs_da_btree.h | 1 -
fs/xfs/libxfs/xfs_dir2_node.c | 8 ++++----
fs/xfs/scrub/dabtree.c | 3 ++-
5 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 3b1bd6e112f89..a9499b2fdfb83 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -750,7 +750,7 @@ xfs_attr_node_addname(
dp = args->dp;
mp = dp->i_mount;
restart:
- state = xfs_da_state_alloc();
+ state = kmem_cache_zalloc(xfs_da_state_zone, GFP_NOFS | __GFP_NOFAIL);
state->args = args;
state->mp = mp;
@@ -899,7 +899,8 @@ xfs_attr_node_addname(
* attr, not the "new" one.
*/
args->attr_filter |= XFS_ATTR_INCOMPLETE;
- state = xfs_da_state_alloc();
+ state = kmem_cache_zalloc(xfs_da_state_zone,
+ GFP_NOFS | __GFP_NOFAIL);
state->args = args;
state->mp = mp;
state->inleaf = 0;
@@ -975,7 +976,7 @@ xfs_attr_node_removename(
* Tie a string around our finger to remind us where we are.
*/
dp = args->dp;
- state = xfs_da_state_alloc();
+ state = kmem_cache_zalloc(xfs_da_state_zone, GFP_NOFS | __GFP_NOFAIL);
state->args = args;
state->mp = dp->i_mount;
@@ -1207,7 +1208,7 @@ xfs_attr_node_get(xfs_da_args_t *args)
trace_xfs_attr_node_get(args);
- state = xfs_da_state_alloc();
+ state = kmem_cache_zalloc(xfs_da_state_zone, GFP_NOFS | __GFP_NOFAIL);
state->args = args;
state->mp = args->dp->i_mount;
diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
index a4e1f01daf3d8..a704c1a91bece 100644
--- a/fs/xfs/libxfs/xfs_da_btree.c
+++ b/fs/xfs/libxfs/xfs_da_btree.c
@@ -74,16 +74,6 @@ STATIC int xfs_da3_blk_unlink(xfs_da_state_t *state,
kmem_zone_t *xfs_da_state_zone; /* anchor for state struct zone */
-/*
- * Allocate a dir-state structure.
- * We don't put them on the stack since they're large.
- */
-xfs_da_state_t *
-xfs_da_state_alloc(void)
-{
- return kmem_cache_zalloc(xfs_da_state_zone, GFP_NOFS | __GFP_NOFAIL);
-}
-
/*
* Kill the altpath contents of a da-state structure.
*/
diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h
index 6e25de6621e4f..50c803ffb80d8 100644
--- a/fs/xfs/libxfs/xfs_da_btree.h
+++ b/fs/xfs/libxfs/xfs_da_btree.h
@@ -219,7 +219,6 @@ enum xfs_dacmp xfs_da_compname(struct xfs_da_args *args,
const unsigned char *name, int len);
-xfs_da_state_t *xfs_da_state_alloc(void);
void xfs_da_state_free(xfs_da_state_t *state);
void xfs_da3_node_hdr_from_disk(struct xfs_mount *mp,
diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
index 6ac4aad98cd76..8d9c0df5b0836 100644
--- a/fs/xfs/libxfs/xfs_dir2_node.c
+++ b/fs/xfs/libxfs/xfs_dir2_node.c
@@ -2015,7 +2015,7 @@ xfs_dir2_node_addname(
/*
* Allocate and initialize the state (btree cursor).
*/
- state = xfs_da_state_alloc();
+ state = kmem_cache_zalloc(xfs_da_state_zone, GFP_NOFS | __GFP_NOFAIL);
state->args = args;
state->mp = args->dp->i_mount;
/*
@@ -2086,7 +2086,7 @@ xfs_dir2_node_lookup(
/*
* Allocate and initialize the btree cursor.
*/
- state = xfs_da_state_alloc();
+ state = kmem_cache_zalloc(xfs_da_state_zone, GFP_NOFS | __GFP_NOFAIL);
state->args = args;
state->mp = args->dp->i_mount;
/*
@@ -2139,7 +2139,7 @@ xfs_dir2_node_removename(
/*
* Allocate and initialize the btree cursor.
*/
- state = xfs_da_state_alloc();
+ state = kmem_cache_zalloc(xfs_da_state_zone, GFP_NOFS | __GFP_NOFAIL);
state->args = args;
state->mp = args->dp->i_mount;
@@ -2206,7 +2206,7 @@ xfs_dir2_node_replace(
/*
* Allocate and initialize the btree cursor.
*/
- state = xfs_da_state_alloc();
+ state = kmem_cache_zalloc(xfs_da_state_zone, GFP_NOFS | __GFP_NOFAIL);
state->args = args;
state->mp = args->dp->i_mount;
diff --git a/fs/xfs/scrub/dabtree.c b/fs/xfs/scrub/dabtree.c
index 44b15015021f3..cf454957db1f8 100644
--- a/fs/xfs/scrub/dabtree.c
+++ b/fs/xfs/scrub/dabtree.c
@@ -476,7 +476,8 @@ xchk_da_btree(
ds.dargs.whichfork = whichfork;
ds.dargs.trans = sc->tp;
ds.dargs.op_flags = XFS_DA_OP_OKNOENT;
- ds.state = xfs_da_state_alloc();
+ ds.state = kmem_cache_zalloc(xfs_da_state_zone,
+ GFP_NOFS | __GFP_NOFAIL);
ds.state->args = &ds.dargs;
ds.state->mp = mp;
ds.sc = sc;
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH 5/5] xfs: Remove xfs_da_state_alloc() helper
2020-07-10 9:15 ` [PATCH 5/5] xfs: Remove xfs_da_state_alloc() helper Carlos Maiolino
@ 2020-07-10 16:11 ` Christoph Hellwig
2020-07-13 9:17 ` Carlos Maiolino
0 siblings, 1 reply; 21+ messages in thread
From: Christoph Hellwig @ 2020-07-10 16:11 UTC (permalink / raw)
To: Carlos Maiolino; +Cc: linux-xfs
On Fri, Jul 10, 2020 at 11:15:36AM +0200, Carlos Maiolino wrote:
> xfs_da_state_alloc() can simply be replaced by kmem_cache_zalloc()
> calls directly. No need to keep this helper around.
Wouldn't it be nicer to keep the helper, and also make it setup
->args and ->mp?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 5/5] xfs: Remove xfs_da_state_alloc() helper
2020-07-10 16:11 ` Christoph Hellwig
@ 2020-07-13 9:17 ` Carlos Maiolino
0 siblings, 0 replies; 21+ messages in thread
From: Carlos Maiolino @ 2020-07-13 9:17 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-xfs
On Fri, Jul 10, 2020 at 05:11:11PM +0100, Christoph Hellwig wrote:
> On Fri, Jul 10, 2020 at 11:15:36AM +0200, Carlos Maiolino wrote:
> > xfs_da_state_alloc() can simply be replaced by kmem_cache_zalloc()
> > calls directly. No need to keep this helper around.
>
> Wouldn't it be nicer to keep the helper, and also make it setup
> ->args and ->mp?
Yup, sounds good, thanks for the suggestion, I'll update the patch accordingly.
--
Carlos
^ permalink raw reply [flat|nested] 21+ messages in thread