s390/qeth: fixes 2019-12-18
Subsystems (4)
cover s390/qeth: fixes 2019-12-18
Hi Dave,
please apply the following patch series to your net tree. This brings two fixes for initialization / teardown issues, and one ENOTSUPP cleanup.
Thanks,
Julian
Julian Wiedmann (3):
s390/qeth: handle error due to unsupported transport mode s390/qeth: fix promiscuous mode after reset s390/qeth: don't return -ENOTSUPP to userspace
drivers/s390/net/qeth_core_main.c | 14 +++++++------- drivers/s390/net/qeth_core_mpc.h | 5 +++++ drivers/s390/net/qeth_core_sys.c | 2 +- drivers/s390/net/qeth_l2_main.c | 1 + drivers/s390/net/qeth_l2_sys.c | 3 ++- drivers/s390/net/qeth_l3_main.c | 1 + 6 files changed, 17 insertions(+), 9 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/3 s390/qeth: handle error due to unsupported transport mode
Along with z/VM NICs, there's additional device types that only support a specific transport mode (eg. external-bridged IQD). Identify the corresponding error code, and raise a fitting error message so that the user knows to adjust their device configuration.
On top of that also fix the subsequent error path, so that the rejected cmd doesn't need to wait for a timeout but gets cancelled straight away.
--- drivers/s390/net/qeth_core_main.c | 14 +++++++------- drivers/s390/net/qeth_core_mpc.h | 5 +++++ 2 files changed, 12 insertions(+), 7 deletions(-)
drivers/s390/net/qeth_core_main.c +7 -7
@@ -655,17 +655,17 @@ static int qeth_check_idx_response(struct qeth_card *card, unsigned char *buffer) {QETH_DBF_HEX (CTRL ,2 , buffer,QETH_DBF_CTRL_LEN ); -if ((buffer[2 ] &0xc0 ) ==0xc0 ) { +if ((buffer[2 ] &QETH_IDX_TERMINATE_MASK ) ==QETH_IDX_TERMINATE ) {QETH_DBF_MESSAGE (2 ,"received an IDX TERMINATE with cause code %#04x\n" , buffer[4 ]);QETH_CARD_TEXT (card,2 ,"ckidxres" );QETH_CARD_TEXT (card,2 ," idxterm" ); -QETH_CARD_TEXT_ (card,2 ," rc%d" , -EIO ); -if (buffer[4 ] ==0xf6 ) { +QETH_CARD_TEXT_ (card,2 ,"rc%x" , buffer[4 ]); +if (buffer[4 ] ==QETH_IDX_TERM_BAD_TRANSPORT || + buffer[4 ] ==QETH_IDX_TERM_BAD_TRANSPORT_VM ) {dev_err (&card->gdev->dev, -"The qeth device is not configured " -"for the OSI layer required by z/VM\n" ); -return -EPERM ; +"The device does not support the configured transport mode\n" ); +return -EPROTONOSUPPORT ; }return -EIO ; }
@@ -742,10 +742,10 @@ static void qeth_issue_next_read_cb(struct qeth_card *card,case 0 :break ;case -EIO : -qeth_clear_ipacmd_list (card);qeth_schedule_recovery (card);/* fall through */ default : +qeth_clear_ipacmd_list (card); goto out; }
drivers/s390/net/qeth_core_mpc.h +5 -0
@@ -899,6 +899,11 @@ extern unsigned char IDX_ACTIVATE_WRITE[];#define QETH_IDX_ACT_ERR_AUTH 0x1E#define QETH_IDX_ACT_ERR_AUTH_USER 0x20 +#define QETH_IDX_TERMINATE 0xc0 +#define QETH_IDX_TERMINATE_MASK 0xc0 +#define QETH_IDX_TERM_BAD_TRANSPORT 0x41 +#define QETH_IDX_TERM_BAD_TRANSPORT_VM 0xf6 +#define PDU_ENCAPSULATION (buffer) \ (buffer + *(buffer + (*(buffer + 0x0b)) + \ *(buffer + *(buffer + 0x0b) + 0x11) + 0x07))
Signature · 1 line
2.17.1
PATCH 2/3 s390/qeth: fix promiscuous mode after reset
In reply to Julian WiedmannWhen managing the promiscuous mode during an RX modeset, qeth caches the current HW state to avoid repeated programming of the same state on each modeset.
But while tearing down a device, we forget to clear the cached state. So when the device is later set online again, the initial RX modeset doesn't program the promiscuous mode since we believe it is already enabled.
Fix this by clearing the cached state in the tear-down path.
Note that for the SBP variant of promiscuous mode, this accidentally works right now because we unconditionally restore the SBP role while re-initializing.
--- drivers/s390/net/qeth_l2_main.c | 1 + drivers/s390/net/qeth_l2_sys.c | 3 ++- drivers/s390/net/qeth_l3_main.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/s390/net/qeth_l2_main.c +1 -0
@@ -295,6 +295,7 @@ static void qeth_l2_stop_card(struct qeth_card *card)flush_workqueue (card->event_wq); card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED ; + card->info.promisc_mode =0 ; } static int qeth_l2_process_inbound_buffer(struct qeth_card *card,
drivers/s390/net/qeth_l2_sys.c +2 -1
@@ -262,7 +262,8 @@ void qeth_l2_setup_bridgeport_attrs(struct qeth_card *card)return ;mutex_lock (&card->sbp_lock); -if (card->options.sbp.role !=QETH_SBP_ROLE_NONE ) { +if (!card->options.sbp.reflect_promisc && + card->options.sbp.role !=QETH_SBP_ROLE_NONE ) {/* Conditional to avoid spurious error messages */ qeth_bridgeport_setrole (card, card->options.sbp.role);/* Let the callback function refresh the stored role value. */
drivers/s390/net/qeth_l3_main.c +1 -0
@@ -1314,6 +1314,7 @@ static void qeth_l3_stop_card(struct qeth_card *card) }flush_workqueue (card->event_wq); + card->info.promisc_mode =0 ; }static void qeth_l3_set_promisc_mode (struct qeth_card *card)
Signature · 1 line
2.17.1
PATCH 3/3 s390/qeth: don't return -ENOTSUPP to userspace
In reply to Julian WiedmannENOTSUPP is not uapi, use EOPNOTSUPP instead.
--- drivers/s390/net/qeth_core_sys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/net/qeth_core_sys.c +1 -1
@@ -207,7 +207,7 @@ static ssize_t qeth_dev_prioqing_store(struct device *dev, card->qdio.default_out_queue =QETH_DEFAULT_QUEUE ; }else if (sysfs_streq (buf,"prio_queueing_vlan" )) {if (IS_LAYER3 (card)) { - rc = -ENOTSUPP ; + rc = -EOPNOTSUPP ; goto out; } card->qdio.do_prio_queueing =QETH_PRIO_Q_ING_VLAN ;
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Julian Wiedmann <[email protected]>
Date: Wed, 18 Dec 2019 16:32:25 +0100
Quoted 3 lines
please apply the following patch series to your net tree. This brings two fixes for initialization / teardown issues, and one ENOTSUPP cleanup.
Series applied, thanks.