From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Bin Lan <bin.lan.cn@windriver.com>,
	Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.6] nvme: apple: fix device reference counting
Date: Tue, 26 Nov 2024 10:39:21 -0500
Message-ID: <20241126082217-0e17438d43960efa@stable.kernel.org>
In-Reply-To:  <20241126074657.2003279-1-bin.lan.cn@windriver.com>
References: 
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

[ Sasha's backport helper bot ]

Hi,

The upstream commit SHA1 provided is correct: b9ecbfa45516182cd062fecd286db7907ba84210

WARNING: Author mismatch between patch and upstream commit:
Backport author: Bin Lan <bin.lan.cn@windriver.com>
Commit author: Keith Busch <kbusch@kernel.org>


Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.11.y | Present (exact SHA1)
6.6.y | Not found

Note: The patch differs from the upstream commit:
---
--- -	2024-11-26 08:18:41.504993466 -0500
+++ /tmp/tmp.6GPhqxSP1X	2024-11-26 08:18:41.496411675 -0500
@@ -1,3 +1,5 @@
+[ Upstream commit b9ecbfa45516182cd062fecd286db7907ba84210 ]
+
 Drivers must call nvme_uninit_ctrl after a successful nvme_init_ctrl.
 Split the allocation side out to make the error handling boundary easier
 to navigate. The apple driver had been doing this wrong, leaking the
@@ -6,15 +8,17 @@
 Reviewed-by: Christoph Hellwig <hch@lst.de>
 Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
 Signed-off-by: Keith Busch <kbusch@kernel.org>
+[ Resolve minor conflicts ]
+Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
 ---
  drivers/nvme/host/apple.c | 27 ++++++++++++++++++++++-----
  1 file changed, 22 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c
-index dd6ec0865141a..c43ada920c3b2 100644
+index 596bb11eeba5..396eb9437659 100644
 --- a/drivers/nvme/host/apple.c
 +++ b/drivers/nvme/host/apple.c
-@@ -1388,7 +1388,7 @@ static void devm_apple_nvme_mempool_destroy(void *data)
+@@ -1387,7 +1387,7 @@ static void devm_apple_nvme_mempool_destroy(void *data)
  	mempool_destroy(data);
  }
  
@@ -23,7 +27,7 @@
  {
  	struct device *dev = &pdev->dev;
  	struct apple_nvme *anv;
-@@ -1396,7 +1396,7 @@ static int apple_nvme_probe(struct platform_device *pdev)
+@@ -1395,7 +1395,7 @@ static int apple_nvme_probe(struct platform_device *pdev)
  
  	anv = devm_kzalloc(dev, sizeof(*anv), GFP_KERNEL);
  	if (!anv)
@@ -32,7 +36,7 @@
  
  	anv->dev = get_device(dev);
  	anv->adminq.is_adminq = true;
-@@ -1516,10 +1516,26 @@ static int apple_nvme_probe(struct platform_device *pdev)
+@@ -1515,10 +1515,26 @@ static int apple_nvme_probe(struct platform_device *pdev)
  		goto put_dev;
  	}
  
@@ -51,7 +55,7 @@
 +	if (IS_ERR(anv))
 +		return PTR_ERR(anv);
 +
- 	anv->ctrl.admin_q = blk_mq_alloc_queue(&anv->admin_tagset, NULL, NULL);
+ 	anv->ctrl.admin_q = blk_mq_init_queue(&anv->admin_tagset);
  	if (IS_ERR(anv->ctrl.admin_q)) {
  		ret = -ENOMEM;
 -		goto put_dev;
@@ -60,7 +64,7 @@
  	}
  
  	nvme_reset_ctrl(&anv->ctrl);
-@@ -1527,8 +1543,9 @@ static int apple_nvme_probe(struct platform_device *pdev)
+@@ -1526,8 +1542,9 @@ static int apple_nvme_probe(struct platform_device *pdev)
  
  	return 0;
  
@@ -72,3 +76,6 @@
  	return ret;
  }
  
+-- 
+2.34.1
+
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y        |  Success    |  Success   |