From: Shannon Nelson <shannon.nelson@oracle.com> To: netdev@vger.kernel.org, davem@davemloft.net Cc: sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, Shannon Nelson <shannon.nelson@oracle.com> Subject: [PATCH v2 net-next 6/9] sunvnet: straighten up message event handling logic Date: Tue, 7 Feb 2017 14:12:59 -0800 [thread overview] Message-ID: <1486505582-76823-7-git-send-email-shannon.nelson@oracle.com> (raw) In-Reply-To: <1486505582-76823-1-git-send-email-shannon.nelson@oracle.com> The use of gotos for handling the incoming events made this code harder to read and support than it should be. This patch straightens out and clears up the logic. Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com> --- drivers/net/ethernet/sun/sunvnet_common.c | 94 ++++++++++++++--------------- 1 files changed, 45 insertions(+), 49 deletions(-) diff --git a/drivers/net/ethernet/sun/sunvnet_common.c b/drivers/net/ethernet/sun/sunvnet_common.c index 6cb625a..d2aed2c 100644 --- a/drivers/net/ethernet/sun/sunvnet_common.c +++ b/drivers/net/ethernet/sun/sunvnet_common.c @@ -764,41 +764,37 @@ static int vnet_event_napi(struct vnet_port *port, int budget) struct vio_driver_state *vio = &port->vio; int tx_wakeup, err; int npkts = 0; - int event = (port->rx_event & LDC_EVENT_RESET); - -ldc_ctrl: - if (unlikely(event == LDC_EVENT_RESET || - event == LDC_EVENT_UP)) { - vio_link_state_change(vio, event); - - if (event == LDC_EVENT_RESET) { - vnet_port_reset(port); - vio_port_up(vio); - - /* If the device is running but its tx queue was - * stopped (due to flow control), restart it. - * This is necessary since vnet_port_reset() - * clears the tx drings and thus we may never get - * back a VIO_TYPE_DATA ACK packet - which is - * the normal mechanism to restart the tx queue. - */ - if (netif_running(dev)) - maybe_tx_wakeup(port); - } + + /* we don't expect any other bits */ + BUG_ON(port->rx_event & ~(LDC_EVENT_DATA_READY | + LDC_EVENT_RESET | + LDC_EVENT_UP)); + + /* RESET takes precedent over any other event */ + if (port->rx_event & LDC_EVENT_RESET) { + vio_link_state_change(vio, LDC_EVENT_RESET); + vnet_port_reset(port); + vio_port_up(vio); + + /* If the device is running but its tx queue was + * stopped (due to flow control), restart it. + * This is necessary since vnet_port_reset() + * clears the tx drings and thus we may never get + * back a VIO_TYPE_DATA ACK packet - which is + * the normal mechanism to restart the tx queue. + */ + if (netif_running(dev)) + maybe_tx_wakeup(port); + port->rx_event = 0; return 0; } - /* We may have multiple LDC events in rx_event. Unroll send_events() */ - event = (port->rx_event & LDC_EVENT_UP); - port->rx_event &= ~(LDC_EVENT_RESET | LDC_EVENT_UP); - if (event == LDC_EVENT_UP) - goto ldc_ctrl; - event = port->rx_event; - if (!(event & LDC_EVENT_DATA_READY)) - return 0; - /* we dont expect any other bits than RESET, UP, DATA_READY */ - BUG_ON(event != LDC_EVENT_DATA_READY); + if (port->rx_event & LDC_EVENT_UP) { + vio_link_state_change(vio, LDC_EVENT_UP); + port->rx_event = 0; + return 0; + } err = 0; tx_wakeup = 0; @@ -821,25 +817,25 @@ static int vnet_event_napi(struct vnet_port *port, int budget) pkt->start_idx = vio_dring_next(dr, port->napi_stop_idx); pkt->end_idx = -1; - goto napi_resume; - } - err = ldc_read(vio->lp, &msgbuf, sizeof(msgbuf)); - if (unlikely(err < 0)) { - if (err == -ECONNRESET) - vio_conn_reset(vio); - break; + } else { + err = ldc_read(vio->lp, &msgbuf, sizeof(msgbuf)); + if (unlikely(err < 0)) { + if (err == -ECONNRESET) + vio_conn_reset(vio); + break; + } + if (err == 0) + break; + viodbg(DATA, "TAG [%02x:%02x:%04x:%08x]\n", + msgbuf.tag.type, + msgbuf.tag.stype, + msgbuf.tag.stype_env, + msgbuf.tag.sid); + err = vio_validate_sid(vio, &msgbuf.tag); + if (err < 0) + break; } - if (err == 0) - break; - viodbg(DATA, "TAG [%02x:%02x:%04x:%08x]\n", - msgbuf.tag.type, - msgbuf.tag.stype, - msgbuf.tag.stype_env, - msgbuf.tag.sid); - err = vio_validate_sid(vio, &msgbuf.tag); - if (err < 0) - break; -napi_resume: + if (likely(msgbuf.tag.type == VIO_TYPE_DATA)) { if (msgbuf.tag.stype == VIO_SUBTYPE_INFO) { if (!sunvnet_port_is_up_common(port)) { -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Shannon Nelson <shannon.nelson@oracle.com> To: netdev@vger.kernel.org, davem@davemloft.net Cc: sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, Shannon Nelson <shannon.nelson@oracle.com> Subject: [PATCH v2 net-next 6/9] sunvnet: straighten up message event handling logic Date: Tue, 07 Feb 2017 22:12:59 +0000 [thread overview] Message-ID: <1486505582-76823-7-git-send-email-shannon.nelson@oracle.com> (raw) In-Reply-To: <1486505582-76823-1-git-send-email-shannon.nelson@oracle.com> The use of gotos for handling the incoming events made this code harder to read and support than it should be. This patch straightens out and clears up the logic. Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com> --- drivers/net/ethernet/sun/sunvnet_common.c | 94 ++++++++++++++--------------- 1 files changed, 45 insertions(+), 49 deletions(-) diff --git a/drivers/net/ethernet/sun/sunvnet_common.c b/drivers/net/ethernet/sun/sunvnet_common.c index 6cb625a..d2aed2c 100644 --- a/drivers/net/ethernet/sun/sunvnet_common.c +++ b/drivers/net/ethernet/sun/sunvnet_common.c @@ -764,41 +764,37 @@ static int vnet_event_napi(struct vnet_port *port, int budget) struct vio_driver_state *vio = &port->vio; int tx_wakeup, err; int npkts = 0; - int event = (port->rx_event & LDC_EVENT_RESET); - -ldc_ctrl: - if (unlikely(event = LDC_EVENT_RESET || - event = LDC_EVENT_UP)) { - vio_link_state_change(vio, event); - - if (event = LDC_EVENT_RESET) { - vnet_port_reset(port); - vio_port_up(vio); - - /* If the device is running but its tx queue was - * stopped (due to flow control), restart it. - * This is necessary since vnet_port_reset() - * clears the tx drings and thus we may never get - * back a VIO_TYPE_DATA ACK packet - which is - * the normal mechanism to restart the tx queue. - */ - if (netif_running(dev)) - maybe_tx_wakeup(port); - } + + /* we don't expect any other bits */ + BUG_ON(port->rx_event & ~(LDC_EVENT_DATA_READY | + LDC_EVENT_RESET | + LDC_EVENT_UP)); + + /* RESET takes precedent over any other event */ + if (port->rx_event & LDC_EVENT_RESET) { + vio_link_state_change(vio, LDC_EVENT_RESET); + vnet_port_reset(port); + vio_port_up(vio); + + /* If the device is running but its tx queue was + * stopped (due to flow control), restart it. + * This is necessary since vnet_port_reset() + * clears the tx drings and thus we may never get + * back a VIO_TYPE_DATA ACK packet - which is + * the normal mechanism to restart the tx queue. + */ + if (netif_running(dev)) + maybe_tx_wakeup(port); + port->rx_event = 0; return 0; } - /* We may have multiple LDC events in rx_event. Unroll send_events() */ - event = (port->rx_event & LDC_EVENT_UP); - port->rx_event &= ~(LDC_EVENT_RESET | LDC_EVENT_UP); - if (event = LDC_EVENT_UP) - goto ldc_ctrl; - event = port->rx_event; - if (!(event & LDC_EVENT_DATA_READY)) - return 0; - /* we dont expect any other bits than RESET, UP, DATA_READY */ - BUG_ON(event != LDC_EVENT_DATA_READY); + if (port->rx_event & LDC_EVENT_UP) { + vio_link_state_change(vio, LDC_EVENT_UP); + port->rx_event = 0; + return 0; + } err = 0; tx_wakeup = 0; @@ -821,25 +817,25 @@ static int vnet_event_napi(struct vnet_port *port, int budget) pkt->start_idx = vio_dring_next(dr, port->napi_stop_idx); pkt->end_idx = -1; - goto napi_resume; - } - err = ldc_read(vio->lp, &msgbuf, sizeof(msgbuf)); - if (unlikely(err < 0)) { - if (err = -ECONNRESET) - vio_conn_reset(vio); - break; + } else { + err = ldc_read(vio->lp, &msgbuf, sizeof(msgbuf)); + if (unlikely(err < 0)) { + if (err = -ECONNRESET) + vio_conn_reset(vio); + break; + } + if (err = 0) + break; + viodbg(DATA, "TAG [%02x:%02x:%04x:%08x]\n", + msgbuf.tag.type, + msgbuf.tag.stype, + msgbuf.tag.stype_env, + msgbuf.tag.sid); + err = vio_validate_sid(vio, &msgbuf.tag); + if (err < 0) + break; } - if (err = 0) - break; - viodbg(DATA, "TAG [%02x:%02x:%04x:%08x]\n", - msgbuf.tag.type, - msgbuf.tag.stype, - msgbuf.tag.stype_env, - msgbuf.tag.sid); - err = vio_validate_sid(vio, &msgbuf.tag); - if (err < 0) - break; -napi_resume: + if (likely(msgbuf.tag.type = VIO_TYPE_DATA)) { if (msgbuf.tag.stype = VIO_SUBTYPE_INFO) { if (!sunvnet_port_is_up_common(port)) { -- 1.7.1
next prev parent reply other threads:[~2017-02-07 22:17 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-07 22:12 [PATCH v2 net-next 0/9] sunvnet driver updates Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson 2017-02-07 22:12 ` [PATCH v2 net-next 1/9] sunvnet: make sunvnet common code dynamically loadable Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson 2017-02-08 19:29 ` David Miller 2017-02-08 19:29 ` David Miller 2017-02-08 21:50 ` Shannon Nelson 2017-02-08 21:50 ` Shannon Nelson 2017-02-07 22:12 ` [PATCH v2 net-next 2/9] sunvnet: remove unused variable in maybe_tx_wakeup Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson 2017-02-07 22:12 ` [PATCH v2 net-next 3/9] sunvnet: update version and version printing Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson 2017-02-07 22:12 ` [PATCH v2 net-next 4/9] sunvnet: add driver stats for ethtool support Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson 2017-02-07 22:12 ` [PATCH v2 net-next 5/9] sunvnet: add memory barrier before check for tx enable Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson 2017-02-07 22:12 ` Shannon Nelson [this message] 2017-02-07 22:12 ` [PATCH v2 net-next 6/9] sunvnet: straighten up message event handling logic Shannon Nelson 2017-02-08 15:59 ` Sowmini Varadhan 2017-02-08 15:59 ` Sowmini Varadhan 2017-02-08 16:28 ` Shannon Nelson 2017-02-08 16:28 ` Shannon Nelson 2017-02-08 16:34 ` Sowmini Varadhan 2017-02-08 16:34 ` Sowmini Varadhan 2017-02-07 22:13 ` [PATCH v2 net-next 7/9] sunvnet: remove extra rcu_read_unlocks Shannon Nelson 2017-02-07 22:13 ` Shannon Nelson 2017-02-07 22:13 ` [PATCH v2 net-next 8/9] ldmvsw: update and simplify version string Shannon Nelson 2017-02-07 22:13 ` Shannon Nelson 2017-02-07 22:13 ` [PATCH v2 net-next 9/9] ldmvsw: disable tso and gso for bridge operations Shannon Nelson 2017-02-07 22:13 ` Shannon Nelson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1486505582-76823-7-git-send-email-shannon.nelson@oracle.com \ --to=shannon.nelson@oracle.com \ --cc=davem@davemloft.net \ --cc=linux-kernel@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=sparclinux@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.