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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B21F7C19F2D for ; Sat, 13 Aug 2022 13:26:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237284AbiHMN0g (ORCPT ); Sat, 13 Aug 2022 09:26:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235278AbiHMN0f (ORCPT ); Sat, 13 Aug 2022 09:26:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E68843E7D for ; Sat, 13 Aug 2022 06:26:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2886CB80189 for ; Sat, 13 Aug 2022 13:26:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80289C433C1; Sat, 13 Aug 2022 13:26:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660397191; bh=1MDCMN40L69uhzQeuelXl/x1ZWyhnvOFeOlITW3jb68=; h=Subject:To:Cc:From:Date:From; b=wtMVY3n3xbHqTSbCv1NVVf78UjDwtRLlx9P3Yb+HnbSNx+peuBM9nMuTy4hvcqsZs JjtfI8sU9RgflK/S3ev7XCKw9ca68GpyjjIYZJp9iKXWQsLD6d3Ey48b7IPG9cS5eG zvNrjL/qLIeQ0XBhcJt9gMLf6/g37F5LeSNBnILM= Subject: FAILED: patch "[PATCH] scsi: lpfc: Remove extra atomic_inc on cmd_pending in" failed to apply to 5.15-stable tree To: jsmart2021@gmail.com, justin.tee@broadcom.com, martin.petersen@oracle.com, stable@vger.kernel.org Cc: From: Date: Sat, 13 Aug 2022 15:26:29 +0200 Message-ID: <1660397189208193@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.15-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 . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 0948a9c5386095baae4012190a6b65aba684a907 Mon Sep 17 00:00:00 2001 From: James Smart Date: Fri, 1 Jul 2022 14:14:17 -0700 Subject: [PATCH] scsi: lpfc: Remove extra atomic_inc on cmd_pending in queuecommand after VMID VMID introduced an extra increment of cmd_pending, causing double-counting of the I/O. The normal increment ios performed in lpfc_get_scsi_buf. Link: https://lore.kernel.org/r/20220701211425.2708-5-jsmart2021@gmail.com Fixes: 33c79741deaf ("scsi: lpfc: vmid: Introduce VMID in I/O path") Cc: # v5.14+ Co-developed-by: Justin Tee Signed-off-by: Justin Tee Signed-off-by: James Smart Signed-off-by: Martin K. Petersen diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index ba5e4016262e..084c0f9fdc3a 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -5456,7 +5456,6 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) cur_iocbq->cmd_flag |= LPFC_IO_VMID; } } - atomic_inc(&ndlp->cmd_pending); #ifdef CONFIG_SCSI_LPFC_DEBUG_FS if (unlikely(phba->hdwqstat_on & LPFC_CHECK_SCSI_IO))