Commit 3a62c333 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ethtool-extend-coalesce-uapi' 

Yufeng Mo says:

====================
ethtool: extend coalesce uAPI

In order to support some configuration in coalesce uAPI, this series
extend coalesce uAPI and add support for CQE mode.

Below is some test result with HNS3 driver:
1. old ethtool(ioctl) + new kernel:
estuary:/$ ethtool -c eth0
Coalesce parameters for eth0:
Adaptive RX: on  TX: on
stats-block-usecs: 0
sample-interval: 0
pkt-rate-low: 0
pkt-rate-high: 0

rx-usecs: 20
rx-frames: 0
rx-usecs-irq: 0
rx-frames-irq: 0

tx-usecs: 20
tx-frames: 0
tx-usecs-irq: 0
tx-frames-irq: 0

rx-usecs-low: 0
rx-frame-low: 0
tx-usecs-low: 0
tx-frame-low: 0

rx-usecs-high: 0
rx-frame-high: 0
tx-usecs-high: 0
tx-frame-high: 0

2. ethtool(netlink with cqe mode) + kernel without cqe mode:
estuary:/$ ethtool -c eth0
Coalesce parameters for eth0:
Adaptive RX: on  TX: on
stats-block-usecs: n/a
sample-interval: n/a
pkt-rate-low: n/a
pkt-rate-high: n/a

rx-usecs: 20
rx-frames: 0
rx-usecs-irq: n/a
rx-frames-irq: n/a

tx-usecs: 20
tx-frames: 0
tx-usecs-irq: n/a
tx-frames-irq: n/a

rx-usecs-low: n/a
rx-frame-low: n/a
tx-usecs-low: n/a
tx-frame-low: n/a

rx-usecs-high: 0
rx-frame-high: n/a
tx-usecs-high: 0
tx-frame-high: n/a

CQE mode RX: n/a  TX: n/a

3. ethool(netlink with cqe mode) + kernel with cqe mode:
estuary:/$ ethtool -c eth0
Coalesce parameters for eth0:
Adaptive RX: on  TX: on
stats-block-usecs: n/a
sample-interval: n/a
pkt-rate-low: n/a
pkt-rate-high: n/a

rx-usecs: 20
rx-frames: 0
rx-usecs-irq: n/a
rx-frames-irq: n/a

tx-usecs: 20
tx-frames: 0
tx-usecs-irq: n/a
tx-frames-irq: n/a

rx-usecs-low: n/a
rx-frame-low: n/a
tx-usecs-low: n/a
tx-frame-low: n/a

rx-usecs-high: 0
rx-frame-high: n/a
tx-usecs-high: 0
tx-frame-high: n/a

CQE mode RX: off  TX: off

4. ethool(netlink without cqe mode) + kernel with cqe mode:
estuary:/$ ethtool -c eth0
Coalesce parameters for eth0:
Adaptive RX: on  TX: on
stats-block-usecs: n/a
sample-interval: n/a
pkt-rate-low: n/a
pkt-rate-high: n/a

rx-usecs: 20
rx-frames: 0
rx-usecs-irq: n/a
rx-frames-irq: n/a

tx-usecs: 20
tx-frames: 0
tx-usecs-irq: n/a
tx-frames-irq: n/a

rx-usecs-low: n/a
rx-frame-low: n/a
tx-usecs-low: n/a
tx-frame-low: n/a

rx-usecs-high: 0
rx-frame-high: n/a
tx-usecs-high: 0
tx-frame-high: n/a

Change log:
V2 -> V3:
         fix some warning on W=1 builds in #2

V1 -> V2:
         1. fix compile error using allmodconfig in #2
         2. move some property-related modifications from #2 to #1
            for better review suggested by Jakub Kicinski.

Change log from RFC:
V3 -> V4:
         add document explaining the difference between CQE and EQE
         in #1 suggested by Jakub Kicinski.

V2 -> V3:
         1. split #1 into adding new parameter and adding new attributes.
         2. use NLA_POLICY_MAX(NLA_U8, 1) instead of NLA_U8.
         3. modify the description of CQE in Document.

V1 -> V2:
         refactor #1&#2 in V1 suggestted by Jakub Kicinski.
====================

Link: https://lore.kernel.org/r/1629444920-25437-1-git-send-email-moyufeng@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 95d1d249 cce1689e

Documentation/networking/ethtool-netlink.rst

+15 −0
Original line number Diff line number Diff line
@@ -947,12 +947,25 @@ Kernel response contents: 
  ``ETHTOOL_A_COALESCE_TX_USECS_HIGH``         u32     delay (us), high Tx

  ``ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH``    u32     max packets, high Tx

  ``ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL``  u32     rate sampling interval

  ``ETHTOOL_A_COALESCE_USE_CQE_TX``            bool    timer reset mode, Tx

  ``ETHTOOL_A_COALESCE_USE_CQE_RX``            bool    timer reset mode, Rx

  ===========================================  ======  =======================



Attributes are only included in reply if their value is not zero or the

corresponding bit in ``ethtool_ops::supported_coalesce_params`` is set (i.e.

they are declared as supported by driver).



Timer reset mode (``ETHTOOL_A_COALESCE_USE_CQE_TX`` and

``ETHTOOL_A_COALESCE_USE_CQE_RX``) controls the interaction between packet

arrival and the various time based delay parameters. By default timers are

expected to limit the max delay between any packet arrival/departure and a

corresponding interrupt. In this mode timer should be started by packet

arrival (sometimes delivery of previous interrupt) and reset when interrupt

is delivered.

Setting the appropriate attribute to 1 will enable ``CQE`` mode, where

each packet event resets the timer. In this mode timer is used to force

the interrupt if queue goes idle, while busy queues depend on the packet

limit to trigger interrupts.



COALESCE_SET

============
@@ -985,6 +998,8 @@ Request contents: 
  ``ETHTOOL_A_COALESCE_TX_USECS_HIGH``         u32     delay (us), high Tx

  ``ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH``    u32     max packets, high Tx

  ``ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL``  u32     rate sampling interval

  ``ETHTOOL_A_COALESCE_USE_CQE_TX``            bool    timer reset mode, Tx

  ``ETHTOOL_A_COALESCE_USE_CQE_RX``            bool    timer reset mode, Rx

  ===========================================  ======  =======================



Request is rejected if it attributes declared as unsupported by driver (i.e.

drivers/infiniband/ulp/ipoib/ipoib_ethtool.c

+6 −2
Original line number Diff line number Diff line
@@ -72,7 +72,9 @@ static void ipoib_get_drvinfo(struct net_device *netdev, 
}



static int ipoib_get_coalesce(struct net_device *dev,

			      struct ethtool_coalesce *coal)

			      struct ethtool_coalesce *coal,

			      struct kernel_ethtool_coalesce *kernel_coal,

			      struct netlink_ext_ack *extack)

{

	struct ipoib_dev_priv *priv = ipoib_priv(dev);
@@ -83,7 +85,9 @@ static int ipoib_get_coalesce(struct net_device *dev, 
}



static int ipoib_set_coalesce(struct net_device *dev,

			      struct ethtool_coalesce *coal)

			      struct ethtool_coalesce *coal,

			      struct kernel_ethtool_coalesce *kernel_coal,

			      struct netlink_ext_ack *extack)

{

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	int ret;

drivers/net/ethernet/amazon/ena/ena_ethtool.c

+6 −2
Original line number Diff line number Diff line
@@ -357,7 +357,9 @@ static int ena_get_link_ksettings(struct net_device *netdev, 
}



static int ena_get_coalesce(struct net_device *net_dev,

			    struct ethtool_coalesce *coalesce)

			    struct ethtool_coalesce *coalesce,

			    struct kernel_ethtool_coalesce *kernel_coal,

			    struct netlink_ext_ack *extack)

{

	struct ena_adapter *adapter = netdev_priv(net_dev);

	struct ena_com_dev *ena_dev = adapter->ena_dev;
@@ -402,7 +404,9 @@ static void ena_update_rx_rings_nonadaptive_intr_moderation(struct ena_adapter * 
}



static int ena_set_coalesce(struct net_device *net_dev,

			    struct ethtool_coalesce *coalesce)

			    struct ethtool_coalesce *coalesce,

			    struct kernel_ethtool_coalesce *kernel_coal,

			    struct netlink_ext_ack *extack)

{

	struct ena_adapter *adapter = netdev_priv(net_dev);

	struct ena_com_dev *ena_dev = adapter->ena_dev;

drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c

+6 −2
Original line number Diff line number Diff line
@@ -428,7 +428,9 @@ static void xgbe_set_msglevel(struct net_device *netdev, u32 msglevel) 
}



static int xgbe_get_coalesce(struct net_device *netdev,

			     struct ethtool_coalesce *ec)

			     struct ethtool_coalesce *ec,

			     struct kernel_ethtool_coalesce *kernel_coal,

			     struct netlink_ext_ack *extack)

{

	struct xgbe_prv_data *pdata = netdev_priv(netdev);
@@ -443,7 +445,9 @@ static int xgbe_get_coalesce(struct net_device *netdev, 
}



static int xgbe_set_coalesce(struct net_device *netdev,

			     struct ethtool_coalesce *ec)

			     struct ethtool_coalesce *ec,

			     struct kernel_ethtool_coalesce *kernel_coal,

			     struct netlink_ext_ack *extack)

{

	struct xgbe_prv_data *pdata = netdev_priv(netdev);

	struct xgbe_hw_if *hw_if = &pdata->hw_if;

drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c

+6 −2
Original line number Diff line number Diff line
@@ -547,7 +547,9 @@ static int aq_ethtool_set_rxnfc(struct net_device *ndev, 
}



static int aq_ethtool_get_coalesce(struct net_device *ndev,

				   struct ethtool_coalesce *coal)

				   struct ethtool_coalesce *coal,

				   struct kernel_ethtool_coalesce *kernel_coal,

				   struct netlink_ext_ack *extack)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg;
@@ -571,7 +573,9 @@ static int aq_ethtool_get_coalesce(struct net_device *ndev, 
}



static int aq_ethtool_set_coalesce(struct net_device *ndev,

				   struct ethtool_coalesce *coal)

				   struct ethtool_coalesce *coal,

				   struct kernel_ethtool_coalesce *kernel_coal,

				   struct netlink_ext_ack *extack)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg;