1 files changed, 11 insertions, 9 deletions

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index f30e406fbec5..d8c364d637b1 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -1881,7 +1881,7 @@ static struct genl_family dp_datapath_genl_family __ro_after_init = {
 /* Called with ovs_mutex or RCU read lock. */
 static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb,
                                    struct net *net, u32 portid, u32 seq,
-                                   u32 flags, u8 cmd)
+                                   u32 flags, u8 cmd, gfp_t gfp)
 {
         struct ovs_header *ovs_header;
         struct ovs_vport_stats vport_stats;
@@ -1902,7 +1902,7 @@ static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb,
                 goto nla_put_failure;
 
         if (!net_eq(net, dev_net(vport->dev))) {
-                int id = peernet2id_alloc(net, dev_net(vport->dev));
+                int id = peernet2id_alloc(net, dev_net(vport->dev), gfp);
 
                 if (nla_put_s32(skb, OVS_VPORT_ATTR_NETNSID, id))
                         goto nla_put_failure;
@@ -1943,11 +1943,12 @@ struct sk_buff *ovs_vport_cmd_build_info(struct vport *vport, struct net *net,
         struct sk_buff *skb;
         int retval;
 
-        skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
+        skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!skb)
                 return ERR_PTR(-ENOMEM);
 
-        retval = ovs_vport_cmd_fill_info(vport, skb, net, portid, seq, 0, cmd);
+        retval = ovs_vport_cmd_fill_info(vport, skb, net, portid, seq, 0, cmd,
+                                         GFP_KERNEL);
         BUG_ON(retval < 0);
 
         return skb;
@@ -2089,7 +2090,7 @@ restart:
 
         err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),
                                       info->snd_portid, info->snd_seq, 0,
-                                      OVS_VPORT_CMD_NEW);
+                                      OVS_VPORT_CMD_NEW, GFP_KERNEL);
 
         new_headroom = netdev_get_fwd_headroom(vport->dev);
 
@@ -2150,7 +2151,7 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
 
         err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),
                                       info->snd_portid, info->snd_seq, 0,
-                                      OVS_VPORT_CMD_SET);
+                                      OVS_VPORT_CMD_SET, GFP_KERNEL);
         BUG_ON(err < 0);
 
         ovs_unlock();
@@ -2190,7 +2191,7 @@ static int ovs_vport_cmd_del(struct sk_buff *skb, struct genl_info *info)
 
         err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),
                                       info->snd_portid, info->snd_seq, 0,
-                                      OVS_VPORT_CMD_DEL);
+                                      OVS_VPORT_CMD_DEL, GFP_KERNEL);
         BUG_ON(err < 0);
 
         /* the vport deletion may trigger dp headroom update */
@@ -2237,7 +2238,7 @@ static int ovs_vport_cmd_get(struct sk_buff *skb, struct genl_info *info)
                 goto exit_unlock_free;
         err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),
                                       info->snd_portid, info->snd_seq, 0,
-                                      OVS_VPORT_CMD_GET);
+                                      OVS_VPORT_CMD_GET, GFP_ATOMIC);
         BUG_ON(err < 0);
         rcu_read_unlock();
 
@@ -2273,7 +2274,8 @@ static int ovs_vport_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
                                                     NETLINK_CB(cb->skb).portid,
                                                     cb->nlh->nlmsg_seq,
                                                     NLM_F_MULTI,
-                                                    OVS_VPORT_CMD_GET) < 0)
+                                                    OVS_VPORT_CMD_GET,
+                                                    GFP_ATOMIC) < 0)
                                 goto out;
 
                         j++;