Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp7214161rwb; Tue, 6 Dec 2022 02:48:14 -0800 (PST) X-Google-Smtp-Source: AA0mqf6mHOpgV+1egV7JhssVA8YhhBwxi2Yrumv47ob0Inxddx8foo1REvjDsrPjtRzN9pl/mavA X-Received: by 2002:a17:903:2ce:b0:186:e852:b271 with SMTP id s14-20020a17090302ce00b00186e852b271mr70096132plk.117.1670323693854; Tue, 06 Dec 2022 02:48:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670323693; cv=none; d=google.com; s=arc-20160816; b=nEyQhZd4gECixiCxpznRRrQh8PhsJonhXP3ZGigw+KJ3ijHH5BYDdfENTCw+u0qDUx KGraMhqCGbGqLzysDEvWSRJnUMBrtzMGl5aNEEZVrlehxT9AgXO5pD20YmGZkZVxk0nK TWXsk9OvuYTaclRGTAaKE/19uXhDJtr5QwzLRSyveeOYp/RER54jB6BUOPbzf1shFlo9 Lg+pcY4RM9wKjcLHXcsLgpR6EpWaQYiGA0ZKOL6AlLZIuMsr7aQxCIkyIGVvuwQOz1ot 0pZ5BEslXchoMcDzU7eessXtww7RafiC8D26FMV3PmSuiYJYqpGkgzUI6jJo7fDhHfdw UYjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=g6h5VAKa0YrgUxqA51k+6WkSyowO+wr1F/xOhn3YVpo=; b=jnj8X4yAA2likSRbJWX6Vb3EG7vZv+uB1aRulc08Dk8sbkRchO0wXEcfWvyhdORTFC gTnp/I+7rnXwwOjwWIpAru2Tu38gUSOzv6gMk68h1WAkgQL+ThbAVvcsTU/9TIqMG362 fSwJ97rmPsO00QCyczYC712+Z+fydPHDGuyCm3Ya4iKwsS1rKaKg/Uvls1u9z0cyZlsW x+DQfHfkJsMZiQ8HRmXfTwwA2QUSMz7nEK8L3mp8jjvBowqqQdI+vKjfzsmAxOhQggEB YUhcAn0zARDGPUY4sDM5edpsWlnAPRxtvWQRFobpI294brJOjatgZYyrLvUSQs+sFM7Q wFng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pc16-20020a17090b3b9000b002199a16366csi11179914pjb.173.2022.12.06.02.48.05; Tue, 06 Dec 2022 02:48:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232825AbiLFKkh (ORCPT + 66 others); Tue, 6 Dec 2022 05:40:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231363AbiLFKkJ (ORCPT ); Tue, 6 Dec 2022 05:40:09 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 852511DA50 for ; Tue, 6 Dec 2022 02:40:08 -0800 (PST) Received: from dggpemm500007.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NRH3B5tXZzFqrN; Tue, 6 Dec 2022 18:39:18 +0800 (CST) Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 6 Dec 2022 18:40:06 +0800 From: Yang Yingliang To: , CC: , Subject: [PATCH 2/3] rtlwifi: rtl8188ee: don't call kfree_skb() under spin_lock_irqsave() Date: Tue, 6 Dec 2022 18:37:39 +0800 Message-ID: <20221206103740.1963605-3-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221206103740.1963605-1-yangyingliang@huawei.com> References: <20221206103740.1963605-1-yangyingliang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500007.china.huawei.com (7.185.36.183) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org It is not allowed to call kfree_skb() from hardware interrupt context or with interrupts being disabled. So add all skb to a free list, then free them after spin_unlock_irqrestore() at once. Fixes: 7fe3b3abb5da ("rtlwifi: rtl8188ee: rtl8821ae: Fix a queue locking problem") Signed-off-by: Yang Yingliang --- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c index 58c2ab3d44be..de61c9c0ddec 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c @@ -68,8 +68,10 @@ static void _rtl88ee_return_beacon_queue_skb(struct ieee80211_hw *hw) struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[BEACON_QUEUE]; + struct sk_buff_head free_list; unsigned long flags; + skb_queue_head_init(&free_list); spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags); while (skb_queue_len(&ring->queue)) { struct rtl_tx_desc *entry = &ring->desc[ring->idx]; @@ -79,10 +81,12 @@ static void _rtl88ee_return_beacon_queue_skb(struct ieee80211_hw *hw) rtlpriv->cfg->ops->get_desc(hw, (u8 *)entry, true, HW_DESC_TXBUFF_ADDR), skb->len, DMA_TO_DEVICE); - kfree_skb(skb); + __skb_queue_tail(&free_list, skb); ring->idx = (ring->idx + 1) % ring->entries; } spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags); + + __skb_queue_purge(&free_list); } static void _rtl88ee_disable_bcn_sub_func(struct ieee80211_hw *hw) -- 2.25.1