> -----Original Message----- > From: Michal Kubecek <mkube...@suse.cz> > Sent: Monday, August 24, 2020 2:45 PM > To: Nguyen, Anthony L <anthony.l.ngu...@intel.com> > Cc: da...@davemloft.net; Michael, Alice <alice.mich...@intel.com>; > netdev@vger.kernel.org; nhor...@redhat.com; sassm...@redhat.com; > Kirsher, Jeffrey T <jeffrey.t.kirs...@intel.com>; Brady, Alan > <alan.br...@intel.com>; Burra, Phani R <phani.r.bu...@intel.com>; Hay, > Joshua A <joshua.a....@intel.com>; Chittim, Madhu > <madhu.chit...@intel.com>; Linga, Pavan Kumar > <pavan.kumar.li...@intel.com>; Skidmore, Donald C > <donald.c.skidm...@intel.com>; Brandeburg, Jesse > <jesse.brandeb...@intel.com>; Samudrala, Sridhar > <sridhar.samudr...@intel.com> > 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 <alice.mich...@intel.com> > > > > Implement ethtool interface for the common module. > > > > Signed-off-by: Alice Michael <alice.mich...@intel.com> > > Signed-off-by: Alan Brady <alan.br...@intel.com> > > Signed-off-by: Phani Burra <phani.r.bu...@intel.com> > > Signed-off-by: Joshua Hay <joshua.a....@intel.com> > > Signed-off-by: Madhu Chittim <madhu.chit...@intel.com> > > Signed-off-by: Pavan Kumar Linga <pavan.kumar.li...@intel.com> > > Reviewed-by: Donald Skidmore <donald.c.skidm...@intel.com> > > Reviewed-by: Jesse Brandeburg <jesse.brandeb...@intel.com> > > Reviewed-by: Sridhar Samudrala <sridhar.samudr...@intel.com> > > Signed-off-by: Jeff Kirsher <jeffrey.t.kirs...@intel.com> > > Signed-off-by: Tony Nguyen <anthony.l.ngu...@intel.com> > > --- > [...] > > +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