From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by aws-us-west-2-korg-lkml-1.web.codeaurora.org (Postfix) with ESMTP id 8BD28C004E4 for ; Wed, 13 Jun 2018 16:37:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B18E2086A for ; Wed, 13 Jun 2018 16:37:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4B18E2086A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=codethink.co.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935473AbeFMQhn (ORCPT ); Wed, 13 Jun 2018 12:37:43 -0400 Received: from imap1.codethink.co.uk ([176.9.8.82]:47983 "EHLO imap1.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935042AbeFMQhl (ORCPT ); Wed, 13 Jun 2018 12:37:41 -0400 Received: from [148.252.241.226] (helo=xylophone) by imap1.codethink.co.uk with esmtpsa (Exim 4.84_2 #1 (Debian)) id 1fT8m8-0003Gi-5P; Wed, 13 Jun 2018 17:37:36 +0100 Message-ID: <1528907855.2289.157.camel@codethink.co.uk> Subject: Re: [PATCH 4.4 110/268] nvme-pci: Fix nvme queue cleanup if IRQ setup fails From: Ben Hutchings To: Keith Busch Cc: Jianchao Wang , stable@vger.kernel.org, Sasha Levin , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Date: Wed, 13 Jun 2018 17:37:35 +0100 In-Reply-To: <20180613163007.GD5574@localhost.localdomain> References: <20180528100202.045206534@linuxfoundation.org> <20180528100214.621806271@linuxfoundation.org> <1528906474.2289.155.camel@codethink.co.uk> <20180613163007.GD5574@localhost.localdomain> Organization: Codethink Ltd. Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2018-06-13 at 10:30 -0600, Keith Busch wrote: > On Wed, Jun 13, 2018 at 05:14:34PM +0100, Ben Hutchings wrote: > > On Mon, 2018-05-28 at 12:01 +0200, Greg Kroah-Hartman wrote: > > >   result = adapter_alloc_sq(dev, qid, nvmeq); > > >   if (result < 0) > > > @@ -1597,9 +1597,12 @@ static int nvme_create_queue(struct nvme > > >   return result; > > >   > > >   release_sq: > > > + dev->online_queues--; > > > > This addition looks wrong.  dev->online_queues is incremented by > > nvme_init_queue(), but this function only calls that at a point where > > it is sure to succeed.  So why would a failure path need to decrement > > it? > > Thank you very much the catching that. This particular patch is indeed > not correct without the following: > >   161b8be2bd6ab ("nvme-pci: initialize queue memory before interrupts") Oh, now I see. Do you think that commit is suitable for stable branches? Ben. -- Ben Hutchings, Software Developer   Codethink Ltd https://www.codethink.co.uk/ Dale House, 35 Dale Street Manchester, M1 2HF, United Kingdom