* [patch 1/6] HiperSockets mcl string conversion (pre z9 mach)
2009-01-02 15:01 [patch 0/6] s390: qeth fixes 2.6.29 frank.blaschka
@ 2009-01-02 15:01 ` frank.blaschka
2009-01-05 1:36 ` David Miller
2009-01-02 15:01 ` [patch 2/6] qeth: exploit source MAC address for inbound layer3 packets frank.blaschka
` (4 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: frank.blaschka @ 2009-01-02 15:01 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-s390, Klaus-Dieter Wacker
[-- Attachment #1: 605-qeth-mcl.diff --]
[-- Type: text/plain, Size: 1013 bytes --]
From: Klaus-Dieter Wacker <kdwacker@de.ibm.com>
The pre z9 machines provide an mcl string in EBCDIC format,
z9 or later provide string in ASCII format.
Signed-off-by: Klaus-Dieter Wacker <kdwacker@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
drivers/s390/net/qeth_core_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -urpN linux-2.6/drivers/s390/net/qeth_core_main.c linux-2.6-patched/drivers/s390/net/qeth_core_main.c
--- linux-2.6/drivers/s390/net/qeth_core_main.c 2009-01-02 10:21:51.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_core_main.c 2009-01-02 10:22:05.000000000 +0100
@@ -2250,7 +2250,8 @@ void qeth_print_status_message(struct qe
}
/* fallthrough */
case QETH_CARD_TYPE_IQD:
- if (card->info.guestlan) {
+ if ((card->info.guestlan) ||
+ (card->info.mcl_level[0] & 0x80)) {
card->info.mcl_level[0] = (char) _ebcasc[(__u8)
card->info.mcl_level[0]];
card->info.mcl_level[1] = (char) _ebcasc[(__u8)
--
^ permalink raw reply [flat|nested] 13+ messages in thread* [patch 2/6] qeth: exploit source MAC address for inbound layer3 packets
2009-01-02 15:01 [patch 0/6] s390: qeth fixes 2.6.29 frank.blaschka
2009-01-02 15:01 ` [patch 1/6] HiperSockets mcl string conversion (pre z9 mach) frank.blaschka
@ 2009-01-02 15:01 ` frank.blaschka
2009-01-05 1:36 ` David Miller
2009-01-02 15:01 ` [patch 3/6] qeth: avoid crash in case of layer mismatch for VSWITCH frank.blaschka
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: frank.blaschka @ 2009-01-02 15:01 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-s390, Ursula Braun
[-- Attachment #1: 606-qeth-source-mac.diff --]
[-- Type: text/plain, Size: 3196 bytes --]
From: Ursula Braun <ursula.braun@de.ibm.com>
OSA-devices operating in layer3 mode offer adding of the source MAC
address to the QDIO header of inbound packets. The qeth driver can
exploit this functionality to replace FAKELL-entries in the ethernet
header of received packets.
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
drivers/s390/net/qeth_core.h | 1 -
drivers/s390/net/qeth_core_main.c | 1 -
drivers/s390/net/qeth_l3_main.c | 16 +++++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
diff -urpN linux-2.6/drivers/s390/net/qeth_core.h linux-2.6-patched/drivers/s390/net/qeth_core.h
--- linux-2.6/drivers/s390/net/qeth_core.h 2009-01-02 10:21:51.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_core.h 2009-01-02 10:22:06.000000000 +0100
@@ -643,7 +643,6 @@ struct qeth_card_options {
int macaddr_mode;
int fake_broadcast;
int add_hhlen;
- int fake_ll;
int layer2;
enum qeth_large_send_types large_send;
int performance_stats;
diff -urpN linux-2.6/drivers/s390/net/qeth_core_main.c linux-2.6-patched/drivers/s390/net/qeth_core_main.c
--- linux-2.6/drivers/s390/net/qeth_core_main.c 2009-01-02 10:22:06.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_core_main.c 2009-01-02 10:22:06.000000000 +0100
@@ -1072,7 +1072,6 @@ static void qeth_set_intial_options(stru
card->options.macaddr_mode = QETH_TR_MACADDR_NONCANONICAL;
card->options.fake_broadcast = 0;
card->options.add_hhlen = DEFAULT_ADD_HHLEN;
- card->options.fake_ll = 0;
card->options.performance_stats = 0;
card->options.rx_sg_cb = QETH_RX_SG_CB;
}
diff -urpN linux-2.6/drivers/s390/net/qeth_l3_main.c linux-2.6-patched/drivers/s390/net/qeth_l3_main.c
--- linux-2.6/drivers/s390/net/qeth_l3_main.c 2009-01-02 10:21:51.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_l3_main.c 2009-01-02 10:22:06.000000000 +0100
@@ -1207,12 +1207,9 @@ static int qeth_l3_start_ipa_source_mac(
QETH_DBF_TEXT(TRACE, 3, "stsrcmac");
- if (!card->options.fake_ll)
- return -EOPNOTSUPP;
-
if (!qeth_is_supported(card, IPA_SOURCE_MAC)) {
dev_info(&card->gdev->dev,
- "Inbound source address not supported on %s\n",
+ "Inbound source MAC-address not supported on %s\n",
QETH_CARD_IFNAME(card));
return -EOPNOTSUPP;
}
@@ -1221,7 +1218,7 @@ static int qeth_l3_start_ipa_source_mac(
IPA_CMD_ASS_START, 0);
if (rc)
dev_warn(&card->gdev->dev,
- "Starting proxy ARP support for %s failed\n",
+ "Starting source MAC-address support for %s failed\n",
QETH_CARD_IFNAME(card));
return rc;
}
@@ -1921,8 +1918,13 @@ static inline __u16 qeth_l3_rebuild_skb(
memcpy(tg_addr, card->dev->dev_addr,
card->dev->addr_len);
}
- card->dev->header_ops->create(skb, card->dev, prot, tg_addr,
- "FAKELL", card->dev->addr_len);
+ if (hdr->hdr.l3.ext_flags & QETH_HDR_EXT_SRC_MAC_ADDR)
+ card->dev->header_ops->create(skb, card->dev, prot,
+ tg_addr, &hdr->hdr.l3.dest_addr[2],
+ card->dev->addr_len);
+ else
+ card->dev->header_ops->create(skb, card->dev, prot,
+ tg_addr, "FAKELL", card->dev->addr_len);
}
#ifdef CONFIG_TR
--
^ permalink raw reply [flat|nested] 13+ messages in thread* [patch 3/6] qeth: avoid crash in case of layer mismatch for VSWITCH
2009-01-02 15:01 [patch 0/6] s390: qeth fixes 2.6.29 frank.blaschka
2009-01-02 15:01 ` [patch 1/6] HiperSockets mcl string conversion (pre z9 mach) frank.blaschka
2009-01-02 15:01 ` [patch 2/6] qeth: exploit source MAC address for inbound layer3 packets frank.blaschka
@ 2009-01-02 15:01 ` frank.blaschka
2009-01-05 1:36 ` David Miller
2009-01-02 15:01 ` [patch 4/6] qeth: do not spin for SETIP ip assist command frank.blaschka
` (2 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: frank.blaschka @ 2009-01-02 15:01 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-s390, Ursula Braun
[-- Attachment #1: 607-qeth-layercrash.diff --]
[-- Type: text/plain, Size: 2781 bytes --]
From: Ursula Braun <ursula.braun@de.ibm.com>
For z/VM GuestLAN or VSWITCH devices the transport layer is
configured in z/VM. The layer2 attribute of a participating Linux
device has to match the z/VM definition. In case of a mismatch
Linux currently crashes in qeth recovery due to a reference to the
not yet existing net_device.
Solution: add a check for existence of net_device and add a message
pointing to the mismatch of layer definitions in Linux and z/VM.
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
drivers/s390/net/qeth_core_main.c | 4 ++++
drivers/s390/net/qeth_l2_main.c | 8 +++++---
drivers/s390/net/qeth_l3_main.c | 8 +++++---
3 files changed, 14 insertions(+), 6 deletions(-)
diff -urpN linux-2.6/drivers/s390/net/qeth_core_main.c linux-2.6-patched/drivers/s390/net/qeth_core_main.c
--- linux-2.6/drivers/s390/net/qeth_core_main.c 2009-01-02 10:22:07.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_core_main.c 2009-01-02 10:22:07.000000000 +0100
@@ -572,6 +572,10 @@ static void qeth_send_control_data_cb(st
card = CARD_FROM_CDEV(channel->ccwdev);
if (qeth_check_idx_response(iob->data)) {
qeth_clear_ipacmd_list(card);
+ if (((iob->data[2] & 0xc0) == 0xc0) && iob->data[4] == 0xf6)
+ dev_err(&card->gdev->dev,
+ "The qeth device is not configured "
+ "for the OSI layer required by z/VM\n");
qeth_schedule_recovery(card);
goto out;
}
diff -urpN linux-2.6/drivers/s390/net/qeth_l2_main.c linux-2.6-patched/drivers/s390/net/qeth_l2_main.c
--- linux-2.6/drivers/s390/net/qeth_l2_main.c 2009-01-02 10:21:51.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_l2_main.c 2009-01-02 10:22:07.000000000 +0100
@@ -1126,9 +1126,11 @@ static int qeth_l2_recover(void *ptr)
dev_info(&card->gdev->dev,
"Device successfully recovered!\n");
else {
- rtnl_lock();
- dev_close(card->dev);
- rtnl_unlock();
+ if (card->dev) {
+ rtnl_lock();
+ dev_close(card->dev);
+ rtnl_unlock();
+ }
dev_warn(&card->gdev->dev, "The qeth device driver "
"failed to recover an error on the device\n");
}
diff -urpN linux-2.6/drivers/s390/net/qeth_l3_main.c linux-2.6-patched/drivers/s390/net/qeth_l3_main.c
--- linux-2.6/drivers/s390/net/qeth_l3_main.c 2009-01-02 10:22:07.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_l3_main.c 2009-01-02 10:22:07.000000000 +0100
@@ -2082,9 +2082,11 @@ static int qeth_l3_stop_card(struct qeth
if (recovery_mode)
qeth_l3_stop(card->dev);
else {
- rtnl_lock();
- dev_close(card->dev);
- rtnl_unlock();
+ if (card->dev) {
+ rtnl_lock();
+ dev_close(card->dev);
+ rtnl_unlock();
+ }
}
if (!card->use_hard_stop) {
rc = qeth_send_stoplan(card);
--
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [patch 3/6] qeth: avoid crash in case of layer mismatch for VSWITCH
2009-01-02 15:01 ` [patch 3/6] qeth: avoid crash in case of layer mismatch for VSWITCH frank.blaschka
@ 2009-01-05 1:36 ` David Miller
0 siblings, 0 replies; 13+ messages in thread
From: David Miller @ 2009-01-05 1:36 UTC (permalink / raw)
To: frank.blaschka; +Cc: jgarzik, netdev, linux-s390, ursula.braun
From: frank.blaschka@de.ibm.com
Date: Fri, 02 Jan 2009 16:01:42 +0100
> For z/VM GuestLAN or VSWITCH devices the transport layer is
> configured in z/VM. The layer2 attribute of a participating Linux
> device has to match the z/VM definition. In case of a mismatch
> Linux currently crashes in qeth recovery due to a reference to the
> not yet existing net_device.
> Solution: add a check for existence of net_device and add a message
> pointing to the mismatch of layer definitions in Linux and z/VM.
>
> Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
> Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Applied.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [patch 4/6] qeth: do not spin for SETIP ip assist command
2009-01-02 15:01 [patch 0/6] s390: qeth fixes 2.6.29 frank.blaschka
` (2 preceding siblings ...)
2009-01-02 15:01 ` [patch 3/6] qeth: avoid crash in case of layer mismatch for VSWITCH frank.blaschka
@ 2009-01-02 15:01 ` frank.blaschka
2009-01-05 1:37 ` David Miller
2009-01-02 15:01 ` [patch 5/6] qeth: No large send using EDDP for HiperSockets frank.blaschka
2009-01-02 15:01 ` [patch 6/6] qeth: get rid of extra argument after printk to dev_* conversion frank.blaschka
5 siblings, 1 reply; 13+ messages in thread
From: frank.blaschka @ 2009-01-02 15:01 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-s390
[-- Attachment #1: 608-qeth-nospin.diff --]
[-- Type: text/plain, Size: 2275 bytes --]
From: Frank Blaschka <frank.blaschka@de.ibm.com>
The ip assist hw command for setting an IP address last unacceptable
long so we can not spin while we waiting for the irq. Since we can
ensure process context for all occurrences of this command we can use
wait.
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
drivers/s390/net/qeth_core_main.c | 40 +++++++++++++++++++++++++++-----------
1 file changed, 29 insertions(+), 11 deletions(-)
diff -urpN linux-2.6/drivers/s390/net/qeth_core_main.c linux-2.6-patched/drivers/s390/net/qeth_core_main.c
--- linux-2.6/drivers/s390/net/qeth_core_main.c 2009-01-02 10:22:07.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_core_main.c 2009-01-02 10:22:07.000000000 +0100
@@ -1685,6 +1685,7 @@ int qeth_send_control_data(struct qeth_c
unsigned long flags;
struct qeth_reply *reply = NULL;
unsigned long timeout;
+ struct qeth_ipa_cmd *cmd;
QETH_DBF_TEXT(TRACE, 2, "sendctl");
@@ -1731,17 +1732,34 @@ int qeth_send_control_data(struct qeth_c
wake_up(&card->wait_q);
return rc;
}
- while (!atomic_read(&reply->received)) {
- if (time_after(jiffies, timeout)) {
- spin_lock_irqsave(&reply->card->lock, flags);
- list_del_init(&reply->list);
- spin_unlock_irqrestore(&reply->card->lock, flags);
- reply->rc = -ETIME;
- atomic_inc(&reply->received);
- wake_up(&reply->wait_q);
- }
- cpu_relax();
- };
+
+ /* we have only one long running ipassist, since we can ensure
+ process context of this command we can sleep */
+ cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
+ if ((cmd->hdr.command == IPA_CMD_SETIP) &&
+ (cmd->hdr.prot_version == QETH_PROT_IPV4)) {
+ if (!wait_event_timeout(reply->wait_q,
+ atomic_read(&reply->received), timeout))
+ goto time_err;
+ } else {
+ while (!atomic_read(&reply->received)) {
+ if (time_after(jiffies, timeout))
+ goto time_err;
+ cpu_relax();
+ };
+ }
+
+ rc = reply->rc;
+ qeth_put_reply(reply);
+ return rc;
+
+time_err:
+ spin_lock_irqsave(&reply->card->lock, flags);
+ list_del_init(&reply->list);
+ spin_unlock_irqrestore(&reply->card->lock, flags);
+ reply->rc = -ETIME;
+ atomic_inc(&reply->received);
+ wake_up(&reply->wait_q);
rc = reply->rc;
qeth_put_reply(reply);
return rc;
--
^ permalink raw reply [flat|nested] 13+ messages in thread* [patch 5/6] qeth: No large send using EDDP for HiperSockets.
2009-01-02 15:01 [patch 0/6] s390: qeth fixes 2.6.29 frank.blaschka
` (3 preceding siblings ...)
2009-01-02 15:01 ` [patch 4/6] qeth: do not spin for SETIP ip assist command frank.blaschka
@ 2009-01-02 15:01 ` frank.blaschka
2009-01-05 1:37 ` David Miller
2009-01-02 15:01 ` [patch 6/6] qeth: get rid of extra argument after printk to dev_* conversion frank.blaschka
5 siblings, 1 reply; 13+ messages in thread
From: frank.blaschka @ 2009-01-02 15:01 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-s390, Klaus-Dieter Wacker
[-- Attachment #1: 609-qeth-eddp.diff --]
[-- Type: text/plain, Size: 1242 bytes --]
From: Klaus-Dieter Wacker <kdwacker@de.ibm.com>
The device driver qeth dos not support large send using EDDP for
HiperSockets.
Signed-off-by: Klaus-Dieter Wacker <kdwacker@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
drivers/s390/net/qeth_core_main.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff -urpN linux-2.6/drivers/s390/net/qeth_core_main.c linux-2.6-patched/drivers/s390/net/qeth_core_main.c
--- linux-2.6/drivers/s390/net/qeth_core_main.c 2009-01-02 10:22:08.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_core_main.c 2009-01-02 10:22:08.000000000 +0100
@@ -287,8 +287,15 @@ int qeth_set_large_send(struct qeth_card
card->options.large_send = type;
switch (card->options.large_send) {
case QETH_LARGE_SEND_EDDP:
- card->dev->features |= NETIF_F_TSO | NETIF_F_SG |
+ if (card->info.type != QETH_CARD_TYPE_IQD) {
+ 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;
case QETH_LARGE_SEND_TSO:
if (qeth_is_supported(card, IPA_OUTBOUND_TSO)) {
--
^ permalink raw reply [flat|nested] 13+ messages in thread* [patch 6/6] qeth: get rid of extra argument after printk to dev_* conversion
2009-01-02 15:01 [patch 0/6] s390: qeth fixes 2.6.29 frank.blaschka
` (4 preceding siblings ...)
2009-01-02 15:01 ` [patch 5/6] qeth: No large send using EDDP for HiperSockets frank.blaschka
@ 2009-01-02 15:01 ` frank.blaschka
2009-01-05 1:37 ` David Miller
5 siblings, 1 reply; 13+ messages in thread
From: frank.blaschka @ 2009-01-02 15:01 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linux-s390, Heiko Carstens
[-- Attachment #1: 611-qeth-extra-arg.diff --]
[-- Type: text/plain, Size: 800 bytes --]
From: Heiko Carstens <heiko.carstens@de.ibm.com>
drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_setadapter_parms':
drivers/s390/net/qeth_l3_main.c:1049: warning: too many arguments for format
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
diff -u -r1.42 -r1.43 linux-2.5/drivers/s390/net/qeth_l3_main.c
--- linux-2.5/drivers/s390/net/qeth_l3_main.c 3 Dec 2008 06:44:41 -0000 1.42
+++ linux-2.5/drivers/s390/net/qeth_l3_main.c 2 Jan 2009 11:24:02 -0000 1.43
@@ -1047,7 +1047,7 @@
rc = qeth_setadpparms_change_macaddr(card);
if (rc)
dev_warn(&card->gdev->dev, "Reading the adapter MAC"
- " address failed\n", rc);
+ " address failed\n");
}
if ((card->info.link_type == QETH_LINK_TYPE_HSTR) ||
--
^ permalink raw reply [flat|nested] 13+ messages in thread