Skip to content

Commit cefe6e1

Browse files
q2venkuba-moo
authored andcommitted
Revert "ipv6: sr: switch to GFP_ATOMIC flag to allocate memory during seg6local LWT setup"
The previous patch fixed the same issue mentioned in commit 14a0087 ("ipv6: sr: switch to GFP_ATOMIC flag to allocate memory during seg6local LWT setup"). Let's revert it. Signed-off-by: Kuniyuki Iwashima <[email protected]> Reviewed-by: Andrea Mayer <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 8e5f1bb commit cefe6e1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

net/ipv6/seg6_local.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,7 +1671,7 @@ static int parse_nla_srh(struct nlattr **attrs, struct seg6_local_lwt *slwt,
16711671
if (!seg6_validate_srh(srh, len, false))
16721672
return -EINVAL;
16731673

1674-
slwt->srh = kmemdup(srh, len, GFP_ATOMIC);
1674+
slwt->srh = kmemdup(srh, len, GFP_KERNEL);
16751675
if (!slwt->srh)
16761676
return -ENOMEM;
16771677

@@ -1911,7 +1911,7 @@ static int parse_nla_bpf(struct nlattr **attrs, struct seg6_local_lwt *slwt,
19111911
if (!tb[SEG6_LOCAL_BPF_PROG] || !tb[SEG6_LOCAL_BPF_PROG_NAME])
19121912
return -EINVAL;
19131913

1914-
slwt->bpf.name = nla_memdup(tb[SEG6_LOCAL_BPF_PROG_NAME], GFP_ATOMIC);
1914+
slwt->bpf.name = nla_memdup(tb[SEG6_LOCAL_BPF_PROG_NAME], GFP_KERNEL);
19151915
if (!slwt->bpf.name)
19161916
return -ENOMEM;
19171917

@@ -1994,7 +1994,7 @@ static int parse_nla_counters(struct nlattr **attrs,
19941994
return -EINVAL;
19951995

19961996
/* counters are always zero initialized */
1997-
pcounters = seg6_local_alloc_pcpu_counters(GFP_ATOMIC);
1997+
pcounters = seg6_local_alloc_pcpu_counters(GFP_KERNEL);
19981998
if (!pcounters)
19991999
return -ENOMEM;
20002000

0 commit comments

Comments
 (0)