2023-04-06 04:09:20

by Chen Aotian

Subject: [PATCH] netfilter: nf_tables: Modify nla_memdup's flag to GFP_KERNEL_ACCOUNT

For memory alloc that store user data from nla[NFTA_OBJ_USERDATA],
use GFP_KERNEL_ACCOUNT is more suitable.

Signed-off-by: Chen Aotian <[email protected]>
---
net/netfilter/nf_tables_api.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 6004d4b24..cd52109e6 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -7052,7 +7052,7 @@ static int nf_tables_newobj(struct sk_buff *skb, const struct nfnl_info *info,
}

if (nla[NFTA_OBJ_USERDATA]) {
- obj->udata = nla_memdup(nla[NFTA_OBJ_USERDATA], GFP_KERNEL);
+ obj->udata = nla_memdup(nla[NFTA_OBJ_USERDATA], GFP_KERNEL_ACCOUNT);
if (obj->udata == NULL)
goto err_userdata;

--
2.25.1

2023-04-06 09:31:47

by Pablo Neira Ayuso

Subject: Re: [PATCH] netfilter: nf_tables: Modify nla_memdup's flag to GFP_KERNEL_ACCOUNT

On Thu, Apr 06, 2023 at 12:01:51PM +0800, Chen Aotian wrote:
> For memory alloc that store user data from nla[NFTA_OBJ_USERDATA],
> use GFP_KERNEL_ACCOUNT is more suitable.
>

Fixes: 33758c891479 ("memcg: enable accounting for nft objects")

> Signed-off-by: Chen Aotian <[email protected]>
> ---
> net/netfilter/nf_tables_api.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
> index 6004d4b24..cd52109e6 100644
> --- a/net/netfilter/nf_tables_api.c
> +++ b/net/netfilter/nf_tables_api.c
> @@ -7052,7 +7052,7 @@ static int nf_tables_newobj(struct sk_buff *skb, const struct nfnl_info *info,
> }
>
> if (nla[NFTA_OBJ_USERDATA]) {
> - obj->udata = nla_memdup(nla[NFTA_OBJ_USERDATA], GFP_KERNEL);
> + obj->udata = nla_memdup(nla[NFTA_OBJ_USERDATA], GFP_KERNEL_ACCOUNT);
> if (obj->udata == NULL)
> goto err_userdata;
>
> --
> 2.25.1
>

2023-04-06 09:31:53

by Pablo Neira Ayuso

Subject: Re: [netfilter-core] [PATCH] netfilter: nf_tables: Modify nla_memdup's flag to GFP_KERNEL_ACCOUNT

On Thu, Apr 06, 2023 at 11:21:50AM +0200, Pablo Neira Ayuso wrote:
> On Thu, Apr 06, 2023 at 12:01:51PM +0800, Chen Aotian wrote:
> > For memory alloc that store user data from nla[NFTA_OBJ_USERDATA],
> > use GFP_KERNEL_ACCOUNT is more suitable.
> >
>
> Fixes: 33758c891479 ("memcg: enable accounting for nft objects")
>
> > Signed-off-by: Chen Aotian <[email protected]>

BTW, this patch is intended for nf.git, I'll apply it now.