Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3965664pxb; Mon, 8 Feb 2021 04:53:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJxq29ZGpY1lFPO3T9pN0xUp/ppv8nE6uwPykVAR9iJPTkR9LJVYPNAhNZte/T0wLTRKZsNX X-Received: by 2002:a17:906:3881:: with SMTP id q1mr17053525ejd.490.1612788814009; Mon, 08 Feb 2021 04:53:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612788814; cv=none; d=google.com; s=arc-20160816; b=K5c06jaMcBpbvVduEPruKszY8t1MqGOIFbs68AundZcRnSqm9r74XRZuER6VKndusc sHE77MOXNeUI1ByOFT6nB+iA5NEKrh1CGPemrE+JMQUUy8WkGVUOdb32mVUMtZyX7m+T qr1lVm6x7WLrT8kes+5y+iBmqMGYTdWZhCPp3zrN1vcWsr/gjI4HNvhaQmulFkwVFDI1 asmZVft46Z1vpbjaaKIjl/ZbnzwuygE+0KxiyyJAmTOIA7Z5d2G+oH3FhJ14iZUAxaaS Z6iy0y/OJKyuET9TgtkAp+d3u8fAjkQ8UleJKKIsxaj1h6l3x/RnnP6EddRv2Bcprppf 24wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from; bh=4NlKJQxkcAK8z0skmo0rrWllwiKSzBM1WD9Ci7POkKc=; b=ISH1rLIKCVhlYVRO3DOykWXtZ9ucH8KruO8gOPw5oWbC1Iyhjp85soZooX6xD5MstS L7xtoQgropf4jKib8lJXipfJxKIhA5gJUjvV1yPnNbimi/hiHKklJWS+UpSivgOMvi9L iUqthAs6fkoD042lB6N9xIpqw5oAy3XZqJI6hE3wvO+47L63OYDKw3kJsULvmJhxjbrO FaYosHB6bh1iGiJsfXzKqxSRGcFEV6UCpPBaATHYqq+ugdkfWlWdlzPRTra9BPZEy2DJ apmhE/StcR/QID6CPqDA/IJ/18Kwj3LcTELoQAVvLr+GMnpwPjQNEVLjsBU/9nHIzwlg LYHg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-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 dt1si5049323ejc.377.2021.02.08.04.53.10; Mon, 08 Feb 2021 04:53:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229793AbhBHMwE (ORCPT + 99 others); Mon, 8 Feb 2021 07:52:04 -0500 Received: from paleale.coelho.fi ([176.9.41.70]:44534 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229891AbhBHMv7 (ORCPT ); Mon, 8 Feb 2021 07:51:59 -0500 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=redipa.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1l95yK-0047PC-Ir; Mon, 08 Feb 2021 14:48:56 +0200 From: Luca Coelho To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org Date: Mon, 8 Feb 2021 14:48:46 +0200 Message-Id: X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208124847.1934441-1-luca@coelho.fi> References: <20210208124847.1934441-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.4 Subject: [PATCH 11/12] iwlwifi: pcie: don't crash when rx queues aren't allocated in interrupt Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Emmanuel Grumbach WARNING is better than crashing. Since this happened to me, be on the safe side. Signed-off-by: Emmanuel Grumbach Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c index 534fe62b8a30..42426e25cac6 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c @@ -1658,6 +1658,9 @@ irqreturn_t iwl_pcie_irq_rx_msix_handler(int irq, void *dev_id) if (WARN_ON(entry->entry >= trans->num_rx_queues)) return IRQ_NONE; + if (WARN_ONCE(!rxq, "Got MSI-X interrupt before we have Rx queues")) + return IRQ_NONE; + lock_map_acquire(&trans->sync_cmd_lockdep_map); local_bh_disable(); -- 2.30.0