| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <48DAE0B9.9010701@pobox.com>
Date: Wed, 24 Sep 2008 20:52:09 -0400
From: Jeff Garzik <jgarzik@...ox.com>
To: frank.blaschka@...ibm.com
CC: netdev@...r.kernel.org, linux-s390@...r.kernel.org,
Ursula Braun <ursula.braun@...ibm.com>
Subject: Re: [patch 2/2] qeth: avoid qeth recovery problems
frank.blaschka@...ibm.com wrote:
> From: Ursula Braun <ursula.braun@...ibm.com>
>
> Do not touch IFF_UP flag during qeth recovery, but invoke dev_close()
> in case of failing recovery.
> Cancel outstanding control commands in case of Data Checks or
> Channel Checks.
> Do not invoke qeth_l2_del_all_mc() in case of a hard stop to speed up
> removal of qeth devices.
>
> Signed-off-by: Ursula Braun <ursula.braun@...ibm.com>
> Signed-off-by: Frank Blaschka <frank.blaschka@...ibm.com>
> ---
>
> drivers/s390/net/qeth_core_main.c | 4 +++-
> drivers/s390/net/qeth_l2_main.c | 11 +++++++----
> drivers/s390/net/qeth_l3_main.c | 8 +++++---
> 3 files changed, 15 insertions(+), 8 deletions(-)
>
> Index: git_linus/drivers/s390/net/qeth_core_main.c
> ===================================================================
> --- git_linus.orig/drivers/s390/net/qeth_core_main.c 2008-09-17 13:46:00.000000000 +0200
> +++ git_linus/drivers/s390/net/qeth_core_main.c 2008-09-19 11:08:55.000000000 +0200
> @@ -760,7 +760,7 @@
> if (sense[SENSE_COMMAND_REJECT_BYTE] &
> SENSE_COMMAND_REJECT_FLAG) {
> QETH_DBF_TEXT(TRACE, 2, "CMDREJi");
> - return 0;
> + return 1;
> }
> if ((sense[2] == 0xaf) && (sense[3] == 0xfe)) {
> QETH_DBF_TEXT(TRACE, 2, "AFFE");
> @@ -884,6 +884,7 @@
> }
> rc = qeth_get_problem(cdev, irb);
> if (rc) {
> + qeth_clear_ipacmd_list(card);
> qeth_schedule_recovery(card);
> goto out;
> }
> @@ -4147,6 +4148,7 @@
> unsigned long flags;
> struct qeth_card *card = dev_get_drvdata(&gdev->dev);
>
> + QETH_DBF_TEXT(SETUP, 2, "removedv");
> if (card->discipline.ccwgdriver) {
> card->discipline.ccwgdriver->remove(gdev);
> qeth_core_free_discipline(card);
> Index: git_linus/drivers/s390/net/qeth_l2_main.c
> ===================================================================
> --- git_linus.orig/drivers/s390/net/qeth_l2_main.c 2008-09-19 11:08:36.000000000 +0200
> +++ git_linus/drivers/s390/net/qeth_l2_main.c 2008-09-19 11:08:55.000000000 +0200
> @@ -395,7 +395,8 @@
> }
> if (card->state == CARD_STATE_SOFTSETUP) {
> qeth_l2_process_vlans(card, 1);
> - qeth_l2_del_all_mc(card);
> + if (!card->use_hard_stop)
> + qeth_l2_del_all_mc(card);
> qeth_clear_ipacmd_list(card);
> card->state = CARD_STATE_HARDSETUP;
> }
> @@ -826,7 +827,6 @@
> }
> card->data.state = CH_STATE_UP;
> card->state = CARD_STATE_UP;
> - card->dev->flags |= IFF_UP;
> netif_start_queue(dev);
>
> if (!card->lan_online && netif_carrier_ok(dev))
> @@ -841,7 +841,6 @@
>
> QETH_DBF_TEXT(TRACE, 4, "qethstop");
> netif_tx_disable(dev);
> - card->dev->flags &= ~IFF_UP;
> if (card->state == CARD_STATE_UP)
> card->state = CARD_STATE_SOFTSETUP;
> return 0;
> @@ -1138,9 +1137,13 @@
> if (!rc)
> PRINT_INFO("Device %s successfully recovered!\n",
> CARD_BUS_ID(card));
> - else
> + else {
> + rtnl_lock();
> + dev_close(card->dev);
> + rtnl_unlock();
> PRINT_INFO("Device %s could not be recovered!\n",
> CARD_BUS_ID(card));
> + }
> return 0;
> }
>
> Index: git_linus/drivers/s390/net/qeth_l3_main.c
> ===================================================================
> --- git_linus.orig/drivers/s390/net/qeth_l3_main.c 2008-09-17 13:46:00.000000000 +0200
> +++ git_linus/drivers/s390/net/qeth_l3_main.c 2008-09-19 11:08:55.000000000 +0200
> @@ -2795,7 +2795,6 @@
> return -ENODEV;
> card->data.state = CH_STATE_UP;
> card->state = CARD_STATE_UP;
> - card->dev->flags |= IFF_UP;
> netif_start_queue(dev);
>
> if (!card->lan_online && netif_carrier_ok(dev))
> @@ -2809,7 +2808,6 @@
>
> QETH_DBF_TEXT(TRACE, 4, "qethstop");
> netif_tx_disable(dev);
> - card->dev->flags &= ~IFF_UP;
> if (card->state == CARD_STATE_UP)
> card->state = CARD_STATE_SOFTSETUP;
> return 0;
> @@ -3218,9 +3216,13 @@
> if (!rc)
> PRINT_INFO("Device %s successfully recovered!\n",
> CARD_BUS_ID(card));
> - else
> + else {
> + rtnl_lock();
> + dev_close(card->dev);
> + rtnl_unlock();
> PRINT_INFO("Device %s could not be recovered!\n",
> CARD_BUS_ID(card));
> + }
> return 0;
applied 1-2
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists