Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp889824ybh; Tue, 21 Jul 2020 10:16:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKL6IScHE2lnUM5xJphTpbM7BhvxK8FyaFWeZpMyZyLPwzGFZ8ip/zlVxxQ9gdWEyW/QFH X-Received: by 2002:aa7:d845:: with SMTP id f5mr26236266eds.162.1595351759811; Tue, 21 Jul 2020 10:15:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595351759; cv=none; d=google.com; s=arc-20160816; b=PsclMiiIImGwbx2zgnTyBwy1Ek9qcLD+40hSOdO7m7Kvt0jDLmy49iQ8pRG7JAaBkA hKF3alryZHsU7rPd9H5AO+A7f6d4RaKBNESc5gH4KNBUN557qOvabiRtfpiKfWKs09jQ 6RGXsqUENPAowj7QWu7UByr/B7dmfsnjFUgyUf0kERa4w1MHLzqTWN7GxJbjIrf+y13W 3qTrILnfylcl/ToqGLl7r5MdPy+sY7stnfj4ZCVMVfcGxDMiHLYhkTFe2MZegKM387sV 0z+res8xYav/GlNGqjSOsOj5+mbGbWCgDNDfpc+oF+QSNJKNQTP6V+MPV4KaIux9MSwG TQDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:dkim-signature; bh=k+XAw9X2vHW5qNsF1IEl1DDQaBasaYhVfkIaTJygYog=; b=e5XTmOywyfNgoaGIFaXfZJI1lNWO0NdxeUTrluJFeL9q0Ly+z9QmCiRUlVcxf3+oSB 8d+dIa4XcYbN1bQxOHIKP/apwpztD4luCshB2nljDVu+J8L0uG3bB0lbnc4wVfNgPQs0 Nb0EgTMk3XBLkKPrUL/lc2Y0SKaThsyyQg+37OuaUNIycTQOvKQk8gcI7XJMV8AgAhVU 1cobUcNEQ6f37cN9ofGqHdbDyPONiTqgSJOaGeEdxD9/ufcUXbVtkYZ9bdvFftNziq8x NAFDvNom/qYkWPKN/3wu+eteR/KzTWc81Oz8FizTe1Mni1WBIpKkmb4rrn/O/JsRDeXQ rhPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mg.codeaurora.org header.s=smtp header.b=Diaf7Cyi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a3si12032102ejc.288.2020.07.21.10.15.37; Tue, 21 Jul 2020 10:15:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@mg.codeaurora.org header.s=smtp header.b=Diaf7Cyi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729766AbgGUROw (ORCPT + 99 others); Tue, 21 Jul 2020 13:14:52 -0400 Received: from m43-7.mailgun.net ([69.72.43.7]:31410 "EHLO m43-7.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730015AbgGUROt (ORCPT ); Tue, 21 Jul 2020 13:14:49 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1595351688; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=k+XAw9X2vHW5qNsF1IEl1DDQaBasaYhVfkIaTJygYog=; b=Diaf7CyijnAz3IOUT+U/1DMtsYVKq4DtsJkbvHXXKjwIdW+jA4147BGHQOf4F78R3//T3570 PjMwtHn2N4BntHJNckddE5X/mgGgHnAUR68Iq1tDPG5igF8A1o3HjKLF4uMuMJw7dZUy2Kgf 42JFIExhsa/edJscC0FhoivurYM= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n11.prod.us-west-2.postgun.com with SMTP id 5f172287e32d449b31ed61e8 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Tue, 21 Jul 2020 17:14:47 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id B7444C433A1; Tue, 21 Jul 2020 17:14:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=ALL_TRUSTED,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from pillair-linux.qualcomm.com (unknown [202.46.22.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: pillair) by smtp.codeaurora.org (Postfix) with ESMTPSA id 263A8C4339C; Tue, 21 Jul 2020 17:14:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 263A8C4339C Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=pillair@codeaurora.org From: Rakesh Pillai To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, kvalo@codeaurora.org, johannes@sipsolutions.net, davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org, dianders@chromium.org, evgreen@chromium.org, Rakesh Pillai Subject: [RFC 1/7] mac80211: Add check for napi handle before WARN_ON Date: Tue, 21 Jul 2020 22:44:20 +0530 Message-Id: <1595351666-28193-2-git-send-email-pillair@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1595351666-28193-1-git-send-email-pillair@codeaurora.org> References: <1595351666-28193-1-git-send-email-pillair@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The function ieee80211_rx_napi can be now called from a thread context as well, with napi context being NULL. Hence add the napi context check before giving out a warning for softirq count being 0. Tested-on: WCN3990 hw1.0 SNOC WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1 Signed-off-by: Rakesh Pillai --- net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index a88ab6f..1e703f1 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -4652,7 +4652,7 @@ void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta, struct ieee80211_supported_band *sband; struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); - WARN_ON_ONCE(softirq_count() == 0); + WARN_ON_ONCE(napi && softirq_count() == 0); if (WARN_ON(status->band >= NUM_NL80211_BANDS)) goto drop; -- 2.7.4