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

Merge branch 's390-next' 



Julian Wiedmann says:

====================
s390/qeth: updates 2019-11-14

please apply the following qeth patches to net-next.
Along with the usual cleanups, this
(1) reduces collateral packet loss in the RX path when dealing with
    bad packets and/or allocation errors, and
(2) simplifies how the L3 driver deals with mcast IP addresses.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 24df31f8 0b81c6c6

drivers/s390/net/qeth_core.h

+7 −3
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ enum qeth_header_ids { 
	QETH_HEADER_TYPE_L3_TSO	= 0x03,

	QETH_HEADER_TYPE_OSN    = 0x04,

	QETH_HEADER_TYPE_L2_TSO	= 0x06,

	QETH_HEADER_MASK_INVAL	= 0x80,

};

/* flags for qeth_hdr.ext_flags */

#define QETH_HDR_EXT_VLAN_FRAME       0x01
@@ -477,12 +478,16 @@ struct qeth_card_stats { 
	u64 rx_sg_frags;

	u64 rx_sg_alloc_page;



	u64 rx_dropped_nomem;

	u64 rx_dropped_notsupp;



	/* rtnl_link_stats64 */

	u64 rx_packets;

	u64 rx_bytes;

	u64 rx_errors;

	u64 rx_dropped;

	u64 rx_multicast;

	u64 rx_length_errors;

	u64 rx_frame_errors;

	u64 rx_fifo_errors;

};



struct qeth_out_q_stats {
@@ -819,7 +824,6 @@ struct qeth_card { 
	struct workqueue_struct *event_wq;

	struct workqueue_struct *cmd_wq;

	wait_queue_head_t wait_q;

	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];

	DECLARE_HASHTABLE(mac_htable, 4);

	DECLARE_HASHTABLE(ip_htable, 4);

	struct mutex ip_lock;

drivers/s390/net/qeth_core_main.c

+58 −24
Original line number Diff line number Diff line
@@ -1956,6 +1956,7 @@ static void qeth_idx_setup_activate_cmd(struct qeth_card *card, 
	ccw_device_get_id(CARD_DDEV(card), &dev_id);

	iob->finalize = qeth_idx_finalize_cmd;



	port |= QETH_IDX_ACT_INVAL_FRAME;

	memcpy(QETH_IDX_ACT_PNO(iob->data), &port, 1);

	memcpy(QETH_IDX_ACT_ISSUER_RM_TOKEN(iob->data),

	       &card->token.issuer_rm_w, QETH_MPC_TOKEN_LENGTH);
@@ -3093,7 +3094,7 @@ static int qeth_check_qdio_errors(struct qeth_card *card, 
			       buf->element[14].sflags);

		QETH_CARD_TEXT_(card, 2, " qerr=%X", qdio_error);

		if ((buf->element[15].sflags) == 0x12) {

			QETH_CARD_STAT_INC(card, rx_dropped);

			QETH_CARD_STAT_INC(card, rx_fifo_errors);

			return 0;

		} else

			return 1;
@@ -4346,7 +4347,9 @@ static int qeth_mdio_read(struct net_device *dev, int phy_id, int regnum) 
	case MII_NWAYTEST: /* N-way auto-neg test register */

		break;

	case MII_RERRCOUNTER: /* rx error counter */

		rc = card->stats.rx_errors;

		rc = card->stats.rx_length_errors +

		     card->stats.rx_frame_errors +

		     card->stats.rx_fifo_errors;

		break;

	case MII_SREVISION: /* silicon revision */

		break;
@@ -4852,7 +4855,6 @@ static void qeth_core_free_card(struct qeth_card *card) 
	qeth_clean_channel(&card->data);

	qeth_put_cmd(card->read_cmd);

	destroy_workqueue(card->event_wq);

	qeth_free_qdio_queues(card);

	unregister_service_level(&card->qeth_service_level);

	dev_set_drvdata(&card->gdev->dev, NULL);

	kfree(card);
@@ -5062,13 +5064,14 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, 
	struct qdio_buffer_element *element = *__element;

	struct qdio_buffer *buffer = qethbuffer->buffer;

	int offset = *__offset;

	bool use_rx_sg = false;

	unsigned int headroom;

	struct sk_buff *skb;

	int skb_len = 0;

	void *data_ptr;

	int data_len;

	int headroom = 0;

	int use_rx_sg = 0;



next_packet:

	/* qeth_hdr must not cross element boundaries */

	while (element->length < offset + sizeof(struct qeth_hdr)) {

		if (qeth_is_last_sbale(element))
@@ -5082,27 +5085,45 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, 
	switch ((*hdr)->hdr.l2.id) {

	case QETH_HEADER_TYPE_LAYER2:

		skb_len = (*hdr)->hdr.l2.pkt_length;

		headroom = 0;

		break;

	case QETH_HEADER_TYPE_LAYER3:

		skb_len = (*hdr)->hdr.l3.length;

		if (!IS_LAYER3(card)) {

			QETH_CARD_STAT_INC(card, rx_dropped_notsupp);

			skb = NULL;

			goto walk_packet;

		}



		headroom = ETH_HLEN;

		break;

	case QETH_HEADER_TYPE_OSN:

		skb_len = (*hdr)->hdr.osn.pdu_length;

		if (!IS_OSN(card)) {

			QETH_CARD_STAT_INC(card, rx_dropped_notsupp);

			skb = NULL;

			goto walk_packet;

		}



		headroom = sizeof(struct qeth_hdr);

		break;

	default:

		break;

		if ((*hdr)->hdr.l2.id & QETH_HEADER_MASK_INVAL)

			QETH_CARD_STAT_INC(card, rx_frame_errors);

		else

			QETH_CARD_STAT_INC(card, rx_dropped_notsupp);



		/* Can't determine packet length, drop the whole buffer. */

		return NULL;

	}



	if (!skb_len)

		return NULL;



	if (((skb_len >= card->options.rx_sg_cb) &&

	     !IS_OSN(card) &&

	     (!atomic_read(&card->force_alloc_skb))) ||

	    (card->options.cq == QETH_CQ_ENABLED))

		use_rx_sg = 1;

	use_rx_sg = (card->options.cq == QETH_CQ_ENABLED) ||

		    ((skb_len >= card->options.rx_sg_cb) &&

		     !atomic_read(&card->force_alloc_skb) &&

		     !IS_OSN(card));



	if (use_rx_sg && qethbuffer->rx_skb) {

		/* QETH_CQ_ENABLED only: */
@@ -5113,15 +5134,18 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, 


		skb = napi_alloc_skb(&card->napi, linear + headroom);

	}



	if (!skb)

		goto no_mem;

	if (headroom)

		QETH_CARD_STAT_INC(card, rx_dropped_nomem);

	else if (headroom)

		skb_reserve(skb, headroom);



walk_packet:

	data_ptr = element->addr + offset;

	while (skb_len) {

		data_len = min(skb_len, (int)(element->length - offset));

		if (data_len) {



		if (skb && data_len) {

			if (use_rx_sg)

				qeth_create_skb_frag(element, skb, offset,

						     data_len);
@@ -5133,8 +5157,11 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, 
			if (qeth_is_last_sbale(element)) {

				QETH_CARD_TEXT(card, 4, "unexeob");

				QETH_CARD_HEX(card, 2, buffer, sizeof(void *));

				if (skb) {

					dev_kfree_skb_any(skb);

				QETH_CARD_STAT_INC(card, rx_errors);

					QETH_CARD_STAT_INC(card,

							   rx_length_errors);

				}

				return NULL;

			}

			element++;
@@ -5144,6 +5171,11 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, 
			offset += data_len;

		}

	}



	/* This packet was skipped, go get another one: */

	if (!skb)

		goto next_packet;



	*__element = element;

	*__offset = offset;

	if (use_rx_sg) {
@@ -5152,12 +5184,6 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, 
				   skb_shinfo(skb)->nr_frags);

	}

	return skb;

no_mem:

	if (net_ratelimit()) {

		QETH_CARD_TEXT(card, 2, "noskbmem");

	}

	QETH_CARD_STAT_INC(card, rx_dropped);

	return NULL;

}

EXPORT_SYMBOL_GPL(qeth_core_get_next_skb);
@@ -5741,6 +5767,8 @@ static void qeth_core_remove_device(struct ccwgroup_device *gdev) 
		qeth_core_free_discipline(card);

	}



	qeth_free_qdio_queues(card);



	free_netdev(card->dev);

	qeth_core_free_card(card);

	put_device(&gdev->dev);
@@ -6236,9 +6264,15 @@ void qeth_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) 


	stats->rx_packets = card->stats.rx_packets;

	stats->rx_bytes = card->stats.rx_bytes;

	stats->rx_errors = card->stats.rx_errors;

	stats->rx_dropped = card->stats.rx_dropped;

	stats->rx_errors = card->stats.rx_length_errors +

			   card->stats.rx_frame_errors +

			   card->stats.rx_fifo_errors;

	stats->rx_dropped = card->stats.rx_dropped_nomem +

			    card->stats.rx_dropped_notsupp;

	stats->multicast = card->stats.rx_multicast;

	stats->rx_length_errors = card->stats.rx_length_errors;

	stats->rx_frame_errors = card->stats.rx_frame_errors;

	stats->rx_fifo_errors = card->stats.rx_fifo_errors;



	for (i = 0; i < card->qdio.no_out_queues; i++) {

		queue = card->qdio.out_qs[i];

drivers/s390/net/qeth_core_mpc.h

+1 −0
Original line number Diff line number Diff line
@@ -900,6 +900,7 @@ extern unsigned char IDX_ACTIVATE_WRITE[]; 
#define IDX_ACTIVATE_SIZE	0x22

#define QETH_IDX_ACT_PNO(buffer) (buffer+0x0b)

#define QETH_IDX_ACT_ISSUER_RM_TOKEN(buffer) (buffer + 0x0c)

#define QETH_IDX_ACT_INVAL_FRAME	0x40

#define QETH_IDX_NO_PORTNAME_REQUIRED(buffer) ((buffer)[0x0b] & 0x80)

#define QETH_IDX_ACT_FUNC_LEVEL(buffer) (buffer + 0x10)

#define QETH_IDX_ACT_DATASET_NAME(buffer) (buffer + 0x16)

drivers/s390/net/qeth_core_sys.c

+4 −76
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ static ssize_t qeth_dev_state_show(struct device *dev, 
				struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	if (!card)

		return -EINVAL;



	switch (card->state) {

	case CARD_STATE_DOWN:
@@ -45,8 +43,6 @@ static ssize_t qeth_dev_chpid_show(struct device *dev, 
				struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	if (!card)

		return -EINVAL;



	return sprintf(buf, "%02X\n", card->info.chpid);

}
@@ -57,8 +53,7 @@ static ssize_t qeth_dev_if_name_show(struct device *dev, 
				struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	if (!card)

		return -EINVAL;



	return sprintf(buf, "%s\n", QETH_CARD_IFNAME(card));

}
@@ -68,8 +63,6 @@ static ssize_t qeth_dev_card_type_show(struct device *dev, 
				struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	if (!card)

		return -EINVAL;



	return sprintf(buf, "%s\n", qeth_get_cardname_short(card));

}
@@ -94,8 +87,6 @@ static ssize_t qeth_dev_inbuf_size_show(struct device *dev, 
				struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	if (!card)

		return -EINVAL;



	return sprintf(buf, "%s\n", qeth_get_bufsize_str(card));

}
@@ -106,8 +97,6 @@ static ssize_t qeth_dev_portno_show(struct device *dev, 
			struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	if (!card)

		return -EINVAL;



	return sprintf(buf, "%i\n", card->dev->dev_port);

}
@@ -120,9 +109,6 @@ static ssize_t qeth_dev_portno_store(struct device *dev, 
	unsigned int portno, limit;

	int rc = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (card->state != CARD_STATE_DOWN) {

		rc = -EPERM;
@@ -171,9 +157,6 @@ static ssize_t qeth_dev_prioqing_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	switch (card->qdio.do_prio_queueing) {

	case QETH_PRIO_Q_ING_PREC:

		return sprintf(buf, "%s\n", "by precedence");
@@ -195,9 +178,6 @@ static ssize_t qeth_dev_prioqing_store(struct device *dev, 
	struct qeth_card *card = dev_get_drvdata(dev);

	int rc = 0;



	if (!card)

		return -EINVAL;



	if (IS_IQD(card))

		return -EOPNOTSUPP;
@@ -262,9 +242,6 @@ static ssize_t qeth_dev_bufcnt_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return sprintf(buf, "%i\n", card->qdio.in_buf_pool.buf_count);

}
@@ -276,9 +253,6 @@ static ssize_t qeth_dev_bufcnt_store(struct device *dev, 
	int cnt, old_cnt;

	int rc = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (card->state != CARD_STATE_DOWN) {

		rc = -EPERM;
@@ -307,9 +281,6 @@ static ssize_t qeth_dev_recover_store(struct device *dev, 
	char *tmp;

	int i;



	if (!card)

		return -EINVAL;



	if (!qeth_card_hw_is_reachable(card))

		return -EPERM;
@@ -325,11 +296,6 @@ static DEVICE_ATTR(recover, 0200, NULL, qeth_dev_recover_store); 
static ssize_t qeth_dev_performance_stats_show(struct device *dev,

				struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return sprintf(buf, "1\n");

}
@@ -342,9 +308,6 @@ static ssize_t qeth_dev_performance_stats_store(struct device *dev, 
	bool reset;

	int rc;



	if (!card)

		return -EINVAL;



	rc = kstrtobool(buf, &reset);

	if (rc)

		return rc;
@@ -370,9 +333,6 @@ static ssize_t qeth_dev_layer2_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return sprintf(buf, "%i\n", card->options.layer);

}
@@ -385,9 +345,6 @@ static ssize_t qeth_dev_layer2_store(struct device *dev, 
	int i, rc = 0;

	enum qeth_discipline_id newdis;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->discipline_mutex);

	if (card->state != CARD_STATE_DOWN) {

		rc = -EPERM;
@@ -453,9 +410,6 @@ static ssize_t qeth_dev_isolation_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	switch (card->options.isolation) {

	case ISOLATION_MODE_NONE:

		return snprintf(buf, 6, "%s\n", ATTR_QETH_ISOLATION_NONE);
@@ -475,9 +429,6 @@ static ssize_t qeth_dev_isolation_store(struct device *dev, 
	enum qeth_ipa_isolation_modes isolation;

	int rc = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (!IS_OSD(card) && !IS_OSX(card)) {

		rc = -EOPNOTSUPP;
@@ -522,9 +473,6 @@ static ssize_t qeth_dev_switch_attrs_show(struct device *dev, 
	struct qeth_switch_info sw_info;

	int	rc = 0;



	if (!card)

		return -EINVAL;



	if (!qeth_card_hw_is_reachable(card))

		return sprintf(buf, "n/a\n");
@@ -555,8 +503,6 @@ static ssize_t qeth_hw_trap_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;

	if (card->info.hwtrap)

		return snprintf(buf, 5, "arm\n");

	else
@@ -570,9 +516,6 @@ static ssize_t qeth_hw_trap_store(struct device *dev, 
	int rc = 0;

	int state = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (qeth_card_hw_is_reachable(card))

		state = 1;
@@ -607,24 +550,12 @@ static ssize_t qeth_hw_trap_store(struct device *dev, 
static DEVICE_ATTR(hw_trap, 0644, qeth_hw_trap_show,

		   qeth_hw_trap_store);



static ssize_t qeth_dev_blkt_show(char *buf, struct qeth_card *card, int value)

{



	if (!card)

		return -EINVAL;



	return sprintf(buf, "%i\n", value);

}



static ssize_t qeth_dev_blkt_store(struct qeth_card *card,

		const char *buf, size_t count, int *value, int max_value)

{

	char *tmp;

	int i, rc = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (card->state != CARD_STATE_DOWN) {

		rc = -EPERM;
@@ -645,7 +576,7 @@ static ssize_t qeth_dev_blkt_total_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	return qeth_dev_blkt_show(buf, card, card->info.blkt.time_total);

	return sprintf(buf, "%i\n", card->info.blkt.time_total);

}



static ssize_t qeth_dev_blkt_total_store(struct device *dev,
@@ -657,8 +588,6 @@ static ssize_t qeth_dev_blkt_total_store(struct device *dev, 
				   &card->info.blkt.time_total, 5000);

}







static DEVICE_ATTR(total, 0644, qeth_dev_blkt_total_show,

		   qeth_dev_blkt_total_store);
@@ -667,7 +596,7 @@ static ssize_t qeth_dev_blkt_inter_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	return qeth_dev_blkt_show(buf, card, card->info.blkt.inter_packet);

	return sprintf(buf, "%i\n", card->info.blkt.inter_packet);

}



static ssize_t qeth_dev_blkt_inter_store(struct device *dev,
@@ -687,8 +616,7 @@ static ssize_t qeth_dev_blkt_inter_jumbo_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	return qeth_dev_blkt_show(buf, card,

				  card->info.blkt.inter_packet_jumbo);

	return sprintf(buf, "%i\n", card->info.blkt.inter_packet_jumbo);

}



static ssize_t qeth_dev_blkt_inter_jumbo_store(struct device *dev,

drivers/s390/net/qeth_ethtool.c

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ static const struct qeth_stats card_stats[] = { 
	QETH_CARD_STAT("rx0 SG skbs", rx_sg_skbs),

	QETH_CARD_STAT("rx0 SG page frags", rx_sg_frags),

	QETH_CARD_STAT("rx0 SG page allocs", rx_sg_alloc_page),

	QETH_CARD_STAT("rx0 dropped, no memory", rx_dropped_nomem),

	QETH_CARD_STAT("rx0 dropped, bad format", rx_dropped_notsupp),

};



#define TXQ_STATS_LEN	ARRAY_SIZE(txq_stats)

CRA Git | Maintained and supported by SUSTech CRA and CCSE