From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E9B93346E47 for ; Tue, 7 Apr 2026 02:20:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775528442; cv=none; b=XBubNDI3TeBo8Uhx3BODZV413VZX9PgBzIl32u4jPh3C0k6RkF9pFsZqqhxW3Wfamk6z63HFv2Y9uuBsMn9jO7tjJB2Xr0oDLl1sV/8agS35dyBd2iWettPrl1e6fI0nHKQDl909jhfDjkaS1DfV2SsXZGf2unR/ItQVsPMF6gg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775528442; c=relaxed/simple; bh=LNl598CtverB6RoVHWavFb380/eHEY1x3g4dSUTb7wI=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=IGaXZOaOWLSDo8+vln8FvOvmCG8DGae70hmrFZC4xsGqCJWB9wxGNRA/SDsy9O0CbMvwU5Zqg+UdAvuBF+CjmiZNEVET6hBIBTsWo1+5q8DVw/qKruFtmArqIFLPHUdY1McQVDawoVui1vnanLXkk7LonWMZDFzxrdrhJ5TGroE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20251104.gappssmtp.com header.i=@kernel-dk.20251104.gappssmtp.com header.b=OxPO+iRc; arc=none smtp.client-ip=209.85.210.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20251104.gappssmtp.com header.i=@kernel-dk.20251104.gappssmtp.com header.b="OxPO+iRc" Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-7d86eb7c854so2345895a34.3 for ; Mon, 06 Apr 2026 19:20:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20251104.gappssmtp.com; s=20251104; t=1775528437; x=1776133237; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=uj0K5FyMi7XSuPG2uq1mtZavJKlMVDQzSk2zMk1W2/0=; b=OxPO+iRcqVzb8MVjEBWVVtlbaMR+C4ZsG8PF/PkyZO6VTgPF1mjkBSqQ2byFfUPIzq aEFD/QWtR70y3xY9CEIOFHKt1PbD8YLQ46QQxTAeNADOjNvkqg9wFOtT6PNrPNNGgSeG O+hRZCypfjpoQ9MxxUNJL2+X9W+jcj0ZSg3iPseVAAuIRH0+1RPuQTW4nLwDz4z9fbMU JU2jw/1TBl4TM01f2P8/4arolVBxh5eVRydbKOQv6pAycaQu5IEO3Jg2vyLtAIFrBqkA PvCgZHb4oo/vvzUZToM92Zom3pc67Jnan1mUrAuePotpjDKZCBBd1KB1ljFcqmXUxN+E 9LaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775528437; x=1776133237; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=uj0K5FyMi7XSuPG2uq1mtZavJKlMVDQzSk2zMk1W2/0=; b=ZHIIV33XqpaAlger5sMdNevzays7qNH1DRIp5+pW/f0nuE6j4HiUrVPrIGp6Djrx4N U7luiwK+215lWMO41xCEzFQdUptgfhMqIdVGPyvX1lqYEHZM8Swn/+f+kk8V4srH/zYt xL44Vqx+nr5OXMRr+aQwPK03AdiQnhFcCnYfCwn0k8+vucNG73HnWPXRU3la+A/VumJ2 ErMlbVCOQg2jmTzQwMy62Wr3gfx8d5B1nOlof6PR9hMSTUDp4A/WfvYlnahLaFzEqFWZ 9AqMmKvVGiKKThog3h8GVBFPgwPuZGDFKes4rGbNOP3mx/fIgJnl0/ByMBMqbjuhn04S iyUQ== X-Forwarded-Encrypted: i=1; AJvYcCWMzBCnwJspx3eTrkTmxPd+6SYxHPsNYVN/CChcigY3oMbcoebhta1UudWmq16pFgJf+HjNsHNXmIVmdB0=@vger.kernel.org X-Gm-Message-State: AOJu0YzPj2D7SYoVWHz9AvyQF4DDb8eb+21NP0GJf4SJS/7dCQg4kiqc Pot9fOE/vQREmkxLP5cz5ww7rNOjq8XD8Dn8g/J1XU3zVymIw1lgMJEg/XS2yRHWotw= X-Gm-Gg: AeBDieugdoUXdAUqf3S79VKN7SrTwEaNNky9YVh6IKGH1MlWZq69m6+riZIO2TxCF4/ oh4E8crHtAhIP6LmXCqaXhG29OEXze7x1o0lvAOgQi6eR0F/FptihfNr09m3perx67ZGrGZnx2e WTNRyc7QFOoZwVCrvaz5Ywrg66lYkdGmUkglEnCoUMi9Od42zEM2Usfqi7DkE/ohm7cM/7mrNW/ QXSsu/RzZwIfhk8hvmBwIuBKQDGICgRggvx4XOM5XskSEE9+2ZGglhpk8qSx5p/wqq7EbAS6A9c A7caDevEMoB9+zyxp5kp/tbW9IcJ8+4iWAO5kBn/OkTNJToqd5cqhRord+W0l43QLCde4NTASO9 D28F1uWcIL6An5Enkpzn+diOaGQRCe7o0gsFXJK2ounqTjTBSRDgBFqgBItSQr8U/BIGS0zPjbw IPPxF6GnINCah5QLj3FCHLVBC+RUgvQeGFfZ9G6zFuZHdMu0cSKknhRiCKC5/iEWwJLXQB3hdwZ VJ519yWmQ== X-Received: by 2002:a05:6830:83af:b0:7db:b68f:b819 with SMTP id 46e09a7af769-7dbb6f25a6emr9575077a34.6.1775528437568; Mon, 06 Apr 2026 19:20:37 -0700 (PDT) Received: from [192.168.1.150] ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7dbd663a4a5sm4895363a34.25.2026.04.06.19.20.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 06 Apr 2026 19:20:37 -0700 (PDT) Message-ID: <8143e057-4c3b-4365-8780-003e897b9baf@kernel.dk> Date: Mon, 6 Apr 2026 20:20:35 -0600 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] nvme-apple: drop invalid put of admin queue reference count To: Fedor Pchelkin , Keith Busch , Christoph Hellwig Cc: Sven Peter , Janne Grunau , Neal Gompa , Sagi Grimberg , Hannes Reinecke , Ming Lei , Chaitanya Kulkarni , "Heyne, Maximilian" , asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, lvc-project@linuxtesting.org, stable@vger.kernel.org References: <20260403202701.991276-1-pchelkin@ispras.ru> Content-Language: en-US From: Jens Axboe In-Reply-To: <20260403202701.991276-1-pchelkin@ispras.ru> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 4/3/26 2:27 PM, Fedor Pchelkin wrote: > Commit 03b3bcd319b3 ("nvme: fix admin request_queue lifetime") moved the > admin queue reference ->put call into nvme_free_ctrl() - a controller > device release callback performed for every nvme driver doing > nvme_init_ctrl(). > > nvme-apple sets refcount of the admin queue to 1 at allocation during the > probe function and then puts it twice now: > > nvme_free_ctrl() > blk_put_queue(ctrl->admin_q) // #1 > ->free_ctrl() > apple_nvme_free_ctrl() > blk_put_queue(anv->ctrl.admin_q) // #2 > > Note that there is a commit 941f7298c70c ("nvme-apple: remove an extra > queue reference") which intended to drop having an extra admin queue > reference. Looks like at that moment it accidentally fixed a refcount > leak, which existed since the driver's introduction. There were an > initial ->set and an extra ->get call at driver's probe function, and only > a single ->put inside apple_nvme_free_ctrl(). > > However now after commit 03b3bcd319b3 ("nvme: fix admin request_queue > lifetime") the refcount is imbalanced again. Fix it by removing extra > ->put call from apple_nvme_free_ctrl(). Compile tested only. > > Found by Linux Verification Center (linuxtesting.org). > > Fixes: 03b3bcd319b3 ("nvme: fix admin request_queue lifetime") > Cc: stable@vger.kernel.org # depends on 941f7298c70c > Signed-off-by: Fedor Pchelkin > --- > > Also nvme-apple seems not to have a blk_mq_destroy_queue() call for > admin queue since introduction - if it's needed, the proper place would > be in apple_nvme_remove() just before calling nvme_uninit_ctrl(), I guess? > > drivers/nvme/host/apple.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c > index ed61b97fde59..1d82f0541b0b 100644 > --- a/drivers/nvme/host/apple.c > +++ b/drivers/nvme/host/apple.c > @@ -1269,8 +1269,6 @@ static void apple_nvme_free_ctrl(struct nvme_ctrl *ctrl) > { > struct apple_nvme *anv = ctrl_to_apple_nvme(ctrl); > > - if (anv->ctrl.admin_q) > - blk_put_queue(anv->ctrl.admin_q); > put_device(anv->dev); > } Could this just be: static void apple_nvme_free_ctrl(struct nvme_ctrl *ctrl) { put_device(ctrl->dev); } at this point? -- Jens Axboe