Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3b4a740 authored by Frank Blaschka's avatar Frank Blaschka Committed by David S. Miller
Browse files

qeth: rework TSO functions 



The maximum TSO size OSA can handle is 15 * PAGE_SIZE. This
patch reduces gso_max_size to this value and adds some sanity
checks and statistics to the TSO implementation.
Since only layer 3 is able to do TSO move all TSO related functions
to the qeth_l3 module.

Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aa909224

drivers/s390/net/qeth_core.h

+1 −1
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ struct qeth_perf_stats { 
	unsigned int sg_frags_rx;

	unsigned int sg_alloc_page_rx;

	unsigned int tx_csum;

	unsigned int tx_lin;

};



/* Routing stuff */
@@ -835,7 +836,6 @@ void qeth_prepare_ipa_cmd(struct qeth_card *, struct qeth_cmd_buffer *, char); 
struct qeth_cmd_buffer *qeth_wait_for_buffer(struct qeth_channel *);

int qeth_mdio_read(struct net_device *, int, int);

int qeth_snmp_command(struct qeth_card *, char __user *);

int qeth_set_large_send(struct qeth_card *, enum qeth_large_send_types);

struct qeth_cmd_buffer *qeth_get_adapter_cmd(struct qeth_card *, __u32, __u32);

int qeth_default_setadapterparms_cb(struct qeth_card *, struct qeth_reply *,

					unsigned long);

drivers/s390/net/qeth_core_main.c

+2 −35
Original line number Diff line number Diff line
@@ -270,41 +270,6 @@ int qeth_realloc_buffer_pool(struct qeth_card *card, int bufcnt) 
	return qeth_alloc_buffer_pool(card);

}



int qeth_set_large_send(struct qeth_card *card,

		enum qeth_large_send_types type)

{

	int rc = 0;



	if (card->dev == NULL) {

		card->options.large_send = type;

		return 0;

	}

	if (card->state == CARD_STATE_UP)

		netif_tx_disable(card->dev);

	card->options.large_send = type;

	switch (card->options.large_send) {

	case QETH_LARGE_SEND_TSO:

		if (qeth_is_supported(card, IPA_OUTBOUND_TSO)) {

			card->dev->features |= NETIF_F_TSO | NETIF_F_SG |

						NETIF_F_HW_CSUM;

		} else {

			card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |

						NETIF_F_HW_CSUM);

			card->options.large_send = QETH_LARGE_SEND_NO;

			rc = -EOPNOTSUPP;

		}

		break;

	default: /* includes QETH_LARGE_SEND_NO */

		card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |

					NETIF_F_HW_CSUM);

		break;

	}

	if (card->state == CARD_STATE_UP)

		netif_wake_queue(card->dev);

	return rc;

}

EXPORT_SYMBOL_GPL(qeth_set_large_send);



static int qeth_issue_next_read(struct qeth_card *card)

{

	int rc;
@@ -4460,6 +4425,7 @@ static struct { 
	{"tx do_QDIO time"},

	{"tx do_QDIO count"},

	{"tx csum"},

	{"tx lin"},

};



int qeth_core_get_sset_count(struct net_device *dev, int stringset)
@@ -4517,6 +4483,7 @@ void qeth_core_get_ethtool_stats(struct net_device *dev, 
	data[31] = card->perf_stats.outbound_do_qdio_time;

	data[32] = card->perf_stats.outbound_do_qdio_cnt;

	data[33] = card->perf_stats.tx_csum;

	data[34] = card->perf_stats.tx_lin;

}

EXPORT_SYMBOL_GPL(qeth_core_get_ethtool_stats);

drivers/s390/net/qeth_core_sys.c

+0 −48
Original line number Diff line number Diff line
@@ -416,53 +416,6 @@ static ssize_t qeth_dev_layer2_store(struct device *dev, 
static DEVICE_ATTR(layer2, 0644, qeth_dev_layer2_show,

		   qeth_dev_layer2_store);



static ssize_t qeth_dev_large_send_show(struct device *dev,

				struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	switch (card->options.large_send) {

	case QETH_LARGE_SEND_NO:

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

	case QETH_LARGE_SEND_TSO:

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

	default:

		return sprintf(buf, "%s\n", "N/A");

	}

}



static ssize_t qeth_dev_large_send_store(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t count)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	enum qeth_large_send_types type;

	int rc = 0;

	char *tmp;



	if (!card)

		return -EINVAL;

	tmp = strsep((char **) &buf, "\n");

	if (!strcmp(tmp, "no")) {

		type = QETH_LARGE_SEND_NO;

	} else if (!strcmp(tmp, "TSO")) {

		type = QETH_LARGE_SEND_TSO;

	} else {

		return -EINVAL;

	}

	if (card->options.large_send == type)

		return count;

	rc = qeth_set_large_send(card, type);

	if (rc)

		return rc;

	return count;

}



static DEVICE_ATTR(large_send, 0644, qeth_dev_large_send_show,

		   qeth_dev_large_send_store);



#define ATTR_QETH_ISOLATION_NONE	("none")

#define ATTR_QETH_ISOLATION_FWD		("forward")

#define ATTR_QETH_ISOLATION_DROP	("drop")
@@ -658,7 +611,6 @@ static struct attribute *qeth_device_attrs[] = { 
	&dev_attr_recover.attr,

	&dev_attr_performance_stats.attr,

	&dev_attr_layer2.attr,

	&dev_attr_large_send.attr,

	&dev_attr_isolation.attr,

	NULL,

};

drivers/s390/net/qeth_l2_main.c

+0 −1
Original line number Diff line number Diff line
@@ -978,7 +978,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode) 
	if (card->info.type != QETH_CARD_TYPE_OSN) {

		/* configure isolation level */

		qeth_set_access_ctrl_online(card);

		qeth_set_large_send(card, card->options.large_send);

		qeth_l2_process_vlans(card, 0);

	}

drivers/s390/net/qeth_l3.h

+1 −0
Original line number Diff line number Diff line
@@ -60,5 +60,6 @@ void qeth_l3_del_vipa(struct qeth_card *, enum qeth_prot_versions, const u8 *); 
int qeth_l3_add_rxip(struct qeth_card *, enum qeth_prot_versions, const u8 *);

void qeth_l3_del_rxip(struct qeth_card *card, enum qeth_prot_versions,

			const u8 *);

int qeth_l3_set_large_send(struct qeth_card *, enum qeth_large_send_types);



#endif /* __QETH_L3_H__ */