2019-08-23 08:00:54

by Khazhismel Kumykov

Subject: [PATCH v2 3/3] fuse: kmemcg account fs data

account per-file, dentry, and inode data

accounts the per-file reserved request, adding new
fuse_request_alloc_account()

blockdev/superblock and temporary per-request data was left alone, as
this usually isn't accounted

Signed-off-by: Khazhismel Kumykov <[email protected]>
---
fs/fuse/dir.c | 3 ++-
fs/fuse/file.c | 4 ++--
fs/fuse/inode.c | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index f9c59a296568..2013e1222de7 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -258,7 +258,8 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)
#if BITS_PER_LONG < 64
static int fuse_dentry_init(struct dentry *dentry)
{
- dentry->d_fsdata = kzalloc(sizeof(union fuse_dentry), GFP_KERNEL);
+ dentry->d_fsdata = kzalloc(sizeof(union fuse_dentry),
+ GFP_KERNEL_ACCOUNT | __GFP_RECLAIMABLE);

return dentry->d_fsdata ? 0 : -ENOMEM;
}
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 572d8347ebcb..ae8c8016bb8e 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -45,12 +45,12 @@ struct fuse_file *fuse_file_alloc(struct fuse_conn *fc)
{
struct fuse_file *ff;

- ff = kzalloc(sizeof(struct fuse_file), GFP_KERNEL);
+ ff = kzalloc(sizeof(struct fuse_file), GFP_KERNEL_ACCOUNT);
if (unlikely(!ff))
return NULL;

ff->fc = fc;
- ff->reserved_req = fuse_request_alloc(0, GFP_KERNEL);
+ ff->reserved_req = fuse_request_alloc(0, GFP_KERNEL_ACCOUNT);
if (unlikely(!ff->reserved_req)) {
kfree(ff);
return NULL;
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 5afd1872b8b1..ad92e93eaddd 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -76,7 +76,8 @@ struct fuse_mount_data {

struct fuse_forget_link *fuse_alloc_forget(void)
{
- return kzalloc(sizeof(struct fuse_forget_link), GFP_KERNEL);
+ return kzalloc(sizeof(struct fuse_forget_link),
+ GFP_KERNEL_ACCOUNT | __GFP_RECLAIMABLE);
}

static struct inode *fuse_alloc_inode(struct super_block *sb)
--
2.23.0.187.g17f5b7556c-goog

2019-08-23 14:23:09

by Shakeel Butt

Subject: Re: [PATCH v2 3/3] fuse: kmemcg account fs data

On Thu, Aug 22, 2019 at 1:00 PM Khazhismel Kumykov <[email protected]> wrote:
>
> account per-file, dentry, and inode data
>
> accounts the per-file reserved request, adding new
> fuse_request_alloc_account()
>
> blockdev/superblock and temporary per-request data was left alone, as
> this usually isn't accounted
>
> Signed-off-by: Khazhismel Kumykov <[email protected]>

Reviewed-by: Shakeel Butt <[email protected]>

> ---
> fs/fuse/dir.c | 3 ++-
> fs/fuse/file.c | 4 ++--
> fs/fuse/inode.c | 3 ++-
> 3 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
> index f9c59a296568..2013e1222de7 100644
> --- a/fs/fuse/dir.c
> +++ b/fs/fuse/dir.c
> @@ -258,7 +258,8 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)
> #if BITS_PER_LONG < 64
> static int fuse_dentry_init(struct dentry *dentry)
> {
> - dentry->d_fsdata = kzalloc(sizeof(union fuse_dentry), GFP_KERNEL);
> + dentry->d_fsdata = kzalloc(sizeof(union fuse_dentry),
> + GFP_KERNEL_ACCOUNT | __GFP_RECLAIMABLE);
>
> return dentry->d_fsdata ? 0 : -ENOMEM;
> }
> diff --git a/fs/fuse/file.c b/fs/fuse/file.c
> index 572d8347ebcb..ae8c8016bb8e 100644
> --- a/fs/fuse/file.c
> +++ b/fs/fuse/file.c
> @@ -45,12 +45,12 @@ struct fuse_file *fuse_file_alloc(struct fuse_conn *fc)
> {
> struct fuse_file *ff;
>
> - ff = kzalloc(sizeof(struct fuse_file), GFP_KERNEL);
> + ff = kzalloc(sizeof(struct fuse_file), GFP_KERNEL_ACCOUNT);
> if (unlikely(!ff))
> return NULL;
>
> ff->fc = fc;
> - ff->reserved_req = fuse_request_alloc(0, GFP_KERNEL);
> + ff->reserved_req = fuse_request_alloc(0, GFP_KERNEL_ACCOUNT);
> if (unlikely(!ff->reserved_req)) {
> kfree(ff);
> return NULL;
> diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
> index 5afd1872b8b1..ad92e93eaddd 100644
> --- a/fs/fuse/inode.c
> +++ b/fs/fuse/inode.c
> @@ -76,7 +76,8 @@ struct fuse_mount_data {
>
> struct fuse_forget_link *fuse_alloc_forget(void)
> {
> - return kzalloc(sizeof(struct fuse_forget_link), GFP_KERNEL);
> + return kzalloc(sizeof(struct fuse_forget_link),
> + GFP_KERNEL_ACCOUNT | __GFP_RECLAIMABLE);
> }
>
> static struct inode *fuse_alloc_inode(struct super_block *sb)
> --
> 2.23.0.187.g17f5b7556c-goog
>