nfp: process control messages in workqueue in flower app

Processing of control messages is not time-critical and future processing
of some messages will require taking the RTNL which is not possible
in a BH handler. It seems simplest to move all control message processing
to a workqueue.

Signed-off-by: Simon Horman <simon.horman@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.c b/drivers/net/ethernet/netronome/nfp/flower/cmsg.c
index aa46b23cdfb1ff2e6eb68cc01c8570ca177c2606..6c8c22491fe7e3c9c2a4a6c9f4287d8de4810cb3 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.c
@@ -34,10 +34,12 @@
 #include <linux/bitfield.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <linux/workqueue.h>
 #include <net/dst_metadata.h>
 
 #include "main.h"
 #include "../nfpcore/nfp_cpp.h"
+#include "../nfp_net.h"
 #include "../nfp_net_repr.h"
 #include "./cmsg.h"
 
@@ -155,7 +157,8 @@ nfp_flower_cmsg_portmod_rx(struct nfp_app *app, struct sk_buff *skb)
        rcu_read_unlock();
 }
 
-void nfp_flower_cmsg_rx(struct nfp_app *app, struct sk_buff *skb)
+static void
+nfp_flower_cmsg_process_one_rx(struct nfp_app *app, struct sk_buff *skb)
 {
        struct nfp_flower_cmsg_hdr *cmsg_hdr;
        enum nfp_flower_cmsg_type_port type;
@@ -184,3 +187,22 @@ void nfp_flower_cmsg_rx(struct nfp_app *app, struct sk_buff *skb)
 out:
        dev_kfree_skb_any(skb);
 }
+
+void nfp_flower_cmsg_process_rx(struct work_struct *work)
+{
+       struct nfp_flower_priv *priv;
+       struct sk_buff *skb;
+
+       priv = container_of(work, struct nfp_flower_priv, cmsg_work);
+
+       while ((skb = skb_dequeue(&priv->cmsg_skbs)))
+               nfp_flower_cmsg_process_one_rx(priv->nn->app, skb);
+}
+
+void nfp_flower_cmsg_rx(struct nfp_app *app, struct sk_buff *skb)
+{
+       struct nfp_flower_priv *priv = app->priv;
+
+       skb_queue_tail(&priv->cmsg_skbs, skb);
+       schedule_work(&priv->cmsg_work);
+}

diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
index aa92a8711a02d5f3ea53e6cdd7585db62d6caa3a..a2ec603442365b7f3f1f58fca6940a2074bc1d0f 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h
@@ -330,6 +330,7 @@ nfp_flower_cmsg_mac_repr_add(struct sk_buff *skb, unsigned int idx,
                             unsigned int nbi, unsigned int nbi_port,
                             unsigned int phys_port);
 int nfp_flower_cmsg_portmod(struct nfp_repr *repr, bool carrier_ok);
+void nfp_flower_cmsg_process_rx(struct work_struct *work);
 void nfp_flower_cmsg_rx(struct nfp_app *app, struct sk_buff *skb);
 struct sk_buff *
 nfp_flower_cmsg_alloc(struct nfp_app *app, unsigned int size,

diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c b/drivers/net/ethernet/netronome/nfp/flower/main.c
index b905454b30ca1b93e57dbeca3078b0c799b73114..3088e959f2a3bf09f9cf729b34992b8c75afd978 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/main.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.c
@@ -332,6 +332,7 @@ err_invalid_port:
 static int nfp_flower_init(struct nfp_app *app)
 {
        const struct nfp_pf *pf = app->pf;
+       struct nfp_flower_priv *app_priv;
        u64 version;
        int err;
 
@@ -362,10 +363,14 @@ static int nfp_flower_init(struct nfp_app *app)
                return -EINVAL;
        }
 
-       app->priv = vzalloc(sizeof(struct nfp_flower_priv));
-       if (!app->priv)
+       app_priv = vzalloc(sizeof(struct nfp_flower_priv));
+       if (!app_priv)
                return -ENOMEM;
 
+       app->priv = app_priv;
+       skb_queue_head_init(&app_priv->cmsg_skbs);
+       INIT_WORK(&app_priv->cmsg_work, nfp_flower_cmsg_process_rx);
+
        err = nfp_flower_metadata_init(app);
        if (err)
                goto err_free_app_priv;
@@ -379,6 +384,11 @@ err_free_app_priv:
 
 static void nfp_flower_clean(struct nfp_app *app)
 {
+       struct nfp_flower_priv *app_priv = app->priv;
+
+       skb_queue_purge(&app_priv->cmsg_skbs);
+       flush_work(&app_priv->cmsg_work);
+
        nfp_flower_metadata_cleanup(app);
        vfree(app->priv);
        app->priv = NULL;

diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.h b/drivers/net/ethernet/netronome/nfp/flower/main.h
index 71e4f4f4e9ba50f208bab71c13692e7412f11214..b7043ca9b9fc3052d6e8dd74250afb0b2205fa82 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/main.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.h
@@ -39,6 +39,7 @@
 #include <linux/time64.h>
 #include <linux/types.h>
 #include <net/pkt_cls.h>
+#include <linux/workqueue.h>
 
 struct net_device;
 struct nfp_app;
@@ -78,6 +79,8 @@ struct nfp_fl_stats_id {
  * @mask_ids:          List of free mask ids
  * @mask_table:                Hash table used to store masks
  * @flow_table:                Hash table used to store flower rules
+ * @cmsg_work:         Workqueue for control messages processing
+ * @cmsg_skbs:         List of skbs for control message processing
  */
 struct nfp_flower_priv {
        struct nfp_net *nn;
@@ -87,6 +90,8 @@ struct nfp_flower_priv {
        struct nfp_fl_mask_id mask_ids;
        DECLARE_HASHTABLE(mask_table, NFP_FLOWER_MASK_HASH_BITS);
        DECLARE_HASHTABLE(flow_table, NFP_FLOWER_HASH_BITS);
+       struct work_struct cmsg_work;
+       struct sk_buff_head cmsg_skbs;
 };
 
 struct nfp_fl_key_ls {