leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gtp: relax alloc constraint when adding a pdp

Browse Source 
When a PDP context is added, the rtnl lock is held, thus no need to force
a GFP_ATOMIC.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nicolas Dichtel 2020-08-28 15:30:56 +02:00 committed by David S. Miller
parent e2d1baca2b
commit 151ea46f3d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/gtp.c
View File

@ -1036,7 +1036,7 @@ static void pdp_context_delete(struct pdp_ctx *pctx)
call_rcu(&pctx->rcu_head, pdp_context_free); call_rcu(&pctx->rcu_head, pdp_context_free);
} }
static int gtp_tunnel_notify(struct pdp_ctx *pctx, u8 cmd); static int gtp_tunnel_notify(struct pdp_ctx *pctx, u8 cmd, gfp_t allocation);
static int gtp_genl_new_pdp(struct sk_buff *skb, struct genl_info *info) static int gtp_genl_new_pdp(struct sk_buff *skb, struct genl_info *info)
{ {
@ -1094,7 +1094,7 @@ static int gtp_genl_new_pdp(struct sk_buff *skb, struct genl_info *info)
if (IS_ERR(pctx)) { if (IS_ERR(pctx)) {
err = PTR_ERR(pctx); err = PTR_ERR(pctx);
} else { } else {
gtp_tunnel_notify(pctx, GTP_CMD_NEWPDP); gtp_tunnel_notify(pctx, GTP_CMD_NEWPDP, GFP_KERNEL);
err = 0; err = 0;
} }
@ -1166,7 +1166,7 @@ static int gtp_genl_del_pdp(struct sk_buff *skb, struct genl_info *info)
netdev_dbg(pctx->dev, "GTPv1-U: deleting tunnel id = %x/%x (pdp %p)\n", netdev_dbg(pctx->dev, "GTPv1-U: deleting tunnel id = %x/%x (pdp %p)\n",
pctx->u.v1.i_tei, pctx->u.v1.o_tei, pctx); pctx->u.v1.i_tei, pctx->u.v1.o_tei, pctx);
gtp_tunnel_notify(pctx, GTP_CMD_DELPDP); gtp_tunnel_notify(pctx, GTP_CMD_DELPDP, GFP_ATOMIC);
pdp_context_delete(pctx); pdp_context_delete(pctx);
out_unlock: out_unlock:
@ -1220,12 +1220,12 @@ nla_put_failure:
return -EMSGSIZE; return -EMSGSIZE;
} }
static int gtp_tunnel_notify(struct pdp_ctx *pctx, u8 cmd) static int gtp_tunnel_notify(struct pdp_ctx *pctx, u8 cmd, gfp_t allocation)
{ {
struct sk_buff *msg; struct sk_buff *msg;
int ret; int ret;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC); msg = nlmsg_new(NLMSG_DEFAULT_SIZE, allocation);
if (!msg) if (!msg)
return -ENOMEM; return -ENOMEM;