From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 595BE22CBD0 for ; Tue, 18 Feb 2025 12:07:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739880468; cv=none; b=bgy2bcuW/cl04piTgliXO5404ZdXjWHPP+Q8yfZ/f9/stLk72ImqK1QWSYjpYAnHP4jEVdoJqilWFlU6deVj/THfyd2ImKwuKYbpyoDRV4a29wSaArNOkAdkx7U4tC/dXqDplYHoTaeCfn72RvCSR3wjKrGjyPP01VaB55jI9r0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739880468; c=relaxed/simple; bh=RrYLljOv07CP8gB5WO0/t+pom0+ooOr+he1aWB/mhs4=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=HcPKxkA/vUhnKY2icf7x7V+oz4fIZjfhj+9aTIOLWMyAZ7ng4EyVCaVpPb5/tz7LYC0K/hketlq+uAN6T2xH/9Uk4xk/c/IPYKjHBkfxeGSD5Mclq6nOrFG5NdReIa3PLiqaKLDx8sjchPK/Y1fmvG4nv4JCGNbg3JCJ2a75+n8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VM8h1oib; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VM8h1oib" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEA47C4CEE2; Tue, 18 Feb 2025 12:07:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739880468; bh=RrYLljOv07CP8gB5WO0/t+pom0+ooOr+he1aWB/mhs4=; h=Subject:To:Cc:From:Date:From; b=VM8h1oibWxadtusSKYcxaQYyH2q6imhbW8KirFuXZwtqqS1G4go5qP6iNhFs3fc+t VsOjopdoIS4Qctk/xZdDsEvZLTAzrX6+BaiTs8A9gNNfJOlRlUTK02wVXaIFKCZKAM laAh/m9eb/mmoUm0C28P12ieIrKg0srRG33BnUxA= Subject: FAILED: patch "[PATCH] USB: gadget: f_midi: f_midi_complete to call queue_work" failed to apply to 6.1-stable tree To: jilliandonahue58@gmail.com,gregkh@linuxfoundation.org,stable@kernel.org Cc: From: Date: Tue, 18 Feb 2025 13:07:31 +0100 Message-ID: <2025021831-fedora-vanquish-5096@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 4ab37fcb42832cdd3e9d5e50653285ca84d6686f # git commit -s git send-email --to '' --in-reply-to '2025021831-fedora-vanquish-5096@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 4ab37fcb42832cdd3e9d5e50653285ca84d6686f Mon Sep 17 00:00:00 2001 From: Jill Donahue Date: Tue, 11 Feb 2025 10:48:05 -0700 Subject: [PATCH] USB: gadget: f_midi: f_midi_complete to call queue_work When using USB MIDI, a lock is attempted to be acquired twice through a re-entrant call to f_midi_transmit, causing a deadlock. Fix it by using queue_work() to schedule the inner f_midi_transmit() via a high priority work queue from the completion handler. Link: https://lore.kernel.org/all/CAArt=LjxU0fUZOj06X+5tkeGT+6RbXzpWg1h4t4Fwa_KGVAX6g@mail.gmail.com/ Fixes: d5daf49b58661 ("USB: gadget: midi: add midi function driver") Cc: stable Signed-off-by: Jill Donahue Link: https://lore.kernel.org/r/20250211174805.1369265-1-jdonahue@fender.com Signed-off-by: Greg Kroah-Hartman diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c index 47260d65066a..da82598fcef8 100644 --- a/drivers/usb/gadget/function/f_midi.c +++ b/drivers/usb/gadget/function/f_midi.c @@ -283,7 +283,7 @@ f_midi_complete(struct usb_ep *ep, struct usb_request *req) /* Our transmit completed. See if there's more to go. * f_midi_transmit eats req, don't queue it again. */ req->length = 0; - f_midi_transmit(midi); + queue_work(system_highpri_wq, &midi->work); return; } break;