s390: qeth driver fixes [4/6]
Subsystems (4)
PATCH 7/9 s390: qeth driver fixes [4/6]
[PATCH 7/9] s390: qeth driver fixes [4/6]
From: Frank Pavlic <[email protected]>
- fix kernel crash due to race,
set card->state to SOFTSETUP after
card and card->dev are initialized properly.
- remove CONFIG_QETH_PERF_STATS, use sysfs attribute instead, as we want to have the ability to turn on/off the statistics at runtime.
Signed-off-by Frank Pavlic <[email protected]>
---
drivers/s390/net/Kconfig | 9 --- drivers/s390/net/qeth.h | 10 +-- drivers/s390/net/qeth_eddp.c | 5 + drivers/s390/net/qeth_main.c | 147 ++++++++++++++++++++---------------------- drivers/s390/net/qeth_proc.c | 23 +++---- drivers/s390/net/qeth_sys.c | 42 ++++++++++++ 6 files changed, 128 insertions(+), 108 deletions(-)
1068b773a870931ccec7009a320e37f7013b268f
drivers/s390/net/Kconfig +0 -9
@@ -92,15 +92,6 @@ config QETH_VLAN If CONFIG_QETH is switched on, this option will include IEEE 802.1q VLAN support in the qeth device driver. -config QETH_PERF_STATS - bool "Performance statistics in /proc" - depends on QETH - help - When switched on, this option will add a file in the proc-fs - (/proc/qeth_perf_stats) containing performance statistics. It - may slightly impact performance, so this is only recommended for - internal tuning of the device driver. - config CCWGROUP tristate default (LCS || CTC || QETH)
drivers/s390/net/qeth.h +4 -6
@@ -176,7 +176,6 @@ extern struct ccwgroup_driver qeth_ccwgr/** * card stuff */ -#ifdef CONFIG_QETH_PERF_STATSstruct qeth_perf_stats {unsigned int bufs_rec;unsigned int bufs_sent;
@@ -211,8 +210,10 @@ struct qeth_perf_stats {unsigned int large_send_cnt;unsigned int sg_skbs_sent;unsigned int sg_frags_sent; +/* initial values when measuring starts */ +unsigned long initial_rx_packets; +unsigned long initial_tx_packets; }; -#endif /* CONFIG_QETH_PERF_STATS */ /* Routing stuff */ struct qeth_routing_info {
@@ -767,6 +768,7 @@ struct qeth_card_options {int fake_ll;int layer2;enum qeth_large_send_types large_send; +int performance_stats; };/*
@@ -819,9 +821,7 @@ struct qeth_card {struct list_head cmd_waiter_list;/* QDIO buffer handling */ struct qeth_qdio_info qdio; -#ifdef CONFIG_QETH_PERF_STATS struct qeth_perf_stats perf_stats; -#endif /* CONFIG_QETH_PERF_STATS */ int use_hard_stop;int (*orig_hard_header)(struct sk_buff *,struct net_device *,unsigned short ,void *,void *,unsigned );
@@ -1049,13 +1049,11 @@ qeth_get_arphdr_type(int cardtype, int l } } -#ifdef CONFIG_QETH_PERF_STATS static inline int qeth_get_micros (void ) {return (int ) (get_clock () >>12 ); } -#endif static inline int qeth_get_qdio_q_format (struct qeth_card *card)
drivers/s390/net/qeth_eddp.c +2 -3
@@ -179,9 +179,8 @@ out_check: flush_cnt++; } }else { -#ifdef CONFIG_QETH_PERF_STATS - queue->card->perf_stats.skbs_sent_pack++; -#endif +if (queue->card->options.performance_stats) + queue->card->perf_stats.skbs_sent_pack++;QETH_DBF_TEXT (trace,6 ,"fillbfpa" );if (buf->next_element_to_fill >=QETH_MAX_BUFFER_ELEMENTS (queue->card)) {
drivers/s390/net/qeth_main.c +69 -78
293 lines not on this page · raw message
drivers/s390/net/qeth_proc.c +11 -12
@@ -173,7 +173,6 @@ static struct file_operations qeth_procf#define QETH_PERF_PROCFILE_NAME "qeth_perf"static struct proc_dir_entry *qeth_perf_procfile; -#ifdef CONFIG_QETH_PERF_STATS static int qeth_perf_procfile_seq_show (struct seq_file *s,void *it) {
@@ -192,14 +191,21 @@ qeth_perf_procfile_seq_show(struct seq_fCARD_DDEV_ID (card),QETH_CARD_IFNAME (card) ); +if (!card->options.performance_stats) +seq_printf (s,"Performance statistics are deactivated.\n" );seq_printf (s," Skb's/buffers received : %lu/%u\n" " Skb's/buffers sent : %lu/%u\n\n" , - card->stats.rx_packets, card->perf_stats.bufs_rec, - card->stats.tx_packets, card->perf_stats.bufs_sent + card->stats.rx_packets - + card->perf_stats.initial_rx_packets, + card->perf_stats.bufs_rec, + card->stats.tx_packets - + card->perf_stats.initial_tx_packets, + card->perf_stats.bufs_sent );seq_printf (s," Skb's/buffers sent without packing : %lu/%u\n" " Skb's/buffers sent with packing : %u/%u\n\n" , - card->stats.tx_packets - card->perf_stats.skbs_sent_pack, + card->stats.tx_packets - card->perf_stats.initial_tx_packets + - card->perf_stats.skbs_sent_pack, card->perf_stats.bufs_sent - card->perf_stats.bufs_sent_pack, card->perf_stats.skbs_sent_pack, card->perf_stats.bufs_sent_pack
@@ -275,11 +281,6 @@ static struct file_operations qeth_perf_ .release = seq_release, }; -#define qeth_perf_procfile_created qeth_perf_procfile -#else -#define qeth_perf_procfile_created 1 -#endif /* CONFIG_QETH_PERF_STATS */ -int __init qeth_create_procfs_entries (void ) {
@@ -288,15 +289,13 @@ qeth_create_procfs_entries(void)if (qeth_procfile) qeth_procfile->proc_fops = &qeth_procfile_fops; -#ifdef CONFIG_QETH_PERF_STATS qeth_perf_procfile =create_proc_entry (QETH_PERF_PROCFILE_NAME ,S_IFREG |0444 ,NULL );if (qeth_perf_procfile) qeth_perf_procfile->proc_fops = &qeth_perf_procfile_fops; -#endif /* CONFIG_QETH_PERF_STATS */ if (qeth_procfile && - qeth_perf_procfile_created) + qeth_perf_procfile)return 0 ;else return -ENOMEM ;
drivers/s390/net/qeth_sys.c +42 -0
54 lines not on this page · raw message
Signature · 1 line
1.2.4