netdev - RE: [PATCH net] be2net: call napi_disable() for all event queues

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <f158e8ac-98d2-4be4-b801-20a18912d672@CMEXHTCAS1.ad.emulex.com>
Date:	Wed, 27 Nov 2013 05:28:02 +0000
From:	Sathya Perla <Sathya.Perla@...lex.Com>
To:	Ivan Vecera <ivecera@...hat.com>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>
CC:	Subramanian Seetharaman <subbu.seetharaman@...lex.com>,
	Ajit Khaparde <Ajit.Khaparde@...lex.Com>
Subject: RE: [PATCH net] be2net: call napi_disable() for all event queues

> -----Original Message-----
> From: Ivan Vecera [mailto:ivecera@...hat.com]
> 
> The recent be2net commit 6384a4d (adds a support for busy polling)
> introduces a regression that results in kernel crash. It incorrectly
> modified be_close() so napi_disable() is called only for the first queue.
> This breaks a correct pairing of napi_enable/_disable for the rest
> of event queues and causes a crash in subsequent be_open() call.
> 
> Cc: Sathya Perla <sathya.perla@...lex.com>
> Cc: Subbu Seetharaman <subbu.seetharaman@...lex.com>
> Cc: Ajit Khaparde <ajit.khaparde@...lex.com>
> Signed-off-by: Ivan Vecera <ivecera@...hat.com>
> ---
>  drivers/net/ethernet/emulex/benet/be_main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/emulex/benet/be_main.c
> b/drivers/net/ethernet/emulex/benet/be_main.c
> index 78a0e85..0aec4d2 100644
> --- a/drivers/net/ethernet/emulex/benet/be_main.c
> +++ b/drivers/net/ethernet/emulex/benet/be_main.c
> @@ -2663,8 +2663,8 @@ static int be_close(struct net_device *netdev)
>  			napi_disable(&eqo->napi);
>  			be_disable_busy_poll(eqo);
>  		}
> -		adapter->flags &= ~BE_FLAGS_NAPI_ENABLED;
>  	}
> +	adapter->flags &= ~BE_FLAGS_NAPI_ENABLED;
> 

Ivan, Thanks for spotting this.
Your fix is correct but it'll be nice if the for-loop for napi_disable
is not even entered when FLAGS_NAPI_ENABLED is not set, as in:

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 603b662..40d2adb 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2658,8 +2658,8 @@ static int be_close(struct net_device *netdev)
 
 	be_roce_dev_close(adapter);
 
-	for_all_evt_queues(adapter, eqo, i) {
-		if (adapter->flags & BE_FLAGS_NAPI_ENABLED) {
+	if (adapter->flags & BE_FLAGS_NAPI_ENABLED) {
+		for_all_evt_queues(adapter, eqo, i) {
 			napi_disable(&eqo->napi);
 			be_disable_busy_poll(eqo);
 		}

Could you also add the following line to your patch as it fixes a
regression caused by an older be2net commit:
Fixes: 6384a4d0dcf9 ("be2net: add support for ndo_busy_poll")

-Sathya
--
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