From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.214.197 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792640698; b=rgclI+Y183kR7Plny/N8U6jA/+VDo0+7uD/jrnyVajs6FzzW4TCFY6Nd9/+kjwxtymp8 Y1FUYJMtpVNQAFskM32RK2CQzFHsVIQk0IQoeJFJM/1KaG98V+2m2TbUABFPcp9qck4Wm Zxo5thU6kBcrvXeB8PC10NC+gjNP8Cms9EmvK29NYmeD6VmUwhuRUPAkE14RYGci6+1WV QTKDhZ7BpJy4WIruhPNr3pMmvu3hLxEmTdjNmbHo9rrm2fHKIZyE843eX8wgVonBBJegV A9SNTo6KDoSEioh7NxIUC+uzqq1Vnf5TqS1fVwJhl2KC76TXianqasiV5BOrAbPbISA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792640698; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=+TrhtkhDFVvIhKjfwyEiGtODopfUQQu0bSw6HzfCj64=; b=gFzlt8Zq6ppCiwp5qgRD2+cQdmCUwvh/6iylLj2/yxXww1kk8VHzVzkUVr/REZU99B99 yNw6rRe2qd0JGdpXlSj+1oFwaUw3W/bOTCPoHMt2b+nzN/M72WGew+zbOjyqs4Sm1mPaK +AxHqRl2k2lSVvPqmjKE2zDrZ8HJPGMkWHRX1v13zyX11qkMO9R2jIqrVsDpKeI6u6cg5 LZZ28Fsa6asAsNGpZ5CgnM5E+TJlYc6Ketc6On6UNEXYb8NYMkmYazu0MqQ5ejXivzJnl kqJVt/1LoYey8ooDjBYVIMTT6lkTT1BaW263OrJslv1E0WrZhI83tSTntYNjLushn4A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--stanleyjhu.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20251104 header.b=L5YZ4T5F; arc=none smtp.remote-ip=209.85.214.197 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8BC1606A326 for ; Thu, 22 Oct 2026 03:44:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org E8BC1606A326 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--stanleyjhu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20251104 header.b=L5YZ4T5F Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2cec4226c70so11924475ad.1 for ; Wed, 21 Oct 2026 20:44:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1792640697; x=1793245497; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=+TrhtkhDFVvIhKjfwyEiGtODopfUQQu0bSw6HzfCj64=; b=L5YZ4T5FMwlMRd7geS0utbQnmXwYSMoYkAjK43frJeyBoNyqNNRv6QvGnRvU5T0TQD FhzuyMJcUWrVzBL9ZUbDX7D67coXKwtr0/LGBEkZHA+6tQfeewJa7jp4BGmB4pNzgU5+ C4GRznlc0NUn3ZYs5O+UCpKeRn9s8cVGKsInd7fNK+LBlSFFfOX1dICydnFNDzJ2ilpj dHhL89cktc3IgEOfphV4F2YTbHacWKevDpZZeF9jGmj6aPF7S2HX1/IQfp5CU4rtWN+V tGSPfcutKmgtWaNXz6ryGJ6blzxAZw560O7MonhaBEZKK4Gc6nXTF+T5PQ4DxcrnD6XE iHNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792640697; x=1793245497; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=+TrhtkhDFVvIhKjfwyEiGtODopfUQQu0bSw6HzfCj64=; b=1ShiiQSQeNz5uollvl8A+UWo5ngDcm+h9aus/f8X/bgI8temnnAN73n65De5HzXxD7 a7W9pZW1zHON36oZm56rlo7eECyeOuomC8guTubjQEeGCdAfvLLQd2sOhjs2SqfFSRAv 1AP3pGDylwXi0xvFfg9MqEmE09GyURktJ7LGvKvH3f8Ieks3xBkExF26hBtVAktSGguY GlTO18WDSwmsnHvMmlYLGE6UpMTEtxOIBNVm4gxwnwKx3psbHbRt8k2FeH/dkppEN+3I ySrnmK6NR/KFJiLUq6vs6u1hldxfBTU8iTUKKhUjpDgHa76DQbqeQRvDDCTQv1l/4Plq Ht9Q== X-Forwarded-Encrypted: i=1; AKwUvBwj8oCEoLplCc9oFUe6Bb6dra5+WDErajxWypuqClUQApaRZ2MAl71vjXqwWLt+vd8R/4CozucxMUQVcYs=@vger.kernel.org X-Gm-Message-State: AFq9FYL/fOskJCdxqeCHhu34ctYoPMDwum7g2mj59Po33NLUsyqFuhdO L4YdXuDmaRfA5BsvFVP1fCEXqLhmLkZUXFEWT2Lu2nSX7d3c3Za9aCNIvyMRHxCvEsfEERjNp5F Dx/hFzqXZQ1oSqj9K8vw32g== X-Received: from plsm24.prod.google.com ([2002:a17:902:bb98:b0:2e5:ce48:124c]) (user=stanleyjhu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2405:b0:2e2:cebe:d811 with SMTP id d9443c01a7336-2ea43fe0efemr30804745ad.46.1792640697160; Wed, 21 Oct 2026 20:44:57 -0700 (PDT) Date: Thu, 22 Oct 2026 11:44:43 +0800 In-Reply-To: <20261022034443.3034432-1-stanleyjhu@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261022034443.3034432-1-stanleyjhu@google.com> X-Mailer: git-send-email 2.56.0.218.g1ec904b173-goog Message-ID: <20261022034443.3034432-7-stanleyjhu@google.com> Subject: [PATCH v5 6/6] scsi: ufs: core: Do not release a reserved request in ufshcd_abort() From: Stanley Jhu To: "Martin K . Petersen" , linux-scsi@vger.kernel.org Cc: "James E . J . Bottomley" , Bart Van Assche , Alim Akhtar , Bean Huo , Peter Wang , Can Guo , linux-kernel@vger.kernel.org, stable@vger.kernel.org Content-Type: text/plain; charset="UTF-8" In SDB mode, aborting a timed-out device management request drops a clock hold that the request never took: 1. ufshcd_dev_man_lock() takes one ufshcd_hold() for the whole device management command. ufshcd_queue_reserved_command() submits the request without taking a hold of its own. 2. The request times out and ufshcd_abort() clears its slot with ufshcd_clear_cmd(). 3. ufshcd_abort() claims BIT(tag) in hba->outstanding_reqs and calls ufshcd_release_scsi_cmd(), which calls ufshcd_release() for a hold the request never took. 4. When ufshcd_dev_man_unlock() drops the hold from step 1, hba->clk_gating.active_reqs goes below zero. Release the command only if it is a SCSI command. Fixes: 08b12cda6c44 ("scsi: ufs: core: Switch to scsi_get_internal_cmd()") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/2060a8da-581b-46d1-a510-779f4df716cd@acm.org Reviewed-by: Bart Van Assche Reviewed-by: Peter Wang Signed-off-by: Stanley Jhu --- drivers/ufs/core/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 87efa2925867..141ad1be4848 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -8226,7 +8226,8 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) * Clear the corresponding bit from outstanding_reqs since the command * has been aborted successfully. */ - if (ufshcd_clear_outstanding_reqs(hba, BIT(tag))) + if (ufshcd_clear_outstanding_reqs(hba, BIT(tag)) && + ufshcd_is_scsi_cmd(cmd)) ufshcd_release_scsi_cmd(hba, cmd); err = SUCCESS; -- 2.56.0.218.g1ec904b173-goog