Message ID | 20190722214023.9513-19-snelson@pensando.io |
---|---|
State | Changes Requested |
Delegated to: | David Miller |
Headers | show |
Series | Add ionic driver | expand |
From: Shannon Nelson <snelson@pensando.io> Date: Mon, 22 Jul 2019 14:40:22 -0700 > diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c > index 742d7d47f4d8..e6b579a40b70 100644 > --- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c > +++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c > @@ -377,6 +377,75 @@ static int ionic_get_coalesce(struct net_device *netdev, > return 0; > } > > +static int ionic_set_coalesce(struct net_device *netdev, > + struct ethtool_coalesce *coalesce) > +{ > + struct lif *lif = netdev_priv(netdev); > + struct identity *ident = &lif->ionic->ident; > + struct ionic_dev *idev = &lif->ionic->idev; > + u32 tx_coal, rx_coal; > + struct qcq *qcq; > + unsigned int i; Reverse christmas tree please.
On Mon, 2019-07-22 at 14:40 -0700, Shannon Nelson wrote: > Interrupt coalescing, tunable copybreak value, and > tx timeout. > > Signed-off-by: Shannon Nelson <snelson@pensando.io> > --- > drivers/net/ethernet/pensando/ionic/ionic.h | 2 +- > .../ethernet/pensando/ionic/ionic_ethtool.c | 105 > ++++++++++++++++++ > .../net/ethernet/pensando/ionic/ionic_lif.c | 13 ++- > .../net/ethernet/pensando/ionic/ionic_lif.h | 1 + > 4 files changed, 119 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h > b/drivers/net/ethernet/pensando/ionic/ionic.h > index 9b720187b549..cd08166f73a9 100644 > --- a/drivers/net/ethernet/pensando/ionic/ionic.h > +++ b/drivers/net/ethernet/pensando/ionic/ionic.h > @@ -11,7 +11,7 @@ struct lif; > > #define DRV_NAME "ionic" > #define DRV_DESCRIPTION "Pensando Ethernet NIC Driver" > -#define DRV_VERSION "0.11.0-k" > +#define DRV_VERSION "0.11.0-44-k" > > #define PCI_VENDOR_ID_PENSANDO 0x1dd8 > > diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c > b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c > index 742d7d47f4d8..e6b579a40b70 100644 > --- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c > +++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c > @@ -377,6 +377,75 @@ static int ionic_get_coalesce(struct net_device > *netdev, > return 0; > } > > +static int ionic_set_coalesce(struct net_device *netdev, > + struct ethtool_coalesce *coalesce) > +{ > + struct lif *lif = netdev_priv(netdev); > + struct identity *ident = &lif->ionic->ident; > + struct ionic_dev *idev = &lif->ionic->idev; > + u32 tx_coal, rx_coal; > + struct qcq *qcq; > + unsigned int i; > + > + if (coalesce->rx_max_coalesced_frames || > + coalesce->rx_coalesce_usecs_irq || > + coalesce->rx_max_coalesced_frames_irq || > + coalesce->tx_max_coalesced_frames || > + coalesce->tx_coalesce_usecs_irq || > + coalesce->tx_max_coalesced_frames_irq || > + coalesce->stats_block_coalesce_usecs || > + coalesce->use_adaptive_rx_coalesce || > + coalesce->use_adaptive_tx_coalesce || > + coalesce->pkt_rate_low || > + coalesce->rx_coalesce_usecs_low || > + coalesce->rx_max_coalesced_frames_low || > + coalesce->tx_coalesce_usecs_low || > + coalesce->tx_max_coalesced_frames_low || > + coalesce->pkt_rate_high || > + coalesce->rx_coalesce_usecs_high || > + coalesce->rx_max_coalesced_frames_high || > + coalesce->tx_coalesce_usecs_high || > + coalesce->tx_max_coalesced_frames_high || > + coalesce->rate_sample_interval) > + return -EINVAL; > + > + if (ident->dev.intr_coal_div == 0) > + return -EIO; > + > + /* Convert from usecs to device units */ > + tx_coal = coalesce->tx_coalesce_usecs * > + le32_to_cpu(ident->dev.intr_coal_mult) / > + le32_to_cpu(ident->dev.intr_coal_div); > + rx_coal = coalesce->rx_coalesce_usecs * > + le32_to_cpu(ident->dev.intr_coal_mult) / > + le32_to_cpu(ident->dev.intr_coal_div); > + > + if (tx_coal > INTR_CTRL_COAL_MAX || rx_coal > > INTR_CTRL_COAL_MAX) > + return -ERANGE; > + > + if (coalesce->tx_coalesce_usecs != lif->tx_coalesce_usecs) { > + for (i = 0; i < lif->nxqs; i++) { > + qcq = lif->txqcqs[i].qcq; > + ionic_intr_coal_init(idev->intr_ctrl, > + qcq->intr.index, > + tx_coal); > + } > + lif->tx_coalesce_usecs = coalesce->tx_coalesce_usecs; > + } > + > + if (coalesce->rx_coalesce_usecs != lif->rx_coalesce_usecs) { > + for (i = 0; i < lif->nxqs; i++) { > + qcq = lif->rxqcqs[i].qcq; > + ionic_intr_coal_init(idev->intr_ctrl, > + qcq->intr.index, > + rx_coal); > + } > + lif->rx_coalesce_usecs = coalesce->rx_coalesce_usecs; > + } > + > + return 0; > +} > + > static void ionic_get_ringparam(struct net_device *netdev, > struct ethtool_ringparam *ring) > { > @@ -562,6 +631,39 @@ static int ionic_set_priv_flags(struct > net_device *netdev, u32 priv_flags) > return 0; > } > > +static int ionic_set_tunable(struct net_device *dev, > + const struct ethtool_tunable *tuna, > + const void *data) > +{ > + struct lif *lif = netdev_priv(dev); > + > + switch (tuna->id) { > + case ETHTOOL_RX_COPYBREAK: > + lif->rx_copybreak = *(u32 *)data; > + break; > + default: > + return -EOPNOTSUPP; > + } > + > + return 0; > +} > + > +static int ionic_get_tunable(struct net_device *netdev, > + const struct ethtool_tunable *tuna, void > *data) > +{ > + struct lif *lif = netdev_priv(netdev); > + > + switch (tuna->id) { > + case ETHTOOL_RX_COPYBREAK: > + *(u32 *)data = lif->rx_copybreak; > + break; > + default: > + return -EOPNOTSUPP; > + } > + > + return 0; > +} > + > static int ionic_get_module_info(struct net_device *netdev, > struct ethtool_modinfo *modinfo) > > @@ -641,6 +743,7 @@ static const struct ethtool_ops ionic_ethtool_ops > = { > .get_link = ethtool_op_get_link, > .get_link_ksettings = ionic_get_link_ksettings, > .get_coalesce = ionic_get_coalesce, > + .set_coalesce = ionic_set_coalesce, > .get_ringparam = ionic_get_ringparam, > .set_ringparam = ionic_set_ringparam, > .get_channels = ionic_get_channels, > @@ -655,6 +758,8 @@ static const struct ethtool_ops ionic_ethtool_ops > = { > .set_rxfh = ionic_set_rxfh, > .get_priv_flags = ionic_get_priv_flags, > .set_priv_flags = ionic_set_priv_flags, > + .get_tunable = ionic_get_tunable, > + .set_tunable = ionic_set_tunable, > .get_module_info = ionic_get_module_info, > .get_module_eeprom = ionic_get_module_eeprom, > .get_pauseparam = ionic_get_pauseparam, > diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c > b/drivers/net/ethernet/pensando/ionic/ionic_lif.c > index 68a9975e34c6..8473b065763b 100644 > --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c > +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c > @@ -744,9 +744,19 @@ static int ionic_change_mtu(struct net_device > *netdev, int new_mtu) > return err; > } > > +static void ionic_tx_timeout_work(struct work_struct *ws) > +{ > + struct lif *lif = container_of(ws, struct lif, > tx_timeout_work); > + > + netdev_info(lif->netdev, "Tx Timeout recovery\n"); > + ionic_reset_queues(lif); missing rtnl_lock ? > +} > + > static void ionic_tx_timeout(struct net_device *netdev) > { > - netdev_info(netdev, "%s: stubbed\n", __func__); > + struct lif *lif = netdev_priv(netdev); > + > + schedule_work(&lif->tx_timeout_work); > } missing cancel work ? be careful when combined with the rtnl_lockthough .. > > static int ionic_vlan_rx_add_vid(struct net_device *netdev, __be16 > proto, > @@ -2009,6 +2019,7 @@ static int ionic_lif_init(struct lif *lif) > > ionic_link_status_check(lif); > > + INIT_WORK(&lif->tx_timeout_work, ionic_tx_timeout_work); > return 0; > > err_out_notifyq_deinit: > diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.h > b/drivers/net/ethernet/pensando/ionic/ionic_lif.h > index 0e6908f959f2..76cc519acd5a 100644 > --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.h > +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.h > @@ -180,6 +180,7 @@ struct lif { > unsigned int dbid_count; > struct dentry *dentry; > u32 flags; > + struct work_struct tx_timeout_work; > }; > > #define lif_to_txqcq(lif, i) ((lif)->txqcqs[i].qcq)
On 7/25/19 5:13 PM, Saeed Mahameed wrote: > On Mon, 2019-07-22 at 14:40 -0700, Shannon Nelson wrote: >> +static void ionic_tx_timeout_work(struct work_struct *ws) >> +{ >> + struct lif *lif = container_of(ws, struct lif, >> tx_timeout_work); >> + >> + netdev_info(lif->netdev, "Tx Timeout recovery\n"); >> + ionic_reset_queues(lif); > missing rtnl_lock ? > >> +} >> + >> static void ionic_tx_timeout(struct net_device *netdev) >> { >> - netdev_info(netdev, "%s: stubbed\n", __func__); >> + struct lif *lif = netdev_priv(netdev); >> + >> + schedule_work(&lif->tx_timeout_work); >> } > missing cancel work ? be careful when combined with the rtnl_lockthough .. > > Yep, good catch on both. I'll take care of those. sln
diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h index 9b720187b549..cd08166f73a9 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic.h +++ b/drivers/net/ethernet/pensando/ionic/ionic.h @@ -11,7 +11,7 @@ struct lif; #define DRV_NAME "ionic" #define DRV_DESCRIPTION "Pensando Ethernet NIC Driver" -#define DRV_VERSION "0.11.0-k" +#define DRV_VERSION "0.11.0-44-k" #define PCI_VENDOR_ID_PENSANDO 0x1dd8 diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c index 742d7d47f4d8..e6b579a40b70 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c @@ -377,6 +377,75 @@ static int ionic_get_coalesce(struct net_device *netdev, return 0; } +static int ionic_set_coalesce(struct net_device *netdev, + struct ethtool_coalesce *coalesce) +{ + struct lif *lif = netdev_priv(netdev); + struct identity *ident = &lif->ionic->ident; + struct ionic_dev *idev = &lif->ionic->idev; + u32 tx_coal, rx_coal; + struct qcq *qcq; + unsigned int i; + + if (coalesce->rx_max_coalesced_frames || + coalesce->rx_coalesce_usecs_irq || + coalesce->rx_max_coalesced_frames_irq || + coalesce->tx_max_coalesced_frames || + coalesce->tx_coalesce_usecs_irq || + coalesce->tx_max_coalesced_frames_irq || + coalesce->stats_block_coalesce_usecs || + coalesce->use_adaptive_rx_coalesce || + coalesce->use_adaptive_tx_coalesce || + coalesce->pkt_rate_low || + coalesce->rx_coalesce_usecs_low || + coalesce->rx_max_coalesced_frames_low || + coalesce->tx_coalesce_usecs_low || + coalesce->tx_max_coalesced_frames_low || + coalesce->pkt_rate_high || + coalesce->rx_coalesce_usecs_high || + coalesce->rx_max_coalesced_frames_high || + coalesce->tx_coalesce_usecs_high || + coalesce->tx_max_coalesced_frames_high || + coalesce->rate_sample_interval) + return -EINVAL; + + if (ident->dev.intr_coal_div == 0) + return -EIO; + + /* Convert from usecs to device units */ + tx_coal = coalesce->tx_coalesce_usecs * + le32_to_cpu(ident->dev.intr_coal_mult) / + le32_to_cpu(ident->dev.intr_coal_div); + rx_coal = coalesce->rx_coalesce_usecs * + le32_to_cpu(ident->dev.intr_coal_mult) / + le32_to_cpu(ident->dev.intr_coal_div); + + if (tx_coal > INTR_CTRL_COAL_MAX || rx_coal > INTR_CTRL_COAL_MAX) + return -ERANGE; + + if (coalesce->tx_coalesce_usecs != lif->tx_coalesce_usecs) { + for (i = 0; i < lif->nxqs; i++) { + qcq = lif->txqcqs[i].qcq; + ionic_intr_coal_init(idev->intr_ctrl, + qcq->intr.index, + tx_coal); + } + lif->tx_coalesce_usecs = coalesce->tx_coalesce_usecs; + } + + if (coalesce->rx_coalesce_usecs != lif->rx_coalesce_usecs) { + for (i = 0; i < lif->nxqs; i++) { + qcq = lif->rxqcqs[i].qcq; + ionic_intr_coal_init(idev->intr_ctrl, + qcq->intr.index, + rx_coal); + } + lif->rx_coalesce_usecs = coalesce->rx_coalesce_usecs; + } + + return 0; +} + static void ionic_get_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring) { @@ -562,6 +631,39 @@ static int ionic_set_priv_flags(struct net_device *netdev, u32 priv_flags) return 0; } +static int ionic_set_tunable(struct net_device *dev, + const struct ethtool_tunable *tuna, + const void *data) +{ + struct lif *lif = netdev_priv(dev); + + switch (tuna->id) { + case ETHTOOL_RX_COPYBREAK: + lif->rx_copybreak = *(u32 *)data; + break; + default: + return -EOPNOTSUPP; + } + + return 0; +} + +static int ionic_get_tunable(struct net_device *netdev, + const struct ethtool_tunable *tuna, void *data) +{ + struct lif *lif = netdev_priv(netdev); + + switch (tuna->id) { + case ETHTOOL_RX_COPYBREAK: + *(u32 *)data = lif->rx_copybreak; + break; + default: + return -EOPNOTSUPP; + } + + return 0; +} + static int ionic_get_module_info(struct net_device *netdev, struct ethtool_modinfo *modinfo) @@ -641,6 +743,7 @@ static const struct ethtool_ops ionic_ethtool_ops = { .get_link = ethtool_op_get_link, .get_link_ksettings = ionic_get_link_ksettings, .get_coalesce = ionic_get_coalesce, + .set_coalesce = ionic_set_coalesce, .get_ringparam = ionic_get_ringparam, .set_ringparam = ionic_set_ringparam, .get_channels = ionic_get_channels, @@ -655,6 +758,8 @@ static const struct ethtool_ops ionic_ethtool_ops = { .set_rxfh = ionic_set_rxfh, .get_priv_flags = ionic_get_priv_flags, .set_priv_flags = ionic_set_priv_flags, + .get_tunable = ionic_get_tunable, + .set_tunable = ionic_set_tunable, .get_module_info = ionic_get_module_info, .get_module_eeprom = ionic_get_module_eeprom, .get_pauseparam = ionic_get_pauseparam, diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index 68a9975e34c6..8473b065763b 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -744,9 +744,19 @@ static int ionic_change_mtu(struct net_device *netdev, int new_mtu) return err; } +static void ionic_tx_timeout_work(struct work_struct *ws) +{ + struct lif *lif = container_of(ws, struct lif, tx_timeout_work); + + netdev_info(lif->netdev, "Tx Timeout recovery\n"); + ionic_reset_queues(lif); +} + static void ionic_tx_timeout(struct net_device *netdev) { - netdev_info(netdev, "%s: stubbed\n", __func__); + struct lif *lif = netdev_priv(netdev); + + schedule_work(&lif->tx_timeout_work); } static int ionic_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, @@ -2009,6 +2019,7 @@ static int ionic_lif_init(struct lif *lif) ionic_link_status_check(lif); + INIT_WORK(&lif->tx_timeout_work, ionic_tx_timeout_work); return 0; err_out_notifyq_deinit: diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.h b/drivers/net/ethernet/pensando/ionic/ionic_lif.h index 0e6908f959f2..76cc519acd5a 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.h +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.h @@ -180,6 +180,7 @@ struct lif { unsigned int dbid_count; struct dentry *dentry; u32 flags; + struct work_struct tx_timeout_work; }; #define lif_to_txqcq(lif, i) ((lif)->txqcqs[i].qcq)
Interrupt coalescing, tunable copybreak value, and tx timeout. Signed-off-by: Shannon Nelson <snelson@pensando.io> --- drivers/net/ethernet/pensando/ionic/ionic.h | 2 +- .../ethernet/pensando/ionic/ionic_ethtool.c | 105 ++++++++++++++++++ .../net/ethernet/pensando/ionic/ionic_lif.c | 13 ++- .../net/ethernet/pensando/ionic/ionic_lif.h | 1 + 4 files changed, 119 insertions(+), 2 deletions(-)