Revert "ipv6: sr: switch to GFP_ATOMIC flag to allocate memory during seg6local LWT...
authorKuniyuki Iwashima <kuniyu@amazon.com>
Fri, 16 May 2025 02:27:20 +0000 (19:27 -0700)
committerJakub Kicinski <kuba@kernel.org>
Wed, 21 May 2025 02:18:24 +0000 (19:18 -0700)
The previous patch fixed the same issue mentioned in
commit 14a0087e7236 ("ipv6: sr: switch to GFP_ATOMIC
flag to allocate memory during seg6local LWT setup").

Let's revert it.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Andrea Mayer <andrea.mayer@uniroma2.it>
Link: https://patch.msgid.link/20250516022759.44392-5-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv6/seg6_local.c

index ee5e448cc7a87510e0731e38f912030672c62179..ac1dbd492c22dc9361aa86d664e8108a69c63f70 100644 (file)
@@ -1671,7 +1671,7 @@ static int parse_nla_srh(struct nlattr **attrs, struct seg6_local_lwt *slwt,
        if (!seg6_validate_srh(srh, len, false))
                return -EINVAL;
 
-       slwt->srh = kmemdup(srh, len, GFP_ATOMIC);
+       slwt->srh = kmemdup(srh, len, GFP_KERNEL);
        if (!slwt->srh)
                return -ENOMEM;
 
@@ -1911,7 +1911,7 @@ static int parse_nla_bpf(struct nlattr **attrs, struct seg6_local_lwt *slwt,
        if (!tb[SEG6_LOCAL_BPF_PROG] || !tb[SEG6_LOCAL_BPF_PROG_NAME])
                return -EINVAL;
 
-       slwt->bpf.name = nla_memdup(tb[SEG6_LOCAL_BPF_PROG_NAME], GFP_ATOMIC);
+       slwt->bpf.name = nla_memdup(tb[SEG6_LOCAL_BPF_PROG_NAME], GFP_KERNEL);
        if (!slwt->bpf.name)
                return -ENOMEM;
 
@@ -1994,7 +1994,7 @@ static int parse_nla_counters(struct nlattr **attrs,
                return -EINVAL;
 
        /* counters are always zero initialized */
-       pcounters = seg6_local_alloc_pcpu_counters(GFP_ATOMIC);
+       pcounters = seg6_local_alloc_pcpu_counters(GFP_KERNEL);
        if (!pcounters)
                return -ENOMEM;