s390/qeth: updates 2019-02-15
Subsystems (4)
cover s390/qeth: updates 2019-02-15
Hi Dave,
please apply a few more qeth patches to net-next. Along with some smaller improvements, this revamps our code for the SW statistics that are exposed through ETHTOOL_GSTATS.
Thanks,
Julian
Julian Wiedmann (7):
s390/qeth: allow manual recovery when device is SOFTSETUP s390/qeth: use a static Output Queue array s390/qeth: reduce ethtool statistics
s390/qeth: move ethtool code into its own file s390/qeth: overhaul ethtool statistics s390/qeth: add support for ETHTOOL_GRINGPARAM s390/qeth: split out OSN netdev ops
drivers/s390/net/Makefile | 2 +- drivers/s390/net/qeth_core.h | 133 ++++------ drivers/s390/net/qeth_core_main.c | 545 ++++++-------------------------------- drivers/s390/net/qeth_core_mpc.h | 1 + drivers/s390/net/qeth_core_sys.c | 41 +-- drivers/s390/net/qeth_ethtool.c | 370 ++++++++++++++++++++++++++ drivers/s390/net/qeth_l2_main.c | 85 +++--- drivers/s390/net/qeth_l3_main.c | 54 ++-- 8 files changed, 582 insertions(+), 649 deletions(-) create mode 100644 drivers/s390/net/qeth_ethtool.c
Signature · 1 line
2.16.4
PATCH 1/7 s390/qeth: allow manual recovery when device is SOFTSETUP
Once a qeth ccwgroup device is set online, it's also armed for internal recovery. So allow for testing that code path via sysfs, regardless of whether the interface is up or down.
--- drivers/s390/net/qeth_core_sys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/net/qeth_core_sys.c +1 -1
@@ -316,7 +316,7 @@ static ssize_t qeth_dev_recover_store(struct device *dev,if (!card)return -EINVAL ; -if (card->state !=CARD_STATE_UP ) +if (!qeth_card_hw_is_reachable (card))return -EPERM ; i =simple_strtoul (buf, &tmp,16 );
Signature · 1 line
2.16.4
PATCH 2/7 s390/qeth: use a static Output Queue array
In reply to Julian Wiedmannqeth dynamically allocates an array for storing pointers to its Output Queue structures. Switch this to a static array - we are currently limited to 4 Output Queues, so shrinking the qeth_qdio_info struct by just a few bytes doesn't justify the additional complexity.
--- drivers/s390/net/qeth_core.h | 2 +- drivers/s390/net/qeth_core_main.c | 21 ++++++--------------- 2 files changed, 7 insertions(+), 16 deletions(-)
drivers/s390/net/qeth_core.h +1 -1
@@ -528,7 +528,7 @@ struct qeth_qdio_info {/* output */ int no_out_queues; -struct qeth_qdio_out_q **out_qs; +struct qeth_qdio_out_q *out_qs[QETH_MAX_QUEUES ];struct qdio_outbuf_state *out_bufstates;/* priority queueing */
drivers/s390/net/qeth_core_main.c +6 -15
@@ -2433,12 +2433,6 @@ static int qeth_alloc_qdio_buffers(struct qeth_card *card) goto out_freeinq;/* outbound */ - card->qdio.out_qs = -kcalloc (card->qdio.no_out_queues, -sizeof (struct qeth_qdio_out_q *), -GFP_KERNEL ); -if (!card->qdio.out_qs) - goto out_freepool;for (i =0 ; i < card->qdio.no_out_queues; ++i) { card->qdio.out_qs[i] =qeth_alloc_qdio_out_buf ();if (!card->qdio.out_qs[i])
@@ -2468,11 +2462,10 @@ static int qeth_alloc_qdio_buffers(struct qeth_card *card) card->qdio.out_qs[i]->bufs[j] =NULL ; } out_freeoutq: -while (i >0 ) +while (i >0 ) {qeth_free_output_queue (card->qdio.out_qs[--i]); -kfree (card->qdio.out_qs); - card->qdio.out_qs =NULL ; -out_freepool: + card->qdio.out_qs[i] =NULL ; + }qeth_free_buffer_pool (card); out_freeinq:qeth_free_qdio_queue (card->qdio.in_q);
@@ -2501,11 +2494,9 @@ static void qeth_free_qdio_buffers(struct qeth_card *card)/* inbound buffer pool */ qeth_free_buffer_pool (card);/* free outbound qdio_qs */ -if (card->qdio.out_qs) { -for (i =0 ; i < card->qdio.no_out_queues; i++) -qeth_free_output_queue (card->qdio.out_qs[i]); -kfree (card->qdio.out_qs); - card->qdio.out_qs =NULL ; +for (i =0 ; i < card->qdio.no_out_queues; i++) { +qeth_free_output_queue (card->qdio.out_qs[i]); + card->qdio.out_qs[i] =NULL ; } }
Signature · 1 line
2.16.4
PATCH 3/7 s390/qeth: reduce ethtool statistics
In reply to Julian WiedmannCounting the number of function calls and the time spent in functions is best left to proper tracing facilities.
--- drivers/s390/net/qeth_core.h | 29 ------------- drivers/s390/net/qeth_core_main.c | 85 ++++----------------------------------- drivers/s390/net/qeth_l2_main.c | 8 ---- drivers/s390/net/qeth_l3_main.c | 8 ---- 4 files changed, 7 insertions(+), 123 deletions(-)
drivers/s390/net/qeth_core.h +0 -29
@@ -126,30 +126,6 @@ struct qeth_perf_stats {unsigned int sc_dp_p;unsigned int sc_p_dp; -/* qdio_cq_handler: number of times called, time spent in */ -__u64 cq_start_time; -unsigned int cq_cnt; -unsigned int cq_time; -/* qdio_input_handler: number of times called, time spent in */ -__u64 inbound_start_time; -unsigned int inbound_cnt; -unsigned int inbound_time; -/* qeth_send_packet: number of times called, time spent in */ -__u64 outbound_start_time; -unsigned int outbound_cnt; -unsigned int outbound_time; -/* qdio_output_handler: number of times called, time spent in */ -__u64 outbound_handler_start_time; -unsigned int outbound_handler_cnt; -unsigned int outbound_handler_time; -/* number of calls to and time spent in do_QDIO for inbound queue */ -__u64 inbound_do_qdio_start_time; -unsigned int inbound_do_qdio_cnt; -unsigned int inbound_do_qdio_time; -/* number of calls to and time spent in do_QDIO for outbound queues */ -__u64 outbound_do_qdio_start_time; -unsigned int outbound_do_qdio_cnt; -unsigned int outbound_do_qdio_time;unsigned int large_send_bytes;unsigned int large_send_cnt;unsigned int sg_skbs_sent;
@@ -859,11 +835,6 @@ static inline int qeth_get_elements_for_range(addr_t start, addr_t end)return PFN_UP (end) -PFN_DOWN (start); } -static inline int qeth_get_micros (void ) -{ -return (int ) (get_tod_clock () >>12 ); -} -static inline int qeth_get_ip_version (struct sk_buff *skb) {struct vlan_ethhdr *veth =vlan_eth_hdr (skb);
drivers/s390/net/qeth_core_main.c +7 -78
162 lines not on this page · raw message
drivers/s390/net/qeth_l2_main.c +0 -8
@@ -632,11 +632,6 @@ static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb, } queue =qeth_get_tx_queue (card, skb, ipv, cast_type); - -if (card->options.performance_stats) { - card->perf_stats.outbound_cnt++; - card->perf_stats.outbound_start_time =qeth_get_micros (); - }netif_stop_queue (dev);if (IS_OSN (card))
@@ -648,9 +643,6 @@ static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb,if (!rc) { card->stats.tx_packets++; card->stats.tx_bytes += tx_bytes; -if (card->options.performance_stats) - card->perf_stats.outbound_time +=qeth_get_micros () - - card->perf_stats.outbound_start_time;netif_wake_queue (dev);return NETDEV_TX_OK ; }else if (rc == -EBUSY ) {
drivers/s390/net/qeth_l3_main.c +0 -8
@@ -2092,11 +2092,6 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, goto tx_drop; queue =qeth_get_tx_queue (card, skb, ipv, cast_type); - -if (card->options.performance_stats) { - card->perf_stats.outbound_cnt++; - card->perf_stats.outbound_start_time =qeth_get_micros (); - }netif_stop_queue (dev);if (ipv ==4 ||IS_IQD (card))
@@ -2108,9 +2103,6 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb,if (!rc) { card->stats.tx_packets++; card->stats.tx_bytes += tx_bytes; -if (card->options.performance_stats) - card->perf_stats.outbound_time +=qeth_get_micros () - - card->perf_stats.outbound_start_time;netif_wake_queue (dev);return NETDEV_TX_OK ; }else if (rc == -EBUSY ) {
Signature · 1 line
2.16.4
PATCH 4/7 s390/qeth: move ethtool code into its own file
In reply to Julian WiedmannMost of this is self-contained code.
--- drivers/s390/net/Makefile | 2 +- drivers/s390/net/qeth_core.h | 12 +- drivers/s390/net/qeth_core_main.c | 317 +----------------------------------- drivers/s390/net/qeth_ethtool.c | 333 ++++++++++++++++++++++++++++++++++++++ drivers/s390/net/qeth_l2_main.c | 23 +-- drivers/s390/net/qeth_l3_main.c | 10 -- 6 files changed, 346 insertions(+), 351 deletions(-) create mode 100644 drivers/s390/net/qeth_ethtool.c
drivers/s390/net/Makefile +1 -1
@@ -9,7 +9,7 @@ obj-$(CONFIG_NETIUCV) += netiucv.o fsm.o obj-$(CONFIG_SMSGIUCV) += smsgiucv.o obj-$(CONFIG_SMSGIUCV_EVENT) += smsgiucv_app.o obj-$(CONFIG_LCS) += lcs.o -qeth-y += qeth_core_sys.o qeth_core_main.o qeth_core_mpc.o +qeth-y += qeth_core_sys.o qeth_core_main.o qeth_core_mpc.o qeth_ethtool.o obj-$(CONFIG_QETH) += qeth.o qeth_l2-y += qeth_l2_main.o qeth_l2_sys.o obj-$(CONFIG_QETH_L2) += qeth_l2.o
drivers/s390/net/qeth_core.h +4 -8
@@ -18,7 +18,6 @@#include <linux/in6.h> #include <linux/bitops.h> #include <linux/seq_file.h> -#include <linux/ethtool.h> #include <linux/hashtable.h> #include <linux/ip.h> #include <linux/refcount.h>
@@ -922,6 +921,8 @@ static inline struct qeth_qdio_out_q *qeth_get_tx_queue(struct qeth_card *card,extern struct qeth_discipline qeth_l2_discipline;extern struct qeth_discipline qeth_l3_discipline; +extern const struct ethtool_ops qeth_ethtool_ops; +extern const struct ethtool_ops qeth_osn_ethtool_ops;extern const struct attribute_group *qeth_generic_attr_groups[];extern const struct attribute_group *qeth_osn_attr_groups[];extern const struct attribute_group qeth_device_attr_group;
@@ -976,20 +977,15 @@ void qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,struct qeth_cmd_buffer *qeth_wait_for_buffer (struct qeth_channel *);int qeth_query_switch_attributes (struct qeth_card *card,struct qeth_switch_info *sw_info); +int qeth_query_card_info (struct qeth_card *card, +struct carrier_info *carrier_info);unsigned int qeth_count_elements (struct sk_buff *skb,unsigned int data_offset);int qeth_do_send_packet (struct qeth_card *card,struct qeth_qdio_out_q *queue,struct sk_buff *skb,struct qeth_hdr *hdr,unsigned int offset,unsigned int hd_len,int elements_needed);int qeth_do_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); -int qeth_core_get_sset_count (struct net_device *,int ); -void qeth_core_get_ethtool_stats (struct net_device *, -struct ethtool_stats *,u64 *); -void qeth_core_get_strings (struct net_device *,u32 ,u8 *); -void qeth_core_get_drvinfo (struct net_device *,struct ethtool_drvinfo *);void qeth_dbf_longtext (debug_info_t *id,int level,char *text, ...); -int qeth_core_ethtool_get_link_ksettings (struct net_device *netdev, -struct ethtool_link_ksettings *cmd);int qeth_set_access_ctrl_online (struct qeth_card *card,int fallback);int qeth_configure_cq (struct qeth_card *,enum qeth_cq );int qeth_hw_trap (struct qeth_card *,enum qeth_diags_trap_action );
drivers/s390/net/qeth_core_main.c +6 -311
335 lines not on this page · raw message
drivers/s390/net/qeth_ethtool.c new file +333 -0
333 lines not on this page · raw message
drivers/s390/net/qeth_l2_main.c +2 -21
@@ -696,22 +696,6 @@ static void qeth_l2_remove_device(struct ccwgroup_device *cgdev)unregister_netdev (card->dev); } -static const struct ethtool_ops qeth_l2_ethtool_ops = { - .get_link = ethtool_op_get_link, - .get_strings = qeth_core_get_strings, - .get_ethtool_stats = qeth_core_get_ethtool_stats, - .get_sset_count = qeth_core_get_sset_count, - .get_drvinfo = qeth_core_get_drvinfo, - .get_link_ksettings = qeth_core_ethtool_get_link_ksettings, -}; - -static const struct ethtool_ops qeth_l2_osn_ops = { - .get_strings = qeth_core_get_strings, - .get_ethtool_stats = qeth_core_get_ethtool_stats, - .get_sset_count = qeth_core_get_sset_count, - .get_drvinfo = qeth_core_get_drvinfo, -}; -static const struct net_device_ops qeth_l2_netdev_ops = { .ndo_open = qeth_open, .ndo_stop = qeth_stop,
@@ -735,13 +719,10 @@ static int qeth_l2_setup_netdev(struct qeth_card *card, bool carrier_ok) card->dev->priv_flags |=IFF_UNICAST_FLT ; card->dev->netdev_ops = &qeth_l2_netdev_ops; -if (card->info.type ==QETH_CARD_TYPE_OSN ) { - card->dev->ethtool_ops = &qeth_l2_osn_ops; +if (IS_OSN (card)) card->dev->flags |=IFF_NOARP ; - }else { - card->dev->ethtool_ops = &qeth_l2_ethtool_ops; +else card->dev->needed_headroom =sizeof (struct qeth_hdr ); - }if (IS_OSM (card)) { card->dev->features |=NETIF_F_VLAN_CHALLENGED ;
drivers/s390/net/qeth_l3_main.c +0 -10
@@ -2117,15 +2117,6 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb,return NETDEV_TX_OK ; } -static const struct ethtool_ops qeth_l3_ethtool_ops = { - .get_link = ethtool_op_get_link, - .get_strings = qeth_core_get_strings, - .get_ethtool_stats = qeth_core_get_ethtool_stats, - .get_sset_count = qeth_core_get_sset_count, - .get_drvinfo = qeth_core_get_drvinfo, - .get_link_ksettings = qeth_core_ethtool_get_link_ksettings, -}; -/* * we need NOARP for IPv4 but we want neighbor solicitation for IPv6. Setting * NOARP on the netdevice is no option because it also turns off neighbor
@@ -2247,7 +2238,6 @@ static int qeth_l3_setup_netdev(struct qeth_card *card, bool carrier_ok)return -ENODEV ; card->dev->needed_headroom = headroom; - card->dev->ethtool_ops = &qeth_l3_ethtool_ops; card->dev->features |=NETIF_F_HW_VLAN_CTAG_TX |NETIF_F_HW_VLAN_CTAG_RX |NETIF_F_HW_VLAN_CTAG_FILTER ;
Signature · 1 line
2.16.4
PATCH 5/7 s390/qeth: overhaul ethtool statistics
In reply to Julian WiedmannAccumulate per-TX queue statistics, and increase their size to 64 bit. Don't bother with enabling/disabling the statistics, the overhead is negligible.
--- drivers/s390/net/qeth_core.h | 90 ++++++++++++---------- drivers/s390/net/qeth_core_main.c | 127 ++++++++++++++++--------------- drivers/s390/net/qeth_core_sys.c | 39 +++++----- drivers/s390/net/qeth_ethtool.c | 152 +++++++++++++++++++++----------------- drivers/s390/net/qeth_l2_main.c | 28 +++---- drivers/s390/net/qeth_l3_main.c | 36 ++++----- 6 files changed, 256 insertions(+), 216 deletions(-)
drivers/s390/net/qeth_core.h +52 -38
@@ -34,6 +34,8 @@#include <asm/ccwgroup.h> #include <asm/sysinfo.h> +#include <uapi/linux/if_link.h> +#include "qeth_core_mpc.h" /**
@@ -112,35 +114,6 @@ static inline u32 qeth_get_device_id(struct ccw_device *cdev)#define CCW_DEVID (cdev) (qeth_get_device_id(cdev))#define CARD_DEVID (card) (CCW_DEVID(CARD_RDEV(card))) -/** -* card stuff -*/ -struct qeth_perf_stats { -unsigned int bufs_rec; -unsigned int bufs_sent; -unsigned int buf_elements_sent; - -unsigned int skbs_sent_pack; -unsigned int bufs_sent_pack; - -unsigned int sc_dp_p; -unsigned int sc_p_dp; -unsigned int large_send_bytes; -unsigned int large_send_cnt; -unsigned int sg_skbs_sent; -/* initial values when measuring starts */ -unsigned long initial_rx_packets; -unsigned long initial_tx_packets; -/* inbound scatter gather data */ -unsigned int sg_skbs_rx; -unsigned int sg_frags_rx; -unsigned int sg_alloc_page_rx; -unsigned int tx_csum; -unsigned int tx_lin; -unsigned int tx_linfail; -unsigned int rx_csum; -}; -/* Routing stuff */ struct qeth_routing_info {enum qeth_routing_types type;
@@ -470,10 +443,54 @@ enum qeth_out_q_states { QETH_OUT_Q_LOCKED_FLUSH, }; +#define QETH_CARD_STAT_ADD (_c, _stat, _val) ((_c)->stats._stat += (_val)) +#define QETH_CARD_STAT_INC (_c, _stat) QETH_CARD_STAT_ADD(_c, _stat, 1) + +#define QETH_TXQ_STAT_ADD (_q, _stat, _val) ((_q)->stats._stat += (_val)) +#define QETH_TXQ_STAT_INC (_q, _stat) QETH_TXQ_STAT_ADD(_q, _stat, 1) + +struct qeth_card_stats { +u64 rx_bufs; +u64 rx_skb_csum; +u64 rx_sg_skbs; +u64 rx_sg_frags; +u64 rx_sg_alloc_page; + +/* rtnl_link_stats64 */ +u64 rx_packets; +u64 rx_bytes; +u64 rx_errors; +u64 rx_dropped; +u64 rx_multicast; +u64 tx_errors; +}; + +struct qeth_out_q_stats { +u64 bufs; +u64 bufs_pack; +u64 buf_elements; +u64 skbs_pack; +u64 skbs_sg; +u64 skbs_csum; +u64 skbs_tso; +u64 skbs_linearized; +u64 skbs_linearized_fail; +u64 tso_bytes; +u64 packing_mode_switch; + +/* rtnl_link_stats64 */ +u64 tx_packets; +u64 tx_bytes; +u64 tx_errors; +u64 tx_dropped; +u64 tx_carrier_errors; +}; +struct qeth_qdio_out_q {struct qdio_buffer *qdio_bufs[QDIO_MAX_BUFFERS_PER_Q ];struct qeth_qdio_out_buffer *bufs[QDIO_MAX_BUFFERS_PER_Q ];struct qdio_outbuf_state *bufstates;/* convenience pointer */ +struct qeth_out_q_stats stats;int queue_no;struct qeth_card *card;atomic_t state;
@@ -677,7 +694,6 @@ struct qeth_card_options {struct qeth_vnicc_info vnicc;/* VNICC options */ int fake_broadcast;enum qeth_discipline_id layer; -int performance_stats;int rx_sg_cb;enum qeth_ipa_isolation_modes isolation;enum qeth_ipa_isolation_modes prev_isolation;
@@ -753,8 +769,7 @@ struct qeth_card {struct qeth_channel data;struct net_device *dev; -struct net_device_stats stats; - +struct qeth_card_stats stats;struct qeth_card_info info;struct qeth_token token;struct qeth_seqno seqno;
@@ -777,7 +792,6 @@ struct qeth_card {struct list_head cmd_waiter_list;/* QDIO buffer handling */ struct qeth_qdio_info qdio; -struct qeth_perf_stats perf_stats;int read_or_write_problem;struct qeth_osn_info osn_info;struct qeth_discipline *discipline;
@@ -858,8 +872,7 @@ static inline void qeth_rx_csum(struct qeth_card *card, struct sk_buff *skb,if ((card->dev->features &NETIF_F_RXCSUM ) && (flags &QETH_HDR_EXT_CSUM_TRANSP_REQ )) { skb->ip_summed =CHECKSUM_UNNECESSARY ; -if (card->options.performance_stats) - card->perf_stats.rx_csum++; +QETH_CARD_STAT_INC (card, rx_skb_csum); }else { skb->ip_summed =CHECKSUM_NONE ; }
@@ -966,7 +979,6 @@ void qeth_clear_working_pool_list(struct qeth_card *);void qeth_clear_cmd_buffers (struct qeth_channel *);void qeth_clear_qdio_buffers (struct qeth_card *);void qeth_setadp_promisc_mode (struct qeth_card *); -struct net_device_stats *qeth_get_stats (struct net_device *);int qeth_setadpparms_change_macaddr (struct qeth_card *);void qeth_tx_timeout (struct net_device *); void qeth_prepare_control_data(struct qeth_card *, int,
@@ -1002,14 +1014,16 @@ netdev_features_t qeth_fix_features(struct net_device *, netdev_features_t);netdev_features_t qeth_features_check (struct sk_buff *skb,struct net_device *dev,netdev_features_t features); +void qeth_get_stats64 (struct net_device *dev,struct rtnl_link_stats64 *stats);int qeth_open (struct net_device *dev);int qeth_stop (struct net_device *dev);int qeth_vm_request_mac (struct qeth_card *card);int qeth_xmit (struct qeth_card *card,struct sk_buff *skb,struct qeth_qdio_out_q *queue,int ipv,int cast_type, -void (*fill_header)(struct qeth_card *card,struct qeth_hdr *hdr, -struct sk_buff *skb,int ipv,int cast_type, +void (*fill_header)(struct qeth_qdio_out_q *queue, +struct qeth_hdr *hdr,struct sk_buff *skb, +int ipv,int cast_type,unsigned int data_len));/* exports for OSN */
drivers/s390/net/qeth_core_main.c +66 -61
269 lines not on this page · raw message
drivers/s390/net/qeth_core_sys.c +20 -19
@@ -336,35 +336,36 @@ static ssize_t qeth_dev_performance_stats_show(struct device *dev,if (!card)return -EINVAL ; -return sprintf (buf,"%i\n" , card->options.performance_stats ?1 :0 ); +return sprintf (buf,"1\n" ); }static ssize_t qeth_dev_performance_stats_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card =dev_get_drvdata (dev); -char *tmp; -int i, rc =0 ; +struct qeth_qdio_out_q *queue; +unsigned int i; +bool reset; +int rc;if (!card)return -EINVAL ; -mutex_lock (&card->conf_mutex); - i =simple_strtoul (buf, &tmp,16 ); -if ((i ==0 ) || (i ==1 )) { -if (i == card->options.performance_stats) - goto out; - card->options.performance_stats = i; -if (i ==0 ) -memset (&card->perf_stats,0 , -sizeof (struct qeth_perf_stats )); - card->perf_stats.initial_rx_packets = card->stats.rx_packets; - card->perf_stats.initial_tx_packets = card->stats.tx_packets; - }else - rc = -EINVAL ; -out: -mutex_unlock (&card->conf_mutex); -return rc ? rc : count; + rc =kstrtobool (buf, &reset); +if (rc) +return rc; + +if (reset) { +memset (&card->stats,0 ,sizeof (card->stats)); +for (i =0 ; i < card->qdio.no_out_queues; i++) { + queue = card->qdio.out_qs[i]; +if (!queue) +break ; +memset (&queue->stats,0 ,sizeof (queue->stats)); + } + } + +return count; } static DEVICE_ATTR(performance_stats, 0644, qeth_dev_performance_stats_show,
drivers/s390/net/qeth_ethtool.c +86 -66
177 lines not on this page · raw message
drivers/s390/net/qeth_l2_main.c +14 -14
@@ -174,9 +174,9 @@ static int qeth_l2_get_cast_type(struct qeth_card *card, struct sk_buff *skb)return RTN_UNICAST ; } -static void qeth_l2_fill_header (struct qeth_card *card,struct qeth_hdr *hdr, -struct sk_buff *skb,int ipv,int cast_type, -unsigned int data_len) +static void qeth_l2_fill_header (struct qeth_qdio_out_q *queue, +struct qeth_hdr *hdr,struct sk_buff *skb, +int ipv,int cast_type,unsigned int data_len) {struct vlan_ethhdr *veth =vlan_eth_hdr (skb);
@@ -188,8 +188,7 @@ static void qeth_l2_fill_header(struct qeth_card *card, struct qeth_hdr *hdr, hdr->hdr.l2.id =QETH_HEADER_TYPE_LAYER2 ;if (skb->ip_summed ==CHECKSUM_PARTIAL ) {qeth_tx_csum (skb, &hdr->hdr.l2.flags[1 ], ipv); -if (card->options.performance_stats) - card->perf_stats.tx_csum++; +QETH_TXQ_STAT_INC (queue, skbs_csum); } }
@@ -369,8 +368,8 @@ static int qeth_l2_process_inbound_buffer(struct qeth_card *card, } work_done++; budget--; - card->stats.rx_packets++; - card->stats.rx_bytes += len; +QETH_CARD_STAT_INC (card, rx_packets); +QETH_CARD_STAT_ADD (card, rx_bytes, len); }return work_done; }
@@ -626,12 +625,13 @@ static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb,int tx_bytes = skb->len;int rc; + queue =qeth_get_tx_queue (card, skb, ipv, cast_type); +if (card->state !=CARD_STATE_UP ) { - card->stats.tx_carrier_errors++; +QETH_TXQ_STAT_INC (queue, tx_carrier_errors); goto tx_drop; } - queue =qeth_get_tx_queue (card, skb, ipv, cast_type);netif_stop_queue (dev);if (IS_OSN (card))
@@ -641,8 +641,8 @@ static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb, qeth_l2_fill_header);if (!rc) { - card->stats.tx_packets++; - card->stats.tx_bytes += tx_bytes; +QETH_TXQ_STAT_INC (queue, tx_packets); +QETH_TXQ_STAT_ADD (queue, tx_bytes, tx_bytes);netif_wake_queue (dev);return NETDEV_TX_OK ; }else if (rc == -EBUSY ) {
@@ -650,8 +650,8 @@ static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb, }/* else fall through */ tx_drop: - card->stats.tx_dropped++; - card->stats.tx_errors++; +QETH_TXQ_STAT_INC (queue, tx_dropped); +QETH_TXQ_STAT_INC (queue, tx_errors);dev_kfree_skb_any (skb);netif_wake_queue (dev);return NETDEV_TX_OK ;
@@ -699,7 +699,7 @@ static void qeth_l2_remove_device(struct ccwgroup_device *cgdev)static const struct net_device_ops qeth_l2_netdev_ops = { .ndo_open = qeth_open, .ndo_stop = qeth_stop, - .ndo_get_stats = qeth_get_stats, + .ndo_get_stats64 = qeth_get_stats64, .ndo_start_xmit = qeth_l2_hard_start_xmit, .ndo_features_check = qeth_features_check, .ndo_validate_addr = qeth_l2_validate_addr,
drivers/s390/net/qeth_l3_main.c +18 -18
@@ -1315,12 +1315,11 @@ static void qeth_l3_rebuild_skb(struct qeth_card *card, struct sk_buff *skb,ip_eth_mc_map (ip_hdr (skb)->daddr, tg_addr); else ipv6_eth_mc_map(&ipv6_hdr(skb)->daddr, tg_addr); - - card->stats.multicast++; +QETH_CARD_STAT_INC (card, rx_multicast);break ;case QETH_CAST_BROADCAST :ether_addr_copy (tg_addr, card->dev->broadcast); - card->stats.multicast++; +QETH_CARD_STAT_INC (card, rx_multicast);break ;default :if (card->options.sniffer)
@@ -1401,8 +1400,8 @@ static int qeth_l3_process_inbound_buffer(struct qeth_card *card, } work_done++; budget--; - card->stats.rx_packets++; - card->stats.rx_bytes += len; +QETH_CARD_STAT_INC (card, rx_packets); +QETH_CARD_STAT_ADD (card, rx_bytes, len); }return work_done; }
@@ -1945,12 +1944,13 @@ static u8 qeth_l3_cast_type_to_flag(int cast_type)return QETH_CAST_UNICAST ; } -static void qeth_l3_fill_header (struct qeth_card *card,struct qeth_hdr *hdr, -struct sk_buff *skb,int ipv,int cast_type, -unsigned int data_len) +static void qeth_l3_fill_header (struct qeth_qdio_out_q *queue, +struct qeth_hdr *hdr,struct sk_buff *skb, +int ipv,int cast_type,unsigned int data_len) {struct qeth_hdr_layer3 *l3_hdr = &hdr->hdr.l3;struct vlan_ethhdr *veth =vlan_eth_hdr (skb); +struct qeth_card *card = queue->card; hdr->hdr.l3.length = data_len;
@@ -1972,8 +1972,7 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,/* some HW requires combined L3+L4 csum offload: */ if (ipv ==4 ) hdr->hdr.l3.ext_flags |=QETH_HDR_EXT_CSUM_HDR_REQ ; -if (card->options.performance_stats) - card->perf_stats.tx_csum++; +QETH_TXQ_STAT_INC (queue, skbs_csum); } }
@@ -2074,6 +2073,8 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb,int tx_bytes = skb->len;int rc; + queue =qeth_get_tx_queue (card, skb, ipv, cast_type); +if (IS_IQD (card)) {if (card->options.sniffer) goto tx_drop;
@@ -2084,14 +2085,13 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, }if (card->state !=CARD_STATE_UP ) { - card->stats.tx_carrier_errors++; +QETH_TXQ_STAT_INC (queue, tx_carrier_errors); goto tx_drop; }if (cast_type ==RTN_BROADCAST && !card->info.broadcast_capable) goto tx_drop; - queue =qeth_get_tx_queue (card, skb, ipv, cast_type);netif_stop_queue (dev);if (ipv ==4 ||IS_IQD (card))
@@ -2101,8 +2101,8 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, qeth_l3_fill_header);if (!rc) { - card->stats.tx_packets++; - card->stats.tx_bytes += tx_bytes; +QETH_TXQ_STAT_INC (queue, tx_packets); +QETH_TXQ_STAT_ADD (queue, tx_bytes, tx_bytes);netif_wake_queue (dev);return NETDEV_TX_OK ; }else if (rc == -EBUSY ) {
@@ -2110,8 +2110,8 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, }/* else fall through */ tx_drop: - card->stats.tx_dropped++; - card->stats.tx_errors++; +QETH_TXQ_STAT_INC (queue, tx_dropped); +QETH_TXQ_STAT_INC (queue, tx_errors);dev_kfree_skb_any (skb);netif_wake_queue (dev);return NETDEV_TX_OK ;
@@ -2153,7 +2153,7 @@ static netdev_features_t qeth_l3_osa_features_check(struct sk_buff *skb,static const struct net_device_ops qeth_l3_netdev_ops = { .ndo_open = qeth_open, .ndo_stop = qeth_stop, - .ndo_get_stats = qeth_get_stats, + .ndo_get_stats64 = qeth_get_stats64, .ndo_start_xmit = qeth_l3_hard_start_xmit, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = qeth_l3_set_rx_mode,
@@ -2168,7 +2168,7 @@ static const struct net_device_ops qeth_l3_netdev_ops = {static const struct net_device_ops qeth_l3_osa_netdev_ops = { .ndo_open = qeth_open, .ndo_stop = qeth_stop, - .ndo_get_stats = qeth_get_stats, + .ndo_get_stats64 = qeth_get_stats64, .ndo_start_xmit = qeth_l3_hard_start_xmit, .ndo_features_check = qeth_l3_osa_features_check, .ndo_validate_addr = eth_validate_addr,
Signature · 1 line
2.16.4
PATCH 6/7 s390/qeth: add support for ETHTOOL_GRINGPARAM
In reply to Julian WiedmannImplement a trivial callback that exposes the queue sizes.
--- drivers/s390/net/qeth_ethtool.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/s390/net/qeth_ethtool.c +17 -0
@@ -102,6 +102,22 @@ static void qeth_get_ethtool_stats(struct net_device *dev, txq_stats, TXQ_STATS_LEN); } +static void qeth_get_ringparam (struct net_device *dev, +struct ethtool_ringparam *param) +{ +struct qeth_card *card = dev->ml_priv; + + param->rx_max_pending =QDIO_MAX_BUFFERS_PER_Q ; + param->rx_mini_max_pending =0 ; + param->rx_jumbo_max_pending =0 ; + param->tx_max_pending =QDIO_MAX_BUFFERS_PER_Q ; + + param->rx_pending = card->qdio.in_buf_pool.buf_count; + param->rx_mini_pending =0 ; + param->rx_jumbo_pending =0 ; + param->tx_pending =QDIO_MAX_BUFFERS_PER_Q ; +} +static void qeth_get_strings (struct net_device *dev,u32 stringset,u8 *data) {struct qeth_card *card = dev->ml_priv;
@@ -338,6 +354,7 @@ static int qeth_get_link_ksettings(struct net_device *netdev,const struct ethtool_ops qeth_ethtool_ops = { .get_link = ethtool_op_get_link, + .get_ringparam = qeth_get_ringparam, .get_strings = qeth_get_strings, .get_ethtool_stats = qeth_get_ethtool_stats, .get_sset_count = qeth_get_sset_count,
Signature · 1 line
2.16.4
PATCH 7/7 s390/qeth: split out OSN netdev ops
In reply to Julian WiedmannRather than special-casing OSN in a number of places, just give this device type its own netdev_ops structure.
When setting up the OSN net_device, also skip the handling of the various HW offloads (eg TSO). The device shouldn't be advertising any of them, and the OSN code paths in qeth don't have support for them. In particular RX VLAN filtering is not supported, so don't hook up those callbacks in the netdev_ops.
--- drivers/s390/net/qeth_core_main.c | 3 --- drivers/s390/net/qeth_core_mpc.h | 1 + drivers/s390/net/qeth_l2_main.c | 32 ++++++++++++++++++++------------ 3 files changed, 21 insertions(+), 15 deletions(-)
drivers/s390/net/qeth_core_main.c +0 -3
@@ -5850,9 +5850,6 @@ int qeth_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)if (!card)return -ENODEV ; -if (card->info.type ==QETH_CARD_TYPE_OSN ) -return -EPERM ; -switch (cmd) {case SIOC_QETH_ADP_SET_SNMP_CONTROL : rc =qeth_snmp_command (card, rq->ifr_ifru.ifru_data);
drivers/s390/net/qeth_core_mpc.h +1 -0
@@ -81,6 +81,7 @@ enum qeth_card_types {#define IS_OSD (card) ((card)->info.type == QETH_CARD_TYPE_OSD)#define IS_OSM (card) ((card)->info.type == QETH_CARD_TYPE_OSM)#define IS_OSN (card) ((card)->info.type == QETH_CARD_TYPE_OSN) +#define IS_OSX (card) ((card)->info.type == QETH_CARD_TYPE_OSX)#define IS_VM_NIC (card) ((card)->info.guestlan)#define QETH_MPC_DIFINFO_LEN_INDICATES_LINK_TYPE 0x18
drivers/s390/net/qeth_l2_main.c +20 -12
@@ -425,7 +425,7 @@ static int qeth_l2_validate_addr(struct net_device *dev) {struct qeth_card *card = dev->ml_priv; -if (IS_OSN (card) || (card->info.mac_bits &QETH_LAYER2_MAC_REGISTERED )) +if (card->info.mac_bits &QETH_LAYER2_MAC_REGISTERED )return eth_validate_addr (dev);QETH_CARD_TEXT (card,4 ,"nomacadr" );
@@ -441,9 +441,7 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p)QETH_CARD_TEXT (card,3 ,"setmac" ); -if (card->info.type ==QETH_CARD_TYPE_OSN || - card->info.type ==QETH_CARD_TYPE_OSM || - card->info.type ==QETH_CARD_TYPE_OSX ) { +if (IS_OSM (card) ||IS_OSX (card)) {QETH_CARD_TEXT (card,3 ,"setmcTYP" );return -EOPNOTSUPP ; }
@@ -537,9 +535,6 @@ static void qeth_l2_set_rx_mode(struct net_device *dev)int i;int rc; -if (card->info.type ==QETH_CARD_TYPE_OSN ) -return ; -QETH_CARD_TEXT (card,3 ,"setmulti" );spin_lock_bh (&card->mclock);
@@ -713,16 +708,28 @@ static const struct net_device_ops qeth_l2_netdev_ops = { .ndo_set_features = qeth_set_features }; +static const struct net_device_ops qeth_osn_netdev_ops = { + .ndo_open = qeth_open, + .ndo_stop = qeth_stop, + .ndo_get_stats64 = qeth_get_stats64, + .ndo_start_xmit = qeth_l2_hard_start_xmit, + .ndo_validate_addr = eth_validate_addr, + .ndo_tx_timeout = qeth_tx_timeout, +}; +static int qeth_l2_setup_netdev (struct qeth_card *card,bool carrier_ok) {int rc; - card->dev->priv_flags |=IFF_UNICAST_FLT ; - card->dev->netdev_ops = &qeth_l2_netdev_ops; -if (IS_OSN (card)) +if (IS_OSN (card)) { + card->dev->netdev_ops = &qeth_osn_netdev_ops; card->dev->flags |=IFF_NOARP ; -else - card->dev->needed_headroom =sizeof (struct qeth_hdr ); + goto add_napi; + } + + card->dev->needed_headroom =sizeof (struct qeth_hdr ); + card->dev->netdev_ops = &qeth_l2_netdev_ops; + card->dev->priv_flags |=IFF_UNICAST_FLT ;if (IS_OSM (card)) { card->dev->features |=NETIF_F_VLAN_CHALLENGED ;
@@ -764,6 +771,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card, bool carrier_ok) PAGE_SIZE * (QDIO_MAX_ELEMENTS_PER_BUFFER - 1)); } +add_napi:netif_napi_add (card->dev, &card->napi, qeth_poll,QETH_NAPI_WEIGHT ); rc =register_netdev (card->dev);if (!rc && carrier_ok)
Signature · 1 line
2.16.4
From: Julian Wiedmann <[email protected]>
Date: Fri, 15 Feb 2019 19:22:24 +0100
Quoted 3 lines
please apply a few more qeth patches to net-next. Along with some smaller improvements, this revamps our code for the SW statistics that are exposed through
ETHTOOL_GSTATS.
Applied, thanks.