Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81571C43381 for ; Wed, 13 Mar 2019 11:31:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 42B7E2147C for ; Wed, 13 Mar 2019 11:31:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nbd.name header.i=@nbd.name header.b="P73PwKrd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725895AbfCMLbm (ORCPT ); Wed, 13 Mar 2019 07:31:42 -0400 Received: from nbd.name ([46.4.11.11]:40892 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725870AbfCMLbm (ORCPT ); Wed, 13 Mar 2019 07:31:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: MIME-Version:Date:Message-ID:From:References:Cc:To:Subject:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6EfKyNWtzbtJFuEFvO2myljydnWDyFxNHlXfKTGFfrU=; b=P73PwKrdcP4P2TghUsgCh2ODyN CDX4uIFMGOH6ShWoQkk1S8cX5Ao80IUVj0Q+NhVtjnBjq9eoi/2RaBH6gn0K3xmJg5bPRpfx77wpX 6fhy+fkpeBKm2x3UuFolDNVVVrqZ3bd0cAq9Xfp4JjPX30uMF/GO4+E0hjSd4eAb8FA8=; Received: from p4ff1316d.dip0.t-ipconnect.de ([79.241.49.109] helo=nf.local) by ds12 with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1h426h-00071e-Us; Wed, 13 Mar 2019 12:31:36 +0100 Subject: Re: [PATCH 4/5] mt76: introduce mt76_sw_queue data structure To: Lorenzo Bianconi Cc: linux-wireless@vger.kernel.org, sgruszka@redhat.com, lorenzo.bianconi@redhat.com, roychl666@gmail.com, ryder.lee@mediatek.com References: From: Felix Fietkau Openpgp: preference=signencrypt Autocrypt: addr=nbd@nbd.name; prefer-encrypt=mutual; keydata= mQGiBEah5CcRBADIY7pu4LIv3jBlyQ/2u87iIZGe6f0f8pyB4UjzfJNXhJb8JylYYRzIOSxh ExKsdLCnJqsG1PY1mqTtoG8sONpwsHr2oJ4itjcGHfn5NJSUGTbtbbxLro13tHkGFCoCr4Z5 Pv+XRgiANSpYlIigiMbOkide6wbggQK32tC20QxUIwCg4k6dtV/4kwEeiOUfErq00TVqIiEE AKcUi4taOuh/PQWx/Ujjl/P1LfJXqLKRPa8PwD4j2yjoc9l+7LptSxJThL9KSu6gtXQjcoR2 vCK0OeYJhgO4kYMI78h1TSaxmtImEAnjFPYJYVsxrhay92jisYc7z5R/76AaELfF6RCjjGeP wdalulG+erWju710Bif7E1yjYVWeA/9Wd1lsOmx6uwwYgNqoFtcAunDaMKi9xVQW18FsUusM TdRvTZLBpoUAy+MajAL+R73TwLq3LnKpIcCwftyQXK5pEDKq57OhxJVv1Q8XkA9Dn1SBOjNB l25vJDFAT9ntp9THeDD2fv15yk4EKpWhu4H00/YX8KkhFsrtUs69+vZQwbQcRmVsaXggRmll dGthdSA8bmJkQG5iZC5uYW1lPohgBBMRAgAgBQJGoeQnAhsjBgsJCAcDAgQVAggDBBYCAwEC HgECF4AACgkQ130UHQKnbvXsvgCgjsAIIOsY7xZ8VcSm7NABpi91yTMAniMMmH7FRenEAYMa VrwYTIThkTlQuQINBEah5FQQCACMIep/hTzgPZ9HbCTKm9xN4bZX0JjrqjFem1Nxf3MBM5vN CYGBn8F4sGIzPmLhl4xFeq3k5irVg/YvxSDbQN6NJv8o+tP6zsMeWX2JjtV0P4aDIN1pK2/w VxcicArw0VYdv2ZCarccFBgH2a6GjswqlCqVM3gNIMI8ikzenKcso8YErGGiKYeMEZLwHaxE Y7mTPuOTrWL8uWWRL5mVjhZEVvDez6em/OYvzBwbkhImrryF29e3Po2cfY2n7EKjjr3/141K DHBBdgXlPNfDwROnA5ugjjEBjwkwBQqPpDA7AYPvpHh5vLbZnVGu5CwG7NAsrb2isRmjYoqk wu++3117AAMFB/9S0Sj7qFFQcD4laADVsabTpNNpaV4wAgVTRHKV/kC9luItzwDnUcsZUPdQ f3MueRJ3jIHU0UmRBG3uQftqbZJj3ikhnfvyLmkCNe+/hXhPu9sGvXyi2D4vszICvc1KL4RD aLSrOsROx22eZ26KqcW4ny7+va2FnvjsZgI8h4sDmaLzKczVRIiLITiMpLFEU/VoSv0m1F4B FtRgoiyjFzigWG0MsTdAN6FJzGh4mWWGIlE7o5JraNhnTd+yTUIPtw3ym6l8P+gbvfoZida0 TspgwBWLnXQvP5EDvlZnNaKa/3oBes6z0QdaSOwZCRA3QSLHBwtgUsrT6RxRSweLrcabiEkE GBECAAkFAkah5FQCGwwACgkQ130UHQKnbvW2GgCfTKx80VvCR/PvsUlrvdOLsIgeRGAAn1ee RjMaxwtSdaCKMw3j33ZbsWS4 Message-ID: <425244db-1638-1175-fa79-f4bda4cd7150@nbd.name> Date: Wed, 13 Mar 2019 12:31:34 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:60.0) Gecko/20100101 Thunderbird/60.5.3 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On 2019-03-02 14:47, Lorenzo Bianconi wrote: > Introduce mt76_sw_queue data structure in order to support new > chipsets (e.g. mt7615) that have a shared hardware queue for all traffic > identifiers. mt76_sw_queue will be used to track outstanding packets > > Signed-off-by: Lorenzo Bianconi > --- > drivers/net/wireless/mediatek/mt76/debugfs.c | 7 ++- > drivers/net/wireless/mediatek/mt76/dma.c | 12 ++-- > drivers/net/wireless/mediatek/mt76/mac80211.c | 4 +- > drivers/net/wireless/mediatek/mt76/mt76.h | 16 ++++-- > .../wireless/mediatek/mt76/mt7603/beacon.c | 8 +-- > .../net/wireless/mediatek/mt76/mt7603/dma.c | 13 ++++- > .../net/wireless/mediatek/mt76/mt7603/mac.c | 4 +- > .../net/wireless/mediatek/mt76/mt7603/main.c | 2 +- > .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 19 +++++-- > .../wireless/mediatek/mt76/mt76x02_usb_core.c | 2 +- > .../net/wireless/mediatek/mt76/mt76x02_util.c | 2 +- > drivers/net/wireless/mediatek/mt76/tx.c | 55 ++++++++++--------- > drivers/net/wireless/mediatek/mt76/usb.c | 23 +++++--- > 13 files changed, 100 insertions(+), 67 deletions(-) > Turns out this causes a crash on cleanup if not all queues are initialized. I will fold in the following fix: --- --- a/drivers/net/wireless/mediatek/mt76/debugfs.c +++ b/drivers/net/wireless/mediatek/mt76/debugfs.c @@ -45,7 +45,7 @@ mt76_queues_read(struct seq_file *s, void *data) for (i = 0; i < ARRAY_SIZE(dev->q_tx); i++) { struct mt76_sw_queue *q = &dev->q_tx[i]; - if (!q->q->ndesc) + if (!q->q) continue; seq_printf(s, --- a/drivers/net/wireless/mediatek/mt76/dma.c +++ b/drivers/net/wireless/mediatek/mt76/dma.c @@ -152,7 +152,7 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush) bool wake = false; int last; - if (!q->ndesc) + if (!q) return; spin_lock_bh(&q->lock);