From ea94e7b11702e12d44ba6b0525aee4a55e52c825 Mon Sep 17 00:00:00 2001

From: Dany Madden <drt@linux.ibm.com>

Date: Wed, 27 Apr 2022 18:51:46 -0500

Subject: [PATCH] Revert "ibmvnic: Add ethtool private flag for driver-defined

 queue limits"

References: bsc#1121726 ltc#174633 git-fixes

Patch-mainline: v5.18-rc5

Git-commit: aeaf59b78712c7a1827c76f086acff4f586e072f

This reverts commit 723ad916134784b317b72f3f6cf0f7ba774e5dae

When client requests channel or ring size larger than what the server

can support the server will cap the request to the supported max. So,

the client would not be able to successfully request resources that

exceed the server limit.

Fixes: 723ad9161347 ("ibmvnic: Add ethtool private flag for driver-defined queue limits")

Signed-off-by: Dany Madden <drt@linux.ibm.com>

Link: https://lore.kernel.org/r/20220427235146.23189-1-drt@linux.ibm.com

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 drivers/net/ethernet/ibm/ibmvnic.c | 129 ++++++++---------------------

 drivers/net/ethernet/ibm/ibmvnic.h |   6 --

 2 files changed, 35 insertions(+), 100 deletions(-)

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c

index a84d459f204f..13acff619cf4 100644

--- a/drivers/net/ethernet/ibm/ibmvnic.c

+++ b/drivers/net/ethernet/ibm/ibmvnic.c

@@ -2918,13 +2918,8 @@ static void ibmvnic_get_ringparam(struct net_device *netdev,

 {

 	struct ibmvnic_adapter *adapter = netdev_priv(netdev);

-	if (adapter->priv_flags & IBMVNIC_USE_SERVER_MAXES) {

-		ring->rx_max_pending = adapter->max_rx_add_entries_per_subcrq;

-		ring->tx_max_pending = adapter->max_tx_entries_per_subcrq;

-	} else {

-		ring->rx_max_pending = IBMVNIC_MAX_QUEUE_SZ;

-		ring->tx_max_pending = IBMVNIC_MAX_QUEUE_SZ;

-	}

+	ring->rx_max_pending = adapter->max_rx_add_entries_per_subcrq;

+	ring->tx_max_pending = adapter->max_tx_entries_per_subcrq;

 	ring->rx_mini_max_pending = 0;

 	ring->rx_jumbo_max_pending = 0;

 	ring->rx_pending = adapter->req_rx_add_entries_per_subcrq;

@@ -2937,23 +2932,21 @@ static int ibmvnic_set_ringparam(struct net_device *netdev,

 				 struct ethtool_ringparam *ring)

 {

 	struct ibmvnic_adapter *adapter = netdev_priv(netdev);

-	int ret;

-	ret = 0;

+	if (ring->rx_pending > adapter->max_rx_add_entries_per_subcrq  ||

+	    ring->tx_pending > adapter->max_tx_entries_per_subcrq) {

+		netdev_err(netdev, "Invalid request.\n");

+		netdev_err(netdev, "Max tx buffers = %llu\n",

+			   adapter->max_rx_add_entries_per_subcrq);

+		netdev_err(netdev, "Max rx buffers = %llu\n",

+			   adapter->max_tx_entries_per_subcrq);

+		return -EINVAL;

+	}

+

 	adapter->desired.rx_entries = ring->rx_pending;

 	adapter->desired.tx_entries = ring->tx_pending;

-	ret = wait_for_reset(adapter);

-

-	if (!ret &&

-	    (adapter->req_rx_add_entries_per_subcrq != ring->rx_pending ||

-	     adapter->req_tx_entries_per_subcrq != ring->tx_pending))

-		netdev_info(netdev,

-			    "Could not match full ringsize request. Requested: RX %d, TX %d; Allowed: RX %llu, TX %llu\n",

-			    ring->rx_pending, ring->tx_pending,

-			    adapter->req_rx_add_entries_per_subcrq,

-			    adapter->req_tx_entries_per_subcrq);

-	return ret;

+	return wait_for_reset(adapter);

 }

 static void ibmvnic_get_channels(struct net_device *netdev,

@@ -2961,14 +2954,8 @@ static void ibmvnic_get_channels(struct net_device *netdev,

 {

 	struct ibmvnic_adapter *adapter = netdev_priv(netdev);

-	if (adapter->priv_flags & IBMVNIC_USE_SERVER_MAXES) {

-		channels->max_rx = adapter->max_rx_queues;

-		channels->max_tx = adapter->max_tx_queues;

-	} else {

-		channels->max_rx = IBMVNIC_MAX_QUEUES;

-		channels->max_tx = IBMVNIC_MAX_QUEUES;

-	}

-

+	channels->max_rx = adapter->max_rx_queues;

+	channels->max_tx = adapter->max_tx_queues;

 	channels->max_other = 0;

 	channels->max_combined = 0;

 	channels->rx_count = adapter->req_rx_queues;

@@ -2981,22 +2968,11 @@ static int ibmvnic_set_channels(struct net_device *netdev,

 				struct ethtool_channels *channels)

 {

 	struct ibmvnic_adapter *adapter = netdev_priv(netdev);

-	int ret;

-	ret = 0;

 	adapter->desired.rx_queues = channels->rx_count;

 	adapter->desired.tx_queues = channels->tx_count;

-	ret = wait_for_reset(adapter);

-

-	if (!ret &&

-	    (adapter->req_rx_queues != channels->rx_count ||

-	     adapter->req_tx_queues != channels->tx_count))

-		netdev_info(netdev,

-			    "Could not match full channels request. Requested: RX %d, TX %d; Allowed: RX %llu, TX %llu\n",

-			    channels->rx_count, channels->tx_count,

-			    adapter->req_rx_queues, adapter->req_tx_queues);

-	return ret;

+	return wait_for_reset(adapter);

 }

 static void ibmvnic_get_strings(struct net_device *dev, u32 stringset, u8 *data)

@@ -3004,43 +2980,32 @@ static void ibmvnic_get_strings(struct net_device *dev, u32 stringset, u8 *data)

 	struct ibmvnic_adapter *adapter = netdev_priv(dev);

 	int i;

-	switch (stringset) {

-	case ETH_SS_STATS:

-		for (i = 0; i < ARRAY_SIZE(ibmvnic_stats);

-				i++, data += ETH_GSTRING_LEN)

-			memcpy(data, ibmvnic_stats[i].name, ETH_GSTRING_LEN);

+	if (stringset != ETH_SS_STATS)

+		return;

-		for (i = 0; i < adapter->req_tx_queues; i++) {

-			snprintf(data, ETH_GSTRING_LEN, "tx%d_packets", i);

-			data += ETH_GSTRING_LEN;

+	for (i = 0; i < ARRAY_SIZE(ibmvnic_stats); i++, data += ETH_GSTRING_LEN)

+		memcpy(data, ibmvnic_stats[i].name, ETH_GSTRING_LEN);

-			snprintf(data, ETH_GSTRING_LEN, "tx%d_bytes", i);

-			data += ETH_GSTRING_LEN;

+	for (i = 0; i < adapter->req_tx_queues; i++) {

+		snprintf(data, ETH_GSTRING_LEN, "tx%d_packets", i);

+		data += ETH_GSTRING_LEN;

-			snprintf(data, ETH_GSTRING_LEN,

-				 "tx%d_dropped_packets", i);

-			data += ETH_GSTRING_LEN;

-		}

+		snprintf(data, ETH_GSTRING_LEN, "tx%d_bytes", i);

+		data += ETH_GSTRING_LEN;

-		for (i = 0; i < adapter->req_rx_queues; i++) {

-			snprintf(data, ETH_GSTRING_LEN, "rx%d_packets", i);

-			data += ETH_GSTRING_LEN;

+		snprintf(data, ETH_GSTRING_LEN, "tx%d_dropped_packets", i);

+		data += ETH_GSTRING_LEN;

+	}

-			snprintf(data, ETH_GSTRING_LEN, "rx%d_bytes", i);

-			data += ETH_GSTRING_LEN;

+	for (i = 0; i < adapter->req_rx_queues; i++) {

+		snprintf(data, ETH_GSTRING_LEN, "rx%d_packets", i);

+		data += ETH_GSTRING_LEN;

-			snprintf(data, ETH_GSTRING_LEN, "rx%d_interrupts", i);

-			data += ETH_GSTRING_LEN;

-		}

-		break;

+		snprintf(data, ETH_GSTRING_LEN, "rx%d_bytes", i);

+		data += ETH_GSTRING_LEN;

-	case ETH_SS_PRIV_FLAGS:

-		for (i = 0; i < ARRAY_SIZE(ibmvnic_priv_flags); i++)

-			strcpy(data + i * ETH_GSTRING_LEN,

-			       ibmvnic_priv_flags[i]);

-		break;

-	default:

-		return;

+		snprintf(data, ETH_GSTRING_LEN, "rx%d_interrupts", i);

+		data += ETH_GSTRING_LEN;

 	}

 }

@@ -3053,8 +3018,6 @@ static int ibmvnic_get_sset_count(struct net_device *dev, int sset)

 		return ARRAY_SIZE(ibmvnic_stats) +

 		       adapter->req_tx_queues * NUM_TX_STATS +

 		       adapter->req_rx_queues * NUM_RX_STATS;

-	case ETH_SS_PRIV_FLAGS:

-		return ARRAY_SIZE(ibmvnic_priv_flags);

 	default:

 		return -EOPNOTSUPP;

 	}

@@ -3107,26 +3070,6 @@ static void ibmvnic_get_ethtool_stats(struct net_device *dev,

 	}

 }

-static u32 ibmvnic_get_priv_flags(struct net_device *netdev)

-{

-	struct ibmvnic_adapter *adapter = netdev_priv(netdev);

-

-	return adapter->priv_flags;

-}

-

-static int ibmvnic_set_priv_flags(struct net_device *netdev, u32 flags)

-{

-	struct ibmvnic_adapter *adapter = netdev_priv(netdev);

-	bool which_maxes = !!(flags & IBMVNIC_USE_SERVER_MAXES);

-

-	if (which_maxes)

-		adapter->priv_flags |= IBMVNIC_USE_SERVER_MAXES;

-	else

-		adapter->priv_flags &= ~IBMVNIC_USE_SERVER_MAXES;

-

-	return 0;

-}

-

 static const struct ethtool_ops ibmvnic_ethtool_ops = {

 	.get_drvinfo		= ibmvnic_get_drvinfo,

 	.get_msglevel		= ibmvnic_get_msglevel,

@@ -3140,8 +3083,6 @@ static const struct ethtool_ops ibmvnic_ethtool_ops = {

 	.get_sset_count         = ibmvnic_get_sset_count,

 	.get_ethtool_stats	= ibmvnic_get_ethtool_stats,

 	.get_link_ksettings	= ibmvnic_get_link_ksettings,

-	.get_priv_flags		= ibmvnic_get_priv_flags,

-	.set_priv_flags		= ibmvnic_set_priv_flags,

 };

 /* Routines for managing CRQs/sCRQs  */

diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h

index 9fc4d3068018..d87f88d1552d 100644

--- a/drivers/net/ethernet/ibm/ibmvnic.h

+++ b/drivers/net/ethernet/ibm/ibmvnic.h

@@ -52,11 +52,6 @@

 #define IBMVNIC_RESET_DELAY 100

-static const char ibmvnic_priv_flags[][ETH_GSTRING_LEN] = {

-#define IBMVNIC_USE_SERVER_MAXES 0x1

-	"use-server-maxes"

-};

-

 struct ibmvnic_login_buffer {

 	__be32 len;

 	__be32 version;

@@ -895,7 +890,6 @@ struct ibmvnic_adapter {

 	struct ibmvnic_control_ip_offload_buffer ip_offload_ctrl;

 	dma_addr_t ip_offload_ctrl_tok;

 	u32 msg_enable;

-	u32 priv_flags;

 	/* Vital Product Data (VPD) */

 	struct ibmvnic_vpd *vpd;

-- 

2.34.1