Commit bb015f22 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 's390-next' 



Julian Wiedmann says:

====================
s390/qeth: updates 2019-02-15

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.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ff326d3c 8024cc9e

drivers/s390/net/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

+57 −76
Original line number Diff line number Diff line
@@ -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>
@@ -35,6 +34,8 @@ 
#include <asm/ccwgroup.h>

#include <asm/sysinfo.h>



#include <uapi/linux/if_link.h>



#include "qeth_core_mpc.h"



/**
@@ -113,59 +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;

	/* 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;

	/* 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;
@@ -495,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;
@@ -528,7 +520,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 */
@@ -702,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;
@@ -778,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;
@@ -802,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;
@@ -859,11 +848,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);
@@ -888,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;

	}
@@ -951,6 +934,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;
@@ -994,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,
@@ -1005,20 +989,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);
@@ -1035,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

+81 −464

File changed.

Preview size limit exceeded, changes collapsed.

drivers/s390/net/qeth_core_mpc.h

+1 −0
Original line number Diff line number Diff line
@@ -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_core_sys.c

+21 −20
Original line number Diff line number Diff line
@@ -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);
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE