net: hns3: add support to config depth for tx|rx ring separately (c0425944) · Commits · 戴 / test

drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ enum HCLGE_MBX_OPCODE {
		HCLGE_MBX_SET_MACVLAN, /* (VF -> PF) set unicast filter */
		HCLGE_MBX_API_NEGOTIATE, /* (VF -> PF) negotiate API version */
		HCLGE_MBX_GET_QINFO, /* (VF -> PF) get queue config */
		HCLGE_MBX_GET_QDEPTH, /* (VF -> PF) get queue depth */
		HCLGE_MBX_GET_TCINFO, /* (VF -> PF) get TC config */
		HCLGE_MBX_GET_RETA, /* (VF -> PF) get RETA */
		HCLGE_MBX_GET_RSS_KEY, /* (VF -> PF) get RSS key */

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+7 −3

Original line number	Diff line number	Diff line
		@@ -87,7 +87,8 @@ struct hnae3_queue {
		struct hnae3_handle *handle;
		int tqp_index; /* index in a handle */
		u32 buf_size; /* size for hnae_desc->addr, preset by AE */
		u16 desc_num; /* total number of desc */
		u16 tx_desc_num;/* total number of tx desc */
		u16 rx_desc_num;/* total number of rx desc */
		};

		/hnae3 loop mode/
		@@ -505,7 +506,8 @@ struct hnae3_knic_private_info {
		u16 rss_size; /* Allocated RSS queues */
		u16 req_rss_size;
		u16 rx_buf_len;
		u16 num_desc;
		u16 num_tx_desc;
		u16 num_rx_desc;

		u8 num_tc; /* Total number of enabled TCs */
		u8 prio_tc[HNAE3_MAX_USER_PRIO]; /* TC indexed by prio */
		@@ -537,7 +539,9 @@ struct hnae3_roce_private_info {
		struct hnae3_unic_private_info {
		struct net_device *netdev;
		u16 rx_buf_len;
		u16 num_desc;
		u16 num_tx_desc;
		u16 num_rx_desc;

		u16 num_tqps; /* total number of tqps in this handle */
		struct hnae3_queue *tqp; / array base of all TQPs of this instance */
		};

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -3231,19 +3231,21 @@ static int hns3_ring_get_cfg(struct hnae3_queue q, struct hns3_nic_priv priv,
		{
		struct hns3_nic_ring_data *ring_data = priv->ring_data;
		int queue_num = priv->ae_handle->kinfo.num_tqps;
		int desc_num = priv->ae_handle->kinfo.num_desc;
		struct pci_dev *pdev = priv->ae_handle->pdev;
		struct hns3_enet_ring *ring;
		int desc_num;

		ring = devm_kzalloc(&pdev->dev, sizeof(*ring), GFP_KERNEL);
		if (!ring)
		return -ENOMEM;

		if (ring_type == HNAE3_RING_TYPE_TX) {
		desc_num = priv->ae_handle->kinfo.num_tx_desc;
		ring_data[q->tqp_index].ring = ring;
		ring_data[q->tqp_index].queue_index = q->tqp_index;
		ring->io_base = (u8 __iomem *)q->io_base + HNS3_TX_REG_OFFSET;
		} else {
		desc_num = priv->ae_handle->kinfo.num_rx_desc;
		ring_data[q->tqp_index + queue_num].ring = ring;
		ring_data[q->tqp_index + queue_num].queue_index = q->tqp_index;
		ring->io_base = q->io_base;

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ enum hns3_nic_state {
		#define HNS3_RING_NAME_LEN 16
		#define HNS3_BUFFER_SIZE_2048 2048
		#define HNS3_RING_MAX_PENDING 32768
		#define HNS3_RING_MIN_PENDING 8
		#define HNS3_RING_MIN_PENDING 24
		#define HNS3_RING_BD_MULTIPLE 8
		/* max frame size of mac */
		#define HNS3_MAC_MAX_FRAME 9728

drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

+29 −25

Original line number	Diff line number	Diff line
		@@ -748,15 +748,19 @@ static int hns3_get_rxnfc(struct net_device *netdev,
		}

		static int hns3_change_all_ring_bd_num(struct hns3_nic_priv *priv,
		u32 new_desc_num)
		u32 tx_desc_num, u32 rx_desc_num)
		{
		struct hnae3_handle *h = priv->ae_handle;
		int i;

		h->kinfo.num_desc = new_desc_num;
		h->kinfo.num_tx_desc = tx_desc_num;
		h->kinfo.num_rx_desc = rx_desc_num;

		for (i = 0; i < h->kinfo.num_tqps * 2; i++)
		priv->ring_data[i].ring->desc_num = new_desc_num;
		for (i = 0; i < h->kinfo.num_tqps; i++) {
		priv->ring_data[i].ring->desc_num = tx_desc_num;
		priv->ring_data[i + h->kinfo.num_tqps].ring->desc_num =
		rx_desc_num;
		}

		return hns3_init_all_ring(priv);
		}
		@@ -767,7 +771,9 @@ static int hns3_set_ringparam(struct net_device *ndev,
		struct hns3_nic_priv *priv = netdev_priv(ndev);
		struct hnae3_handle *h = priv->ae_handle;
		bool if_running = netif_running(ndev);
		u32 old_desc_num, new_desc_num;
		u32 old_tx_desc_num, new_tx_desc_num;
		u32 old_rx_desc_num, new_rx_desc_num;
		int queue_num = h->kinfo.num_tqps;
		int ret;

		if (hns3_nic_resetting(ndev))
		@@ -776,32 +782,28 @@ static int hns3_set_ringparam(struct net_device *ndev,
		if (param->rx_mini_pending \|\| param->rx_jumbo_pending)
		return -EINVAL;

		if (param->tx_pending != param->rx_pending) {
		netdev_err(ndev,
		"Descriptors of tx and rx must be equal");
		return -EINVAL;
		}

		if (param->tx_pending > HNS3_RING_MAX_PENDING \|\|
		param->tx_pending < HNS3_RING_MIN_PENDING) {
		netdev_err(ndev,
		"Descriptors requested (Tx/Rx: %d) out of range [%d-%d]\n",
		param->tx_pending, HNS3_RING_MIN_PENDING,
		HNS3_RING_MAX_PENDING);
		param->tx_pending < HNS3_RING_MIN_PENDING \|\|
		param->rx_pending > HNS3_RING_MAX_PENDING \|\|
		param->rx_pending < HNS3_RING_MIN_PENDING) {
		netdev_err(ndev, "Queue depth out of range [%d-%d]\n",
		HNS3_RING_MIN_PENDING, HNS3_RING_MAX_PENDING);
		return -EINVAL;
		}

		new_desc_num = param->tx_pending;

		/* Hardware requires that its descriptors must be multiple of eight */
		new_desc_num = ALIGN(new_desc_num, HNS3_RING_BD_MULTIPLE);
		old_desc_num = h->kinfo.num_desc;
		if (old_desc_num == new_desc_num)
		new_tx_desc_num = ALIGN(param->tx_pending, HNS3_RING_BD_MULTIPLE);
		new_rx_desc_num = ALIGN(param->rx_pending, HNS3_RING_BD_MULTIPLE);
		old_tx_desc_num = priv->ring_data[0].ring->desc_num;
		old_rx_desc_num = priv->ring_data[queue_num].ring->desc_num;
		if (old_tx_desc_num == new_tx_desc_num &&
		old_rx_desc_num == new_rx_desc_num)
		return 0;

		netdev_info(ndev,
		"Changing descriptor count from %d to %d.\n",
		old_desc_num, new_desc_num);
		"Changing Tx/Rx ring depth from %d/%d to %d/%d\n",
		old_tx_desc_num, old_rx_desc_num,
		new_tx_desc_num, new_rx_desc_num);

		if (if_running)
		ndev->netdev_ops->ndo_stop(ndev);
		@@ -810,9 +812,11 @@ static int hns3_set_ringparam(struct net_device *ndev,
		if (ret)
		return ret;

		ret = hns3_change_all_ring_bd_num(priv, new_desc_num);
		ret = hns3_change_all_ring_bd_num(priv, new_tx_desc_num,
		new_rx_desc_num);
		if (ret) {
		ret = hns3_change_all_ring_bd_num(priv, old_desc_num);
		ret = hns3_change_all_ring_bd_num(priv, old_tx_desc_num,
		old_rx_desc_num);
		if (ret) {
		netdev_err(ndev,
		"Revert to old bd num fail, ret=%d.\n", ret);

Admin message