Message ID | 20230407082937.14558-3-chunfeng.yun@mediatek.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp145305vqo; Fri, 7 Apr 2023 01:52:29 -0700 (PDT) X-Google-Smtp-Source: AKy350YmZgsskP2FvM/wztT7/aTS4Lpjen8MFMRMkW2BP0z1XXY14mI3yanadSme6MlB+BCcvhCv X-Received: by 2002:aa7:cd75:0:b0:502:3376:46bc with SMTP id ca21-20020aa7cd75000000b00502337646bcmr1098641edb.8.1680857549385; Fri, 07 Apr 2023 01:52:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680857549; cv=none; d=google.com; s=arc-20160816; b=DeNg/pKGJ53VSEdMMyZ1shpMmLpOwldsSPHPATFiMNVH+YzQzzzzGZQGoKwQfQKDkc x4re8jfALvjtXhsJLbsD0jYokb7n528O2X1eJixAYzSBpJCW1A0rWh1YGrotK8gZki2l plaOzxR6gp+PQ9WDdM5f7MH5F4BJNSSPG7Oq5HVRIknZVDutsReVYdwgE8XnOhij/X7M EotSMJaUHn1L1P0oG/nXFOCcTSqkSc7Eodep8gi9rr1V7SSxurZYIuzffN6N1GxpAP0g RqDaQrQyLSWnCr9+rEXEGUBHSgZxdkX9Iytd6R2UBbBQJ7RDn9f9bZhdHE1bLg6dw9Db Tqqg== 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 :dkim-signature; bh=N09cAwcaHlqM3x5RvXqAyDDVVPSor4fraHJ/xFed9PM=; b=MK0BsIsKIaiRtUQJdAx/XZALsKpNHran9U6v4CBfYxn81rSOghW12yzj9a1sVc8TPC cnhWVkKFYhBCVcqmppj8vgKmuneBHqDjAxk4/huBjpUGHozL3TNT77jBYHo/63S2qthE D2hBMCXWkehmO2GEpAMvkHnlLdxGs+2/Vsm0H6aYq6jMlyxUa/E4OeEol8NBcfY45Hr6 wYeQ7lGA5CUrxUTu6GGKKXRXVGmIg9rw+jXV5YqHc+XOPv80g6N4kiFXzvbkrUgmVYCv BQ8xeZBu2y6QiUOqg0jVX4/ozrZVM3IibDvend0aU8Ey9XM5jVtlEQjj75jlM4zWPBsJ 61MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=lHQvkWD0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t26-20020a05640203da00b004c1bfa5adf8si3072718edw.611.2023.04.07.01.52.03; Fri, 07 Apr 2023 01:52:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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; dkim=pass header.i=@mediatek.com header.s=dk header.b=lHQvkWD0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240291AbjDGIaH (ORCPT <rfc822;a1648639935@gmail.com> + 99 others); Fri, 7 Apr 2023 04:30:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239780AbjDGI3y (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 7 Apr 2023 04:29:54 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6532AF25; Fri, 7 Apr 2023 01:29:49 -0700 (PDT) X-UUID: 576754fad51e11edb6b9f13eb10bd0fe-20230407 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=N09cAwcaHlqM3x5RvXqAyDDVVPSor4fraHJ/xFed9PM=; b=lHQvkWD0XDTZ49xx+7kgxHidQ+IE8LMRU6f9YRcVdTHm/fUAKUCvjQKlM7uVWaXScRtWRTXNSg9UXVYhtK3qNB8bYCyP1+Rai+A1CjmmCVLgk9qQtdbECtKxnBU39R3jAhjcDqaMQIQwsrYzNvmd1voxTn+0MaE984+0bZB7S9k=; X-CID-CACHE: Type:Local,Time:202304071629+08,HitQuantity:1 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.22,REQID:50995b94-cc9d-4da8-9986-d5bd4a7bd53d,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:1,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-4 X-CID-META: VersionHash:120426c,CLOUDID:4734a02a-564d-42d9-9875-7c868ee415ec,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-UUID: 576754fad51e11edb6b9f13eb10bd0fe-20230407 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw02.mediatek.com (envelope-from <chunfeng.yun@mediatek.com>) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 440793704; Fri, 07 Apr 2023 16:29:41 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Fri, 7 Apr 2023 16:29:40 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.25 via Frontend Transport; Fri, 7 Apr 2023 16:29:40 +0800 From: Chunfeng Yun <chunfeng.yun@mediatek.com> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Rob Herring <robh+dt@kernel.org> CC: Chunfeng Yun <chunfeng.yun@mediatek.com>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Matthias Brugger <matthias.bgg@gmail.com>, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>, <linux-usb@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-mediatek@lists.infradead.org>, <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Tianping Fang <tianping.fang@mediatek.com> Subject: [PATCH v2 3/7] usb: mtu3: fix kernel panic at qmu transfer done irq handler Date: Fri, 7 Apr 2023 16:29:33 +0800 Message-ID: <20230407082937.14558-3-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230407082937.14558-1-chunfeng.yun@mediatek.com> References: <20230407082937.14558-1-chunfeng.yun@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-MTK: N X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, UNPARSEABLE_RELAY autolearn=unavailable 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762506886029440222?= X-GMAIL-MSGID: =?utf-8?q?1762506886029440222?= |
Series |
[v2,1/7] usb: mtu3: give back request when rx error happens
|
|
Commit Message
Chunfeng Yun (云春峰)
April 7, 2023, 8:29 a.m. UTC
When handle qmu transfer irq, it will unlock @mtu->lock before give back
request, if another thread handle disconnect event at the same time, and
try to disable ep, it may lock @mtu->lock and free qmu ring, then qmu
irq hanlder may get a NULL gpd, avoid the KE by checking gpd's value before
handling it.
e.g.
qmu done irq on cpu0 thread running on cpu1
qmu_done_tx()
handle gpd [0]
mtu3_requ_complete() mtu3_gadget_ep_disable()
unlock @mtu->lock
give back request lock @mtu->lock
mtu3_ep_disable()
mtu3_gpd_ring_free()
unlock @mtu->lock
lock @mtu->lock
get next gpd [1]
[1]: goto [0] to handle next gpd, and next gpd may be NULL.
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: fix typo suggested by AngeloGioacchino
---
drivers/usb/mtu3/mtu3_qmu.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Comments
Il 07/04/23 10:29, Chunfeng Yun ha scritto: > When handle qmu transfer irq, it will unlock @mtu->lock before give back > request, if another thread handle disconnect event at the same time, and > try to disable ep, it may lock @mtu->lock and free qmu ring, then qmu > irq hanlder may get a NULL gpd, avoid the KE by checking gpd's value before > handling it. > > e.g. > qmu done irq on cpu0 thread running on cpu1 > > qmu_done_tx() > handle gpd [0] > mtu3_requ_complete() mtu3_gadget_ep_disable() > unlock @mtu->lock > give back request lock @mtu->lock > mtu3_ep_disable() > mtu3_gpd_ring_free() > unlock @mtu->lock > lock @mtu->lock > get next gpd [1] > > [1]: goto [0] to handle next gpd, and next gpd may be NULL. > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> NACK. You still miss the Fixes tag. Regards, Angelo
On Fri, 2023-04-07 at 11:09 +0200, AngeloGioacchino Del Regno wrote: > External email : Please do not click links or open attachments until > you have verified the sender or the content. > > > Il 07/04/23 10:29, Chunfeng Yun ha scritto: > > When handle qmu transfer irq, it will unlock @mtu->lock before give > > back > > request, if another thread handle disconnect event at the same > > time, and > > try to disable ep, it may lock @mtu->lock and free qmu ring, then > > qmu > > irq hanlder may get a NULL gpd, avoid the KE by checking gpd's > > value before > > handling it. > > > > e.g. > > qmu done irq on cpu0 thread running on cpu1 > > > > qmu_done_tx() > > handle gpd [0] > > mtu3_requ_complete() mtu3_gadget_ep_disable() > > unlock @mtu->lock > > give back request lock @mtu->lock > > mtu3_ep_disable() > > mtu3_gpd_ring_free() > > unlock @mtu->lock > > lock @mtu->lock > > get next gpd [1] > > > > [1]: goto [0] to handle next gpd, and next gpd may be NULL. > > > > Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> > > NACK. You still miss the Fixes tag. Ok, I'll add it, thanks > > Regards, > Angelo >
diff --git a/drivers/usb/mtu3/mtu3_qmu.c b/drivers/usb/mtu3/mtu3_qmu.c index 6be4977a5db5..3d77408e3133 100644 --- a/drivers/usb/mtu3/mtu3_qmu.c +++ b/drivers/usb/mtu3/mtu3_qmu.c @@ -210,6 +210,7 @@ static struct qmu_gpd *advance_enq_gpd(struct mtu3_gpd_ring *ring) return ring->enqueue; } +/* @dequeue may be NULL if ring is unallocated or freed */ static struct qmu_gpd *advance_deq_gpd(struct mtu3_gpd_ring *ring) { if (ring->dequeue < ring->end) @@ -522,7 +523,7 @@ static void qmu_done_tx(struct mtu3 *mtu, u8 epnum) dev_dbg(mtu->dev, "%s EP%d, last=%p, current=%p, enq=%p\n", __func__, epnum, gpd, gpd_current, ring->enqueue); - while (gpd != gpd_current && !GET_GPD_HWO(gpd)) { + while (gpd && gpd != gpd_current && !GET_GPD_HWO(gpd)) { mreq = next_request(mep); @@ -561,7 +562,7 @@ static void qmu_done_rx(struct mtu3 *mtu, u8 epnum) dev_dbg(mtu->dev, "%s EP%d, last=%p, current=%p, enq=%p\n", __func__, epnum, gpd, gpd_current, ring->enqueue); - while (gpd != gpd_current && !GET_GPD_HWO(gpd)) { + while (gpd && gpd != gpd_current && !GET_GPD_HWO(gpd)) { mreq = next_request(mep);