Skip to content

Commit

Permalink
bna: Ethtool Enhancements and Fix
Browse files Browse the repository at this point in the history 
Change details:
 - Add tx_skb counters and NAPI debug counters to ethtool stats.
 - Add rlb stats strings to bnad_net_stats_strings{} array. rlb_stats field
   was added to struct bfi_enet_stats {} but the corresponding name structure
   array for ethtool was not initialized with right strings, even though the
   actual name structure array got expanded. This caused a NULL pointer
   violation and a crash when doing ehtool -S <if_name>.
 - Modify dim timer stop logic to make it dependent on cfg and run flags
 - While setting the ring parameter restore the rx, vlan configuration and
   set rx mode
 - Indentation fix

Signed-off-by: Gurunatha Karaje <gkaraje@brocade.com>
Signed-off-by: Rasesh Mody <rmody@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Rasesh Mody authored and David S. Miller committed Sep 15, 2011
1 parent 3caa1e9 commit a2122d9
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 19 deletions.
8 changes: 4 additions & 4 deletions drivers/net/ethernet/brocade/bna/bnad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2027,7 +2027,7 @@ bnad_rx_coalescing_timeo_set(struct bnad *bnad)
/*
* Called with bnad->bna_lock held
*/
static int
int
bnad_mac_addr_set_locked(struct bnad *bnad, u8 *mac_addr)
{
int ret;
Expand All @@ -2047,7 +2047,7 @@ bnad_mac_addr_set_locked(struct bnad *bnad, u8 *mac_addr)
}

/* Should be called with conf_lock held */
static int
int
bnad_enable_default_bcast(struct bnad *bnad)
{
struct bnad_rx_info *rx_info = &bnad->rx_info[0];
Expand All @@ -2073,7 +2073,7 @@ bnad_enable_default_bcast(struct bnad *bnad)
}

/* Called with mutex_lock(&bnad->conf_mutex) held */
static void
void
bnad_restore_vlans(struct bnad *bnad, u32 rx_id)
{
u16 vid;
Expand Down Expand Up @@ -2826,7 +2826,7 @@ bnad_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats)
return stats;
}

static void
void
bnad_set_rx_mode(struct net_device *netdev)
{
struct bnad *bnad = netdev_priv(netdev);
Expand Down
10 changes: 6 additions & 4 deletions drivers/net/ethernet/brocade/bna/bnad.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,12 @@ extern u32 bnad_rxqs_per_cq;
*/
extern u32 *cna_get_firmware_buf(struct pci_dev *pdev);
/* Netdev entry point prototypes */
extern void bnad_set_rx_mode(struct net_device *netdev);
extern struct net_device_stats *bnad_get_netdev_stats(
struct net_device *netdev);
extern int bnad_mac_addr_set_locked(struct bnad *bnad, u8 *mac_addr);
extern int bnad_enable_default_bcast(struct bnad *bnad);
extern void bnad_restore_vlans(struct bnad *bnad, u32 rx_id);
extern void bnad_set_ethtool_ops(struct net_device *netdev);

/* Configuration & setup */
Expand Down Expand Up @@ -366,8 +372,4 @@ extern void bnad_netdev_hwstats_fill(struct bnad *bnad,
} \
}

#define bnad_dim_timer_running(_bnad) \
(((_bnad)->cfg_flags & BNAD_CF_DIM_ENABLED) && \
(test_bit(BNAD_RF_DIM_TIMER_RUNNING, &((_bnad)->run_flags))))

#endif /* __BNAD_H__ */
93 changes: 82 additions & 11 deletions drivers/net/ethernet/brocade/bna/bnad_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,25 @@ static char *bnad_net_stats_strings[BNAD_ETHTOOL_STATS_NUM] = {
"tcpcsum_offload",
"udpcsum_offload",
"csum_help",
"csum_help_err",
"tx_skb_too_short",
"tx_skb_stopping",
"tx_skb_max_vectors",
"tx_skb_mss_too_long",
"tx_skb_tso_too_short",
"tx_skb_tso_prepare",
"tx_skb_non_tso_too_long",
"tx_skb_tcp_hdr",
"tx_skb_udp_hdr",
"tx_skb_csum_err",
"tx_skb_headlen_too_long",
"tx_skb_headlen_zero",
"tx_skb_frag_zero",
"tx_skb_len_mismatch",
"hw_stats_updates",
"netif_rx_schedule",
"netif_rx_complete",
"netif_rx_dropped",

"link_toggle",
"cee_up",
"cee_toggle",

"rxp_info_alloc_failed",
"mbox_intr_disabled",
Expand Down Expand Up @@ -201,6 +212,20 @@ static char *bnad_net_stats_strings[BNAD_ETHTOOL_STATS_NUM] = {
"rad_rx_bcast_vlan",
"rad_rx_drops",

"rlb_rad_rx_frames",
"rlb_rad_rx_octets",
"rlb_rad_rx_vlan_frames",
"rlb_rad_rx_ucast",
"rlb_rad_rx_ucast_octets",
"rlb_rad_rx_ucast_vlan",
"rlb_rad_rx_mcast",
"rlb_rad_rx_mcast_octets",
"rlb_rad_rx_mcast_vlan",
"rlb_rad_rx_bcast",
"rlb_rad_rx_bcast_octets",
"rlb_rad_rx_bcast_vlan",
"rlb_rad_rx_drops",

"fc_rx_ucast_octets",
"fc_rx_ucast",
"fc_rx_ucast_vlan",
Expand Down Expand Up @@ -321,7 +346,7 @@ bnad_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)
{
struct bnad *bnad = netdev_priv(netdev);
unsigned long flags;
int dim_timer_del = 0;
int to_del = 0;

if (coalesce->rx_coalesce_usecs == 0 ||
coalesce->rx_coalesce_usecs >
Expand All @@ -348,14 +373,17 @@ bnad_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)
} else {
if (bnad->cfg_flags & BNAD_CF_DIM_ENABLED) {
bnad->cfg_flags &= ~BNAD_CF_DIM_ENABLED;
dim_timer_del = bnad_dim_timer_running(bnad);
if (dim_timer_del) {
if (bnad->cfg_flags & BNAD_CF_DIM_ENABLED &&
test_bit(BNAD_RF_DIM_TIMER_RUNNING,
&bnad->run_flags)) {
clear_bit(BNAD_RF_DIM_TIMER_RUNNING,
&bnad->run_flags);
spin_unlock_irqrestore(&bnad->bna_lock, flags);
del_timer_sync(&bnad->dim_timer);
spin_lock_irqsave(&bnad->bna_lock, flags);
to_del = 1;
}
spin_unlock_irqrestore(&bnad->bna_lock, flags);
if (to_del)
del_timer_sync(&bnad->dim_timer);
spin_lock_irqsave(&bnad->bna_lock, flags);
bnad_rx_coalescing_timeo_set(bnad);
}
}
Expand Down Expand Up @@ -407,6 +435,7 @@ bnad_set_ringparam(struct net_device *netdev,
{
int i, current_err, err = 0;
struct bnad *bnad = netdev_priv(netdev);
unsigned long flags;

mutex_lock(&bnad->conf_mutex);
if (ringparam->rx_pending == bnad->rxq_depth &&
Expand All @@ -430,17 +459,38 @@ bnad_set_ringparam(struct net_device *netdev,

if (ringparam->rx_pending != bnad->rxq_depth) {
bnad->rxq_depth = ringparam->rx_pending;
if (!netif_running(netdev)) {
mutex_unlock(&bnad->conf_mutex);
return 0;
}

for (i = 0; i < bnad->num_rx; i++) {
if (!bnad->rx_info[i].rx)
continue;
bnad_cleanup_rx(bnad, i);
current_err = bnad_setup_rx(bnad, i);
if (current_err && !err)
err = current_err;
if (!err)
bnad_restore_vlans(bnad, i);
}

if (!err && bnad->rx_info[0].rx) {
/* restore rx configuration */
bnad_enable_default_bcast(bnad);
spin_lock_irqsave(&bnad->bna_lock, flags);
bnad_mac_addr_set_locked(bnad, netdev->dev_addr);
spin_unlock_irqrestore(&bnad->bna_lock, flags);
bnad_set_rx_mode(netdev);
}
}
if (ringparam->tx_pending != bnad->txq_depth) {
bnad->txq_depth = ringparam->tx_pending;
if (!netif_running(netdev)) {
mutex_unlock(&bnad->conf_mutex);
return 0;
}

for (i = 0; i < bnad->num_tx; i++) {
if (!bnad->tx_info[i].tx)
continue;
Expand Down Expand Up @@ -578,6 +628,16 @@ bnad_get_strings(struct net_device *netdev, u32 stringset, u8 * string)
sprintf(string, "cq%d_hw_producer_index",
q_num);
string += ETH_GSTRING_LEN;
sprintf(string, "cq%d_intr", q_num);
string += ETH_GSTRING_LEN;
sprintf(string, "cq%d_poll", q_num);
string += ETH_GSTRING_LEN;
sprintf(string, "cq%d_schedule", q_num);
string += ETH_GSTRING_LEN;
sprintf(string, "cq%d_keep_poll", q_num);
string += ETH_GSTRING_LEN;
sprintf(string, "cq%d_complete", q_num);
string += ETH_GSTRING_LEN;
q_num++;
}
}
Expand Down Expand Up @@ -660,7 +720,7 @@ static int
bnad_get_stats_count_locked(struct net_device *netdev)
{
struct bnad *bnad = netdev_priv(netdev);
int i, j, count, rxf_active_num = 0, txf_active_num = 0;
int i, j, count = 0, rxf_active_num = 0, txf_active_num = 0;
u32 bmap;

bmap = bna_tx_rid_mask(&bnad->bna);
Expand Down Expand Up @@ -718,6 +778,17 @@ bnad_per_q_stats_fill(struct bnad *bnad, u64 *buf, int bi)
buf[bi++] = 0; /* ccb->consumer_index */
buf[bi++] = *(bnad->rx_info[i].rx_ctrl[j].
ccb->hw_producer_index);

buf[bi++] = bnad->rx_info[i].
rx_ctrl[j].rx_intr_ctr;
buf[bi++] = bnad->rx_info[i].
rx_ctrl[j].rx_poll_ctr;
buf[bi++] = bnad->rx_info[i].
rx_ctrl[j].rx_schedule;
buf[bi++] = bnad->rx_info[i].
rx_ctrl[j].rx_keep_poll;
buf[bi++] = bnad->rx_info[i].
rx_ctrl[j].rx_complete;
}
}
for (i = 0; i < bnad->num_rx; i++) {
Expand Down

0 comments on commit a2122d9

Please sign in to comment.