> -----Original Message-----
> From: Michal Kubecek <[email protected]>
> Sent: Monday, August 24, 2020 2:45 PM
> To: Nguyen, Anthony L <[email protected]>
> Cc: [email protected]; Michael, Alice <[email protected]>;
> [email protected]; [email protected]; [email protected];
> Kirsher, Jeffrey T <[email protected]>; Brady, Alan
> <[email protected]>; Burra, Phani R <[email protected]>; Hay,
> Joshua A <[email protected]>; Chittim, Madhu
> <[email protected]>; Linga, Pavan Kumar
> <[email protected]>; Skidmore, Donald C
> <[email protected]>; Brandeburg, Jesse
> <[email protected]>; Samudrala, Sridhar
> <[email protected]>
> Subject: Re: [net-next v5 13/15] iecm: Add ethtool
>
> On Mon, Aug 24, 2020 at 10:33:04AM -0700, Tony Nguyen wrote:
> > From: Alice Michael <[email protected]>
> >
> > Implement ethtool interface for the common module.
> >
> > Signed-off-by: Alice Michael <[email protected]>
> > Signed-off-by: Alan Brady <[email protected]>
> > Signed-off-by: Phani Burra <[email protected]>
> > Signed-off-by: Joshua Hay <[email protected]>
> > Signed-off-by: Madhu Chittim <[email protected]>
> > Signed-off-by: Pavan Kumar Linga <[email protected]>
> > Reviewed-by: Donald Skidmore <[email protected]>
> > Reviewed-by: Jesse Brandeburg <[email protected]>
> > Reviewed-by: Sridhar Samudrala <[email protected]>
> > Signed-off-by: Jeff Kirsher <[email protected]>
> > Signed-off-by: Tony Nguyen <[email protected]>
> > ---
> [...]
> > +static void iecm_get_channels(struct net_device *netdev,
> > + struct ethtool_channels *ch) {
> > + struct iecm_vport *vport = iecm_netdev_to_vport(netdev);
> > + unsigned int combined;
> > +
> > + combined = min(vport->num_txq, vport->num_rxq);
> > +
> > + /* Report maximum channels */
> > + ch->max_combined = IECM_MAX_Q;
> > +
> > + ch->max_other = IECM_MAX_NONQ;
> > + ch->other_count = IECM_MAX_NONQ;
> > +
> > + ch->combined_count = combined;
> > + ch->rx_count = vport->num_rxq - combined;
> > + ch->tx_count = vport->num_txq - combined; }
>
> You don't set max_rx and max_tx so that they will be always reported as 0. If
> vport->num_rxq != vport->num_txq, one of rx_count, tx_count will be higher
> than corresponding maximum so that any "set channels"
> request not touching that value will fail the sanity check in
> ethnl_set_channels() or ethtool_set_channels().
Will fix.
> > +
> > +/**
> > + * iecm_set_channels: set the new channel count
> > + * @netdev: network interface device structure
> > + * @ch: channel information structure
> > + *
> > + * Negotiate a new number of channels with CP. Returns 0 on success,
> > +negative
> > + * on failure.
> > + */
> > +static int iecm_set_channels(struct net_device *netdev,
> > + struct ethtool_channels *ch)
> > +{
> > + struct iecm_vport *vport = iecm_netdev_to_vport(netdev);
> > + int num_req_q = ch->combined_count;
> > +
> > + if (num_req_q == max(vport->num_txq, vport->num_rxq))
> > + return 0;
> > +
> > + vport->adapter->config_data.num_req_qs = num_req_q;
> > +
> > + return iecm_initiate_soft_reset(vport, __IECM_SR_Q_CHANGE); }
>
> In iecm_get_channels() you set combined_count to minimum of num_rxq and
> num_txq but here you expect it to be the maximum. And you also completely
> ignore everything else than combined_count. Can this ever work correctly if
> num_rxq != num_txq?
>
We will refactor this to make more sense.
> > +static int iecm_set_ringparam(struct net_device *netdev,
> > + struct ethtool_ringparam *ring) {
> > + struct iecm_vport *vport = iecm_netdev_to_vport(netdev);
> > + u32 new_rx_count, new_tx_count;
> > +
> > + if (ring->rx_mini_pending || ring->rx_jumbo_pending)
> > + return -EINVAL;
>
> This will be caught by the generic sanity check in ethnl_set_rings() or
> ethtool_set_ringparam().
>
> Michal
>
Will fix, thanks
-Alan
