Received: by 2002:a05:6512:3d0e:0:0:0:0 with SMTP id d14csp39140lfv; Tue, 12 Apr 2022 16:21:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUhmHEa1P0WKm3GU2LMRAowbGpFQ+uURLUvPfSG8381ftS1irFA/R1MkgEnxlR/UxFs3+l X-Received: by 2002:aa7:90d5:0:b0:4e1:307c:d94a with SMTP id k21-20020aa790d5000000b004e1307cd94amr40048595pfk.38.1649805717624; Tue, 12 Apr 2022 16:21:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649805717; cv=none; d=google.com; s=arc-20160816; b=nvC5vJNnbn0wMZj8jrSB+V3flw5TNmrglSPWBMikPN789JizLbyqWVzgv61OupcHdC ey+hToP7a4isE0RsPt5P9H2bGC3xqJcY/N7ZYN5ZDsg0SO2WlLBmpJsjmeWiC4ZR/477 KgSLXNhjiuD3EJFUEmqGwk38p1i1YRnnLU/LiEhYoFVpuWFdSaYfpJ77IM6QK9LdI5kW dOhCLPe2rtoQZt2Q1wnPH7lnVixYBNsEXsO/tRds6LHgGy0EUOzgJT35qW5JtHS+lk9s 2A/F0HUvkU9N7eZIW8ZIUxifEe3s9P64VQS5NDZhOhgm91bLZWasvp1lDzE2KTYhfNV+ fXfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=J4Szn4AIz0Sj7MT9EXi7mT2Kkuy07r6MNYgmO/GwuAE=; b=DsM3g/NJzEu5WXY1dJ26NbNclW3Mm7Kd8tjxiVMJnk2t0dqIO767X8AvlctJ3myL7i 0YVkbIIDW4K3oZdVUr3eoGY8csX/doerXrBCrcpMcDEhO9w13r8iavH/th+O0sn7oat2 yXW8ud9gkPpVRR+zCjyS7KAbOqbPFdSSzV2muVWy6eKyEi9S+0fhqh2Kvdkg/YBiZXQ4 hdhoW7MKahhjGy+f1OrVxEeDHV+9zL797sLdLhwRokA9lNFD3QQuzNtoKbRPX6TaGo7Q Jbno5c+TP8Ry6vN01w7Hfo9ln/ZYxBVEgfI/ShmgdfWdIJfPO6xlhE8S2YGBtxoo875E 4oiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=a9k9PdVx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id o17-20020a639211000000b00399460d4c17si4379881pgd.376.2022.04.12.16.21.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 16:21:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=a9k9PdVx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 21857ECB38; Tue, 12 Apr 2022 14:13:46 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1384024AbiDLIi5 (ORCPT + 99 others); Tue, 12 Apr 2022 04:38:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357092AbiDLHjq (ORCPT ); Tue, 12 Apr 2022 03:39:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28DB99FD4; Tue, 12 Apr 2022 00:11:48 -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 dfw.source.kernel.org (Postfix) with ESMTPS id B8921616E7; Tue, 12 Apr 2022 07:11:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB604C385A5; Tue, 12 Apr 2022 07:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649747507; bh=qBiFHKXgg2zD6b/5j7HVuOH2dTTTHrfHFZb8RUAUM90=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a9k9PdVxonjhQ9cFQOGdEV36tdOvSHzxYVmBclcCQ5oUy5S8AcqmcKBFuPzzdYnPo BGDJwvOb67LqamlIouSjb0/vf8zqQnN9scMABCSbUtMUo2OxrIP+QgjnSphLmBVSHx SDhdHmkQkm4zpp5uR2UZRksxbbq8QiIWsxbdL0v0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jack Wang , Damien Le Moal , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.17 102/343] scsi: pm8001: Fix pm8001_mpi_task_abort_resp() Date: Tue, 12 Apr 2022 08:28:40 +0200 Message-Id: <20220412062954.042654150@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062951.095765152@linuxfoundation.org> References: <20220412062951.095765152@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Damien Le Moal [ Upstream commit 7e6b7e740addcea450041b5be8e42f0a4ceece0f ] The call to pm8001_ccb_task_free() at the end of pm8001_mpi_task_abort_resp() already frees the ccb tag. So when the device NCQ_ABORT_ALL_FLAG is set, the tag should not be freed again. Also change the hardcoded 0xBFFFFFFF value to ~NCQ_ABORT_ALL_FLAG as it ought to be. Link: https://lore.kernel.org/r/20220220031810.738362-19-damien.lemoal@opensource.wdc.com Reviewed-by: Jack Wang Signed-off-by: Damien Le Moal Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/pm8001/pm8001_hwi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c index d853e8d0195a..4f4a9dcb6a1e 100644 --- a/drivers/scsi/pm8001/pm8001_hwi.c +++ b/drivers/scsi/pm8001/pm8001_hwi.c @@ -3706,12 +3706,11 @@ int pm8001_mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) mb(); if (pm8001_dev->id & NCQ_ABORT_ALL_FLAG) { - pm8001_tag_free(pm8001_ha, tag); sas_free_task(t); - /* clear the flag */ - pm8001_dev->id &= 0xBFFFFFFF; - } else + pm8001_dev->id &= ~NCQ_ABORT_ALL_FLAG; + } else { t->task_done(t); + } return 0; } -- 2.35.1