Commit 1fe5b012 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 's390-net-updates-2021-12-06' 

Alexandra Winter says:

====================
s390/net: updates 2021-12-06

This brings some maintenance improvements and removes some
unnecessary code checks.
====================

Link: https://lore.kernel.org/r/20211207090452.1155688-1-wintera@linux.ibm.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c0e084e3 6dc490e8

drivers/s390/net/qeth_core.h

+2 −2
Original line number Diff line number Diff line
@@ -1030,8 +1030,6 @@ static inline int qeth_send_simple_setassparms_v6(struct qeth_card *card, 
						 data, QETH_PROT_IPV6);

}



int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb);



extern const struct qeth_discipline qeth_l2_discipline;

extern const struct qeth_discipline qeth_l3_discipline;

extern const struct ethtool_ops qeth_ethtool_ops;
@@ -1099,6 +1097,8 @@ void qeth_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats); 
int qeth_set_real_num_tx_queues(struct qeth_card *card, unsigned int count);

u16 qeth_iqd_select_queue(struct net_device *dev, struct sk_buff *skb,

			  u8 cast_type, struct net_device *sb_dev);

u16 qeth_osa_select_queue(struct net_device *dev, struct sk_buff *skb,

			  struct net_device *sb_dev);

int qeth_open(struct net_device *dev);

int qeth_stop(struct net_device *dev);

drivers/s390/net/qeth_core_main.c

+26 −28
Original line number Diff line number Diff line
@@ -3635,12 +3635,10 @@ static void qeth_check_outbound_queue(struct qeth_qdio_out_q *queue) 
	if ((atomic_read(&queue->used_buffers) <= QETH_LOW_WATERMARK_PACK) ||

	    !atomic_read(&queue->set_pci_flags_count)) {

		unsigned int index, flush_cnt;

		bool q_was_packing;



		spin_lock(&queue->lock);



		index = queue->next_buf_to_fill;

		q_was_packing = queue->do_pack;



		flush_cnt = qeth_switch_to_nonpacking_if_needed(queue);

		if (!flush_cnt && !atomic_read(&queue->set_pci_flags_count))
@@ -3648,7 +3646,6 @@ static void qeth_check_outbound_queue(struct qeth_qdio_out_q *queue) 


		if (flush_cnt) {

			qeth_flush_buffers(queue, index, flush_cnt);

			if (q_was_packing)

			QETH_TXQ_STAT_ADD(queue, bufs_pack, flush_cnt);

		}
@@ -3769,7 +3766,7 @@ static void qeth_qdio_output_handler(struct ccw_device *ccwdev, 
/*

 * Note: Function assumes that we have 4 outbound queues.

 */

int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb)

static int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb)

{

	struct vlan_ethhdr *veth = vlan_eth_hdr(skb);

	u8 tos;
@@ -3814,7 +3811,6 @@ int qeth_get_priority_queue(struct qeth_card *card, struct sk_buff *skb) 
	}

	return card->qdio.default_out_queue;

}

EXPORT_SYMBOL_GPL(qeth_get_priority_queue);



/**

 * qeth_get_elements_for_frags() -	find number of SBALEs for skb frags.
@@ -5575,29 +5571,9 @@ static void qeth_l3_rebuild_skb(struct qeth_card *card, struct sk_buff *skb, 
#endif



static void qeth_receive_skb(struct qeth_card *card, struct sk_buff *skb,

			     struct qeth_hdr *hdr, bool uses_frags)

			     bool uses_frags, bool is_cso)

{

	struct napi_struct *napi = &card->napi;

	bool is_cso;



	switch (hdr->hdr.l2.id) {

#if IS_ENABLED(CONFIG_QETH_L3)

	case QETH_HEADER_TYPE_LAYER3:

		qeth_l3_rebuild_skb(card, skb, hdr);

		is_cso = hdr->hdr.l3.ext_flags & QETH_HDR_EXT_CSUM_TRANSP_REQ;

		break;

#endif

	case QETH_HEADER_TYPE_LAYER2:

		is_cso = hdr->hdr.l2.flags[1] & QETH_HDR_EXT_CSUM_TRANSP_REQ;

		break;

	default:

		/* never happens */

		if (uses_frags)

			napi_free_frags(napi);

		else

			kfree_skb(skb);

		return;

	}



	if (is_cso && (card->dev->features & NETIF_F_RXCSUM)) {

		skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -5654,6 +5630,7 @@ static int qeth_extract_skb(struct qeth_card *card, 
	struct qeth_hdr *hdr;

	struct sk_buff *skb;

	int skb_len = 0;

	bool is_cso;



	element = &buffer->element[*element_no];
@@ -5673,11 +5650,15 @@ static int qeth_extract_skb(struct qeth_card *card, 
	switch (hdr->hdr.l2.id) {

	case QETH_HEADER_TYPE_LAYER2:

		skb_len = hdr->hdr.l2.pkt_length;

		is_cso = hdr->hdr.l2.flags[1] & QETH_HDR_EXT_CSUM_TRANSP_REQ;



		linear_len = ETH_HLEN;

		headroom = 0;

		break;

	case QETH_HEADER_TYPE_LAYER3:

		skb_len = hdr->hdr.l3.length;

		is_cso = hdr->hdr.l3.ext_flags & QETH_HDR_EXT_CSUM_TRANSP_REQ;



		if (!IS_LAYER3(card)) {

			QETH_CARD_STAT_INC(card, rx_dropped_notsupp);

			goto walk_packet;
@@ -5804,7 +5785,12 @@ static int qeth_extract_skb(struct qeth_card *card, 
	*element_no = element - &buffer->element[0];

	*__offset = offset;



	qeth_receive_skb(card, skb, hdr, uses_frags);

#if IS_ENABLED(CONFIG_QETH_L3)

	if (hdr->hdr.l2.id == QETH_HEADER_TYPE_LAYER3)

		qeth_l3_rebuild_skb(card, skb, hdr);

#endif



	qeth_receive_skb(card, skb, uses_frags, is_cso);

	return 0;

}
@@ -7088,6 +7074,18 @@ u16 qeth_iqd_select_queue(struct net_device *dev, struct sk_buff *skb, 
}

EXPORT_SYMBOL_GPL(qeth_iqd_select_queue);



u16 qeth_osa_select_queue(struct net_device *dev, struct sk_buff *skb,

			  struct net_device *sb_dev)

{

	struct qeth_card *card = dev->ml_priv;



	if (qeth_uses_tx_prio_queueing(card))

		return qeth_get_priority_queue(card, skb);



	return netdev_pick_tx(dev, skb, sb_dev);

}

EXPORT_SYMBOL_GPL(qeth_osa_select_queue);



int qeth_open(struct net_device *dev)

{

	struct qeth_card *card = dev->ml_priv;

drivers/s390/net/qeth_l2_main.c

+33 −19
Original line number Diff line number Diff line
@@ -519,19 +519,11 @@ static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb, 
	return NETDEV_TX_OK;

}



static u16 qeth_l2_select_queue(struct net_device *dev, struct sk_buff *skb,

static u16 qeth_l2_iqd_select_queue(struct net_device *dev, struct sk_buff *skb,

				    struct net_device *sb_dev)

{

	struct qeth_card *card = dev->ml_priv;



	if (IS_IQD(card))

		return qeth_iqd_select_queue(dev, skb,

					     qeth_get_ether_cast_type(skb),

	return qeth_iqd_select_queue(dev, skb, qeth_get_ether_cast_type(skb),

				     sb_dev);

	if (qeth_uses_tx_prio_queueing(card))

		return qeth_get_priority_queue(card, skb);



	return netdev_pick_tx(dev, skb, sb_dev);

}



static void qeth_l2_set_rx_mode(struct net_device *dev)
@@ -726,7 +718,8 @@ struct qeth_l2_br2dev_event_work { 
	unsigned char addr[ETH_ALEN];

};



static const struct net_device_ops qeth_l2_netdev_ops;

static const struct net_device_ops qeth_l2_iqd_netdev_ops;

static const struct net_device_ops qeth_l2_osa_netdev_ops;



static bool qeth_l2_must_learn(struct net_device *netdev,

			       struct net_device *dstdev)
@@ -738,7 +731,8 @@ static bool qeth_l2_must_learn(struct net_device *netdev, 
		(priv->brport_features & BR_LEARNING_SYNC) &&

		!(br_port_flag_is_set(netdev, BR_ISOLATED) &&

		  br_port_flag_is_set(dstdev, BR_ISOLATED)) &&

		netdev->netdev_ops == &qeth_l2_netdev_ops);

		(netdev->netdev_ops == &qeth_l2_iqd_netdev_ops ||

		 netdev->netdev_ops == &qeth_l2_osa_netdev_ops));

}



/**
@@ -1051,13 +1045,13 @@ static int qeth_l2_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh, 
	return rc;

}



static const struct net_device_ops qeth_l2_netdev_ops = {

static const struct net_device_ops qeth_l2_iqd_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_features_check	= qeth_features_check,

	.ndo_select_queue	= qeth_l2_select_queue,

	.ndo_select_queue	= qeth_l2_iqd_select_queue,

	.ndo_validate_addr	= qeth_l2_validate_addr,

	.ndo_set_rx_mode	= qeth_l2_set_rx_mode,

	.ndo_eth_ioctl		= qeth_do_ioctl,
@@ -1072,10 +1066,30 @@ static const struct net_device_ops qeth_l2_netdev_ops = { 
	.ndo_bridge_setlink	= qeth_l2_bridge_setlink,

};



static const struct net_device_ops qeth_l2_osa_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_features_check	= qeth_features_check,

	.ndo_select_queue	= qeth_osa_select_queue,

	.ndo_validate_addr	= qeth_l2_validate_addr,

	.ndo_set_rx_mode	= qeth_l2_set_rx_mode,

	.ndo_eth_ioctl		= qeth_do_ioctl,

	.ndo_siocdevprivate	= qeth_siocdevprivate,

	.ndo_set_mac_address    = qeth_l2_set_mac_address,

	.ndo_vlan_rx_add_vid	= qeth_l2_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid   = qeth_l2_vlan_rx_kill_vid,

	.ndo_tx_timeout		= qeth_tx_timeout,

	.ndo_fix_features	= qeth_fix_features,

	.ndo_set_features	= qeth_set_features,

};



static int qeth_l2_setup_netdev(struct qeth_card *card)

{

	card->dev->netdev_ops = IS_IQD(card) ? &qeth_l2_iqd_netdev_ops :

					       &qeth_l2_osa_netdev_ops;

	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)) {

drivers/s390/net/qeth_l3_main.c

+1 −12
Original line number Diff line number Diff line
@@ -1822,17 +1822,6 @@ static u16 qeth_l3_iqd_select_queue(struct net_device *dev, struct sk_buff *skb, 
				     qeth_l3_get_cast_type(skb, proto), sb_dev);

}



static u16 qeth_l3_osa_select_queue(struct net_device *dev, struct sk_buff *skb,

				    struct net_device *sb_dev)

{

	struct qeth_card *card = dev->ml_priv;



	if (qeth_uses_tx_prio_queueing(card))

		return qeth_get_priority_queue(card, skb);



	return netdev_pick_tx(dev, skb, sb_dev);

}



static const struct net_device_ops qeth_l3_netdev_ops = {

	.ndo_open		= qeth_open,

	.ndo_stop		= qeth_stop,
@@ -1854,7 +1843,7 @@ static const struct net_device_ops qeth_l3_osa_netdev_ops = { 
	.ndo_get_stats64	= qeth_get_stats64,

	.ndo_start_xmit		= qeth_l3_hard_start_xmit,

	.ndo_features_check	= qeth_l3_osa_features_check,

	.ndo_select_queue	= qeth_l3_osa_select_queue,

	.ndo_select_queue	= qeth_osa_select_queue,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_rx_mode	= qeth_l3_set_rx_mode,

	.ndo_eth_ioctl		= qeth_do_ioctl,