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

Merge branch 's390-qeth-next' 



Julian Wiedmann says:

====================
s390/qeth: updates 2020-05-06

please apply the following patch series for qeth to netdev's net-next
tree.
Same patches as yesterday, except that the ethtool reset has been
dropped for now.

This primarily adds infrastructure to deal with HW offloads when the
packets get forwarded over the adapter's internal switch.
Aside from that, just some minor tweaking for the TX code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2f864990 dc9c404f

drivers/s390/net/Kconfig

+3 −6
Original line number Diff line number Diff line
@@ -63,12 +63,9 @@ config QETH 
	prompt "Gigabit Ethernet device support"

	depends on CCW && NETDEVICES && IP_MULTICAST && QDIO && ETHERNET

	help

	  This driver supports the IBM System z OSA Express adapters

	  in QDIO mode (all media types), HiperSockets interfaces and z/VM

	  virtual NICs for Guest LAN and VSWITCH.

	

	  For details please refer to the documentation provided by IBM at

	  <http://www.ibm.com/developerworks/linux/linux390>

	  This driver supports IBM's OSA Express network adapters in QDIO mode,

	  HiperSockets interfaces and z/VM virtual NICs for Guest LAN and

	  VSWITCH.



	  To compile this driver as a module, choose M.

	  The module name is qeth.

drivers/s390/net/qeth_core.h

+41 −8
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define __QETH_CORE_H__



#include <linux/completion.h>

#include <linux/debugfs.h>

#include <linux/if.h>

#include <linux/if_arp.h>

#include <linux/etherdevice.h>
@@ -21,8 +22,10 @@ 
#include <linux/seq_file.h>

#include <linux/hashtable.h>

#include <linux/ip.h>

#include <linux/rcupdate.h>

#include <linux/refcount.h>

#include <linux/timer.h>

#include <linux/types.h>

#include <linux/wait.h>

#include <linux/workqueue.h>
@@ -31,6 +34,7 @@ 
#include <net/ipv6.h>

#include <net/if_inet6.h>

#include <net/addrconf.h>

#include <net/route.h>

#include <net/sch_generic.h>

#include <net/tcp.h>
@@ -231,11 +235,7 @@ struct qeth_hdr_layer3 { 
	__u16 frame_offset;

	union {

		/* TX: */

		struct in6_addr ipv6_addr;

		struct ipv4 {

			u8 res[12];

			u32 addr;

		} ipv4;

		struct in6_addr addr;

		/* RX: */

		struct rx {

			u8 res1[2];
@@ -352,10 +352,15 @@ static inline bool qeth_l3_same_next_hop(struct qeth_hdr_layer3 *h1, 
					 struct qeth_hdr_layer3 *h2)

{

	return !((h1->flags ^ h2->flags) & QETH_HDR_IPV6) &&

	       ipv6_addr_equal(&h1->next_hop.ipv6_addr,

			       &h2->next_hop.ipv6_addr);

	       ipv6_addr_equal(&h1->next_hop.addr, &h2->next_hop.addr);

}



struct qeth_local_addr {

	struct hlist_node hnode;

	struct rcu_head rcu;

	struct in6_addr addr;

};



enum qeth_qdio_info_states {

	QETH_QDIO_UNINITIALIZED,

	QETH_QDIO_ALLOCATED,
@@ -688,6 +693,9 @@ struct qeth_card_info { 
	u8 promisc_mode:1;

	u8 use_v1_blkt:1;

	u8 is_vm_nic:1;

	/* no bitfield, we take a pointer on these two: */

	u8 has_lp2lp_cso_v6;

	u8 has_lp2lp_cso_v4;

	enum qeth_card_types type;

	enum qeth_link_types link_type;

	int broadcast_capable;
@@ -786,6 +794,7 @@ struct qeth_card { 
	struct qeth_channel data;



	struct net_device *dev;

	struct dentry *debugfs;

	struct qeth_card_stats stats;

	struct qeth_card_info info;

	struct qeth_token token;
@@ -797,6 +806,10 @@ struct qeth_card { 
	wait_queue_head_t wait_q;

	DECLARE_HASHTABLE(mac_htable, 4);

	DECLARE_HASHTABLE(ip_htable, 4);

	DECLARE_HASHTABLE(local_addrs4, 4);

	DECLARE_HASHTABLE(local_addrs6, 4);

	spinlock_t local_addrs4_lock;

	spinlock_t local_addrs6_lock;

	struct mutex ip_lock;

	DECLARE_HASHTABLE(ip_mc_htable, 4);

	struct work_struct rx_mode_work;
@@ -928,6 +941,25 @@ static inline struct dst_entry *qeth_dst_check_rcu(struct sk_buff *skb, int ipv) 
	return dst;

}



static inline __be32 qeth_next_hop_v4_rcu(struct sk_buff *skb,

					  struct dst_entry *dst)

{

	struct rtable *rt = (struct rtable *) dst;



	return (rt) ? rt_nexthop(rt, ip_hdr(skb)->daddr) : ip_hdr(skb)->daddr;

}



static inline struct in6_addr *qeth_next_hop_v6_rcu(struct sk_buff *skb,

						    struct dst_entry *dst)

{

	struct rt6_info *rt = (struct rt6_info *) dst;



	if (rt && !ipv6_addr_any(&rt->rt6i_gateway))

		return &rt->rt6i_gateway;

	else

		return &ipv6_hdr(skb)->daddr;

}



static inline void qeth_tx_csum(struct sk_buff *skb, u8 *flags, int ipv)

{

	*flags |= QETH_HDR_EXT_CSUM_TRANSP_REQ;
@@ -1021,7 +1053,8 @@ struct qeth_cmd_buffer *qeth_get_diag_cmd(struct qeth_card *card, 
void qeth_notify_cmd(struct qeth_cmd_buffer *iob, int reason);

void qeth_put_cmd(struct qeth_cmd_buffer *iob);



void qeth_schedule_recovery(struct qeth_card *);

int qeth_schedule_recovery(struct qeth_card *card);

void qeth_flush_local_addrs(struct qeth_card *card);

int qeth_poll(struct napi_struct *napi, int budget);

void qeth_clear_ipacmd_list(struct qeth_card *);

int qeth_qdio_clear_card(struct qeth_card *, int);

drivers/s390/net/qeth_core_main.c

+400 −65

File changed.

Preview size limit exceeded, changes collapsed.

drivers/s390/net/qeth_core_mpc.h

+25 −0
Original line number Diff line number Diff line
@@ -772,6 +772,29 @@ struct qeth_ipacmd_addr_change { 
	struct qeth_ipacmd_addr_change_entry entry[];

} __packed;



/* [UN]REGISTER_LOCAL_ADDRESS notifications */

struct qeth_ipacmd_local_addr4 {

	__be32 addr;

	u32 flags;

};



struct qeth_ipacmd_local_addrs4 {

	u32 count;

	u32 addr_length;

	struct qeth_ipacmd_local_addr4 addrs[];

};



struct qeth_ipacmd_local_addr6 {

	struct in6_addr addr;

	u32 flags;

};



struct qeth_ipacmd_local_addrs6 {

	u32 count;

	u32 addr_length;

	struct qeth_ipacmd_local_addr6 addrs[];

};



/* Header for each IPA command */

struct qeth_ipacmd_hdr {

	__u8   command;
@@ -803,6 +826,8 @@ struct qeth_ipa_cmd { 
		struct qeth_ipacmd_setbridgeport	sbp;

		struct qeth_ipacmd_addr_change		addrchange;

		struct qeth_ipacmd_vnicc		vnicc;

		struct qeth_ipacmd_local_addrs4		local_addrs4;

		struct qeth_ipacmd_local_addrs6		local_addrs6;

	} data;

} __attribute__ ((packed));

drivers/s390/net/qeth_core_sys.c

+9 −6
Original line number Diff line number Diff line
@@ -275,17 +275,20 @@ static ssize_t qeth_dev_recover_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;

	bool reset;

	int rc;



	rc = kstrtobool(buf, &reset);

	if (rc)

		return rc;



	if (!qeth_card_hw_is_reachable(card))

		return -EPERM;



	i = simple_strtoul(buf, &tmp, 16);

	if (i == 1)

		qeth_schedule_recovery(card);

	if (reset)

		rc = qeth_schedule_recovery(card);



	return count;

	return rc ? rc : count;

}



static DEVICE_ATTR(recover, 0200, NULL, qeth_dev_recover_store);

CRA Git | Maintained and supported by SUSTech CRA and CCSE