i40e: Disable iWARP VSI PETCP_ENA flag on netdev down events

Client close is overloaded to handle both un-registration and
netdev down event. On netdev down, i40iw client close is called
which unregisters the RDMA dev and this is too destructive
since the netdev is still registered.

Do not call client close/open on netdev down/up events. Instead
disable the PE TCP_ENA flag during a netdev down event. This
blocks all TCP traffic to the RDMA Protocol Engine. On netdev up,
re-enable the flag.

Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_client.c b/drivers/net/ethernet/intel/i40e/i40e_client.c
index 1b1e2acbd07f3fad4911d64677a866361106a022..0de9610c1d8db1e95250f51f1987a7d6608699d9 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_client.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_client.c
@@ -378,11 +378,11 @@ void i40e_client_subtask(struct i40e_pf *pf)
        if (!client || !cdev)
                return;
 
-       /* Here we handle client opens. If the client is down, but
-        * the netdev is up, then open the client.
+       /* Here we handle client opens. If the client is down, and
+        * the netdev is registered, then open the client.
         */
        if (!test_bit(__I40E_CLIENT_INSTANCE_OPENED, &cdev->state)) {
-               if (!test_bit(__I40E_VSI_DOWN, vsi->state) &&
+               if (vsi->netdev_registered &&
                    client->ops && client->ops->open) {
                        set_bit(__I40E_CLIENT_INSTANCE_OPENED, &cdev->state);
                        ret = client->ops->open(&cdev->lan_info, client);
@@ -393,17 +393,19 @@ void i40e_client_subtask(struct i40e_pf *pf)
                                i40e_client_del_instance(pf);
                        }
                }
-       } else {
-       /* Likewise for client close. If the client is up, but the netdev
-        * is down, then close the client.
-        */
-               if (test_bit(__I40E_VSI_DOWN, vsi->state) &&
-                   client->ops && client->ops->close) {
-                       clear_bit(__I40E_CLIENT_INSTANCE_OPENED, &cdev->state);
-                       client->ops->close(&cdev->lan_info, client, false);
-                       i40e_client_release_qvlist(&cdev->lan_info);
-               }
        }
+
+       /* enable/disable PE TCP_ENA flag based on netdev down/up
+        */
+       if (test_bit(__I40E_VSI_DOWN, vsi->state))
+               i40e_client_update_vsi_ctxt(&cdev->lan_info, client,
+                                           0, 0, 0,
+                                           I40E_CLIENT_VSI_FLAG_TCP_ENABLE);
+       else
+               i40e_client_update_vsi_ctxt(&cdev->lan_info, client,
+                                           0, 0,
+                                           I40E_CLIENT_VSI_FLAG_TCP_ENABLE,
+                                           I40E_CLIENT_VSI_FLAG_TCP_ENABLE);
 }
 
 /**
@@ -717,13 +719,13 @@ static int i40e_client_update_vsi_ctxt(struct i40e_info *ldev,
                return -ENOENT;
        }
 
-       if ((valid_flag & I40E_CLIENT_VSI_FLAG_TCP_PACKET_ENABLE) &&
-           (flag & I40E_CLIENT_VSI_FLAG_TCP_PACKET_ENABLE)) {
+       if ((valid_flag & I40E_CLIENT_VSI_FLAG_TCP_ENABLE) &&
+           (flag & I40E_CLIENT_VSI_FLAG_TCP_ENABLE)) {
                ctxt.info.valid_sections =
                        cpu_to_le16(I40E_AQ_VSI_PROP_QUEUE_OPT_VALID);
                ctxt.info.queueing_opt_flags |= I40E_AQ_VSI_QUE_OPT_TCP_ENA;
-       } else if ((valid_flag & I40E_CLIENT_VSI_FLAG_TCP_PACKET_ENABLE) &&
-                 !(flag & I40E_CLIENT_VSI_FLAG_TCP_PACKET_ENABLE)) {
+       } else if ((valid_flag & I40E_CLIENT_VSI_FLAG_TCP_ENABLE) &&
+                 !(flag & I40E_CLIENT_VSI_FLAG_TCP_ENABLE)) {
                ctxt.info.valid_sections =
                        cpu_to_le16(I40E_AQ_VSI_PROP_QUEUE_OPT_VALID);
                ctxt.info.queueing_opt_flags &= ~I40E_AQ_VSI_QUE_OPT_TCP_ENA;

diff --git a/drivers/net/ethernet/intel/i40e/i40e_client.h b/drivers/net/ethernet/intel/i40e/i40e_client.h
index 15b21a5315b597a0ee4cd933fc10bfa5cec0a510..ba55c889e4c5a1c0bcb4758feb693e43560aff12 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_client.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_client.h
@@ -132,7 +132,7 @@ struct i40e_info {
 
 #define I40E_CLIENT_RESET_LEVEL_PF   1
 #define I40E_CLIENT_RESET_LEVEL_CORE 2
-#define I40E_CLIENT_VSI_FLAG_TCP_PACKET_ENABLE  BIT(1)
+#define I40E_CLIENT_VSI_FLAG_TCP_ENABLE  BIT(1)
 
 struct i40e_ops {
        /* setup_q_vector_list enables queues with a particular vector */