From patchwork Wed Jun 29 19:54:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 9206157 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BEFF56089F for ; Wed, 29 Jun 2016 19:55:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B44EA2862A for ; Wed, 29 Jun 2016 19:55:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A894528609; Wed, 29 Jun 2016 19:55:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51F81285E7 for ; Wed, 29 Jun 2016 19:55:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752000AbcF2TzS (ORCPT ); Wed, 29 Jun 2016 15:55:18 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:35818 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751839AbcF2TzP (ORCPT ); Wed, 29 Jun 2016 15:55:15 -0400 Received: by mail-lf0-f65.google.com with SMTP id w130so6140614lfd.2; Wed, 29 Jun 2016 12:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2FkAmgY0lhpnWHDz/8x4DJA3JoE0gYzwQZQ6HerIApI=; b=Uwq1HkWsS3FkPF5wPQwg/lfDk8qVeVEQfPGhFKBp/UssA71/Nhafy4WhzXdEImrvlr YWzMk/10gRODLohmiVFbgjeZ5KL2qlCOQKV1hmI98NQ0S+joMyxUtt4M7plPCFQ8fulj yF+NWPNJ8+Vh1FmKTHJUr4gT9tXSlPHuQvnyiiqI506sITJYyxyeHLc3psqxsow1Zd+H ENxkHUcBzRmen75OscVcXxFTmmaklKWKTrsOoQ3FFYjt7G6NWKT5gOQfg2y/JVfmakS3 1fSaIOlDelOvOADjnrkOnrRlcYXIpGNWGaBCKHkOLJ3/Hokxc6H91dFBOCMzjKmBYITb XPww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2FkAmgY0lhpnWHDz/8x4DJA3JoE0gYzwQZQ6HerIApI=; b=jAwKejbcyUemdQ731pjxvOhfPX3lLaLW5YkfdvwcQG/G3ZrzNp7K74fluBtR5wjmQM ux2syrfe7mzTrI3lvEMkL0knPJ83DCORYB4jAV7WS9plXi5LPXXEOMzRbLm6i4pd2li/ TdIphcK/a6B1sXCB5UJvJGHUhLw9nF/WzyFYyHGn1OVmdhevWR3CNZ9h5DGGOU1+hMpT yyzUCyEJdzO3uDbgaC+KxKC27/J5VHFVuwyCKPkvg2r+Efbhpr4wE+J4MGcVPf8rXocf Ud6LORNkIQhWJIxgAI4/ZryTrBft1tU5ZHOPoLHsluSvFCNsMyRjXtnGA4twgE64QiR8 qDAQ== X-Gm-Message-State: ALyK8tKpgg0qM5DbJLLkQOXOkQZCzX6K3llCFMLn8VfSC0BUo8gDi1PnBMCiMIYUL4zJ4Q== X-Received: by 10.25.43.202 with SMTP id r193mr3281220lfr.80.1467230113287; Wed, 29 Jun 2016 12:55:13 -0700 (PDT) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id u19sm856064lja.12.2016.06.29.12.55.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jun 2016 12:55:12 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Arend van Spriel , Franky Lin , Hante Meuleman , Pieter-Paul Giesberts , "Franky (Zhenhui) Lin" , linux-wireless@vger.kernel.org (open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER), brcm80211-dev-list.pdl@broadcom.com (open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER), netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] brcmfmac: delete interface directly in code that sent fw request Date: Wed, 29 Jun 2016 21:54:26 +0200 Message-Id: <1467230067-3302-2-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1467230067-3302-1-git-send-email-zajec5@gmail.com> References: <1466353420-30998-1-git-send-email-zajec5@gmail.com> <1467230067-3302-1-git-send-email-zajec5@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP So far when receiving event about in-firmware-interface removal our event worker was notifying listener and afterwards it was removing Linux interface. First of all it was resulting in slightly unexpected order. The listener (del_virtual_intf callback) was (usually) returning with success before we even called unregister_netdev(ice). Please note this couldn't be simply fixed by changing order of calls in brcmf_fweh_handle_if_event as unregistering interface earlier could free struct brcmf_if. Another problem of current implementation are possible lockups. Focus on the time slot between calling event handler and removing Linux interface. During that time original caller may leave (unlocking rtnl semaphore) *and* another call to the same code may be done (locking it again). If that happens our event handler will stuck at removing Linux interface, it won't handle another event and will block process holding rtnl lock. This can be simply solved by unregistering interface in a proper callback, right after receiving confirmation event from firmware. This only required modifying worker to don't unregister on its own if there is someone waiting for the event. Signed-off-by: Rafał Miłecki --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c | 10 ++++++++-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 3 +-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c index 9da7a4c..79c081f 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c @@ -18,6 +18,7 @@ #include "brcmu_wifi.h" #include "brcmu_utils.h" +#include "cfg80211.h" #include "core.h" #include "debug.h" #include "tracepoint.h" @@ -182,8 +183,13 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr, err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data); - if (ifp && ifevent->action == BRCMF_E_IF_DEL) - brcmf_remove_interface(ifp, false); + if (ifp && ifevent->action == BRCMF_E_IF_DEL) { + bool armed = brcmf_cfg80211_vif_event_armed(drvr->config); + + /* Default handling in case no-one waits for this event */ + if (!armed) + brcmf_remove_interface(ifp, false); + } } /** diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c index f6241fd..66f942f 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c @@ -2288,8 +2288,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev) else err = 0; } - if (err) - brcmf_remove_interface(vif->ifp, true); + brcmf_remove_interface(vif->ifp, true); brcmf_cfg80211_arm_vif_event(cfg, NULL); if (vif->wdev.iftype != NL80211_IFTYPE_P2P_DEVICE)