Commit f3ccfda1 authored by Yufeng Mo's avatar Yufeng Mo Committed by Jakub Kicinski
Browse files

ethtool: extend coalesce setting uAPI with CQE mode 



In order to support more coalesce parameters through netlink,
add two new parameter kernel_coal and extack for .set_coalesce
and .get_coalesce, then some extra info can return to user with
the netlink API.

Signed-off-by: default avatarYufeng Mo <moyufeng@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 029ee6b1

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;

drivers/net/ethernet/broadcom/bcmsysport.c

+6 −2
Original line number Diff line number Diff line
@@ -607,7 +607,9 @@ static void bcm_sysport_set_tx_coalesce(struct bcm_sysport_tx_ring *ring, 
}



static int bcm_sysport_get_coalesce(struct net_device *dev,

				    struct ethtool_coalesce *ec)

				    struct ethtool_coalesce *ec,

				    struct kernel_ethtool_coalesce *kernel_coal,

				    struct netlink_ext_ack *extack)

{

	struct bcm_sysport_priv *priv = netdev_priv(dev);

	u32 reg;
@@ -627,7 +629,9 @@ static int bcm_sysport_get_coalesce(struct net_device *dev, 
}



static int bcm_sysport_set_coalesce(struct net_device *dev,

				    struct ethtool_coalesce *ec)

				    struct ethtool_coalesce *ec,

				    struct kernel_ethtool_coalesce *kernel_coal,

				    struct netlink_ext_ack *extack)

{

	struct bcm_sysport_priv *priv = netdev_priv(dev);

	struct dim_cq_moder moder;