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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 661FDC4332E for ; Tue, 2 Mar 2021 13:46:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3619A64F25 for ; Tue, 2 Mar 2021 13:46:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1447609AbhCBNmB (ORCPT ); Tue, 2 Mar 2021 08:42:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:49016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350708AbhCBMX7 (ORCPT ); Tue, 2 Mar 2021 07:23:59 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 09A3064FB1; Tue, 2 Mar 2021 11:58:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614686341; bh=hpTA20+x/ohTHtRp+WJTEbb1TO+3oSW5Dwyo2Yk0Vjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kBSCpcSy6gGe7/srGI698hbU/uRrqb4Gcc6yxSx/LoCtBEs0SPeyo5P5HHwn0J/L4 R1GImjxjkn8vOf1j6sZYxWe9iKtsBemqHFHZ7nwKJMAsVSO87XA//9asXcuIBGW7vL AsyVYaZXTT211YTkQZWje7jF/CqhCl6jK30n1ILbOBym/DUrTjkM6K58bqZrwpeu4l /FEwza1ftGtxesYHtKuN20H/vYUhCOroFlDicz+ZyjjTjObuMsEZC+upwKZzV4nVoD EAdoEseiwikU+bhRyW0tGRBvq035TR8YPG+svySQKzD6Dld+dIY3xg5OOMn+abHOG6 HeHBuTlmcE7zQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aleksandr Miloserdov , Roman Bolshakov , Bodo Stroesser , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com Subject: [PATCH AUTOSEL 4.19 20/21] scsi: target: core: Add cmd length set before cmd complete Date: Tue, 2 Mar 2021 06:58:34 -0500 Message-Id: <20210302115835.63269-20-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302115835.63269-1-sashal@kernel.org> References: <20210302115835.63269-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aleksandr Miloserdov [ Upstream commit 1c73e0c5e54d5f7d77f422a10b03ebe61eaed5ad ] TCM doesn't properly handle underflow case for service actions. One way to prevent it is to always complete command with target_complete_cmd_with_length(), however it requires access to data_sg, which is not always available. This change introduces target_set_cmd_data_length() function which allows to set command data length before completing it. Link: https://lore.kernel.org/r/20210209072202.41154-2-a.miloserdov@yadro.com Reviewed-by: Roman Bolshakov Reviewed-by: Bodo Stroesser Signed-off-by: Aleksandr Miloserdov Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/target/target_core_transport.c | 15 +++++++++++---- include/target/target_core_backend.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index f1b730b77a31..bdada97cd4fe 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -841,11 +841,9 @@ void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status) } EXPORT_SYMBOL(target_complete_cmd); -void target_complete_cmd_with_length(struct se_cmd *cmd, u8 scsi_status, int length) +void target_set_cmd_data_length(struct se_cmd *cmd, int length) { - if ((scsi_status == SAM_STAT_GOOD || - cmd->se_cmd_flags & SCF_TREAT_READ_AS_NORMAL) && - length < cmd->data_length) { + if (length < cmd->data_length) { if (cmd->se_cmd_flags & SCF_UNDERFLOW_BIT) { cmd->residual_count += cmd->data_length - length; } else { @@ -855,6 +853,15 @@ void target_complete_cmd_with_length(struct se_cmd *cmd, u8 scsi_status, int len cmd->data_length = length; } +} +EXPORT_SYMBOL(target_set_cmd_data_length); + +void target_complete_cmd_with_length(struct se_cmd *cmd, u8 scsi_status, int length) +{ + if (scsi_status == SAM_STAT_GOOD || + cmd->se_cmd_flags & SCF_TREAT_READ_AS_NORMAL) { + target_set_cmd_data_length(cmd, length); + } target_complete_cmd(cmd, scsi_status); } diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h index 51b6f50eabee..0deeff9b4496 100644 --- a/include/target/target_core_backend.h +++ b/include/target/target_core_backend.h @@ -69,6 +69,7 @@ int transport_backend_register(const struct target_backend_ops *); void target_backend_unregister(const struct target_backend_ops *); void target_complete_cmd(struct se_cmd *, u8); +void target_set_cmd_data_length(struct se_cmd *, int); void target_complete_cmd_with_length(struct se_cmd *, u8, int); void transport_copy_sense_to_cmd(struct se_cmd *, unsigned char *); -- 2.30.1 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB4C4C433DB for ; Wed, 3 Mar 2021 14:45:31 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 556C764E4E for ; Wed, 3 Mar 2021 14:45:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 556C764E4E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8voH+KgCcoRk/bC0mYFzDeo0yUUSSveDbmbg93iXtF4=; b=o2KRBBOEd1TY1kZutSOQHC9E6 brv1yGgWTiE4Hkk+cahkWs0+NQjmw9VVYWate+8nHMsQggmB4yrERoVQhlpLB134z4ea0RyrS/CMx 8Bv3XQj7Ctno13klctoerys39+ufLSjUrKXB+V+T+ZJ2KDYw4KnVW1HsQrCVhDTKhw7vMZqZD/eS/ KPs2va9nhJrb9HI9g8BnxJyIvvqTQ2tR/DQgjyAqpPVBU+kPoAm0C16IZBp3h9LcbdraRul7XYZd5 ZaL64BwzidZqnyQgOd1FYkFjdgS3dUpsuJO/OD8MnQ2FnMQXob31Ak3fdg1WdZ7FS0kEZt1dogGCp l+w+EIS2A==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHSiL-005Bs3-H1; Wed, 03 Mar 2021 14:43:02 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHSAe-00542j-IK for linux-arm-kernel@desiato.infradead.org; Wed, 03 Mar 2021 14:08:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=ICe7bi4aMmXf/GAPdlg+IBbj7Sr36LLe5lPpYsCUK1o=; b=KGwvIKOz7OVQ53oOs6iDqagWOq 9HboSE58qL5E8yB3esTiKqOgtH/s9yXnauer6trrn9GjgJuC8JUkMjwBQJXy980nf3hnWYxNwB4ya vmr951CyEyLJ/y5E2WsHoOujuDba70oJmfQakIImQuxmE77hH0776YnMLo0s7o/5trhDqJMUf/aPH OOMg5T8Eqxy5sbmRm5WSP9d0RO5ANg1zFe+ztnVeNiWnSTD4pnpYx1fDZoEp1EOn4qki4p/E2zXxA 9NTd6QB000aLrcpEL/VPP4PjAtxm/EqFV8yG5wtunE5Za04DRgluFwkiBseHjKhXReGLUOFhLpk/3 uTc6NltA==; Received: from mail.kernel.org ([198.145.29.99]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lH3g7-00H3RG-6h for linux-arm-kernel@lists.infradead.org; Tue, 02 Mar 2021 11:59:06 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 09A3064FB1; Tue, 2 Mar 2021 11:58:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614686341; bh=hpTA20+x/ohTHtRp+WJTEbb1TO+3oSW5Dwyo2Yk0Vjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kBSCpcSy6gGe7/srGI698hbU/uRrqb4Gcc6yxSx/LoCtBEs0SPeyo5P5HHwn0J/L4 R1GImjxjkn8vOf1j6sZYxWe9iKtsBemqHFHZ7nwKJMAsVSO87XA//9asXcuIBGW7vL AsyVYaZXTT211YTkQZWje7jF/CqhCl6jK30n1ILbOBym/DUrTjkM6K58bqZrwpeu4l /FEwza1ftGtxesYHtKuN20H/vYUhCOroFlDicz+ZyjjTjObuMsEZC+upwKZzV4nVoD EAdoEseiwikU+bhRyW0tGRBvq035TR8YPG+svySQKzD6Dld+dIY3xg5OOMn+abHOG6 HeHBuTlmcE7zQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aleksandr Miloserdov , Roman Bolshakov , Bodo Stroesser , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com Subject: [PATCH AUTOSEL 4.19 20/21] scsi: target: core: Add cmd length set before cmd complete Date: Tue, 2 Mar 2021 06:58:34 -0500 Message-Id: <20210302115835.63269-20-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302115835.63269-1-sashal@kernel.org> References: <20210302115835.63269-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210302_115906_408262_79F041E7 X-CRM114-Status: UNSURE ( 8.66 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Aleksandr Miloserdov [ Upstream commit 1c73e0c5e54d5f7d77f422a10b03ebe61eaed5ad ] TCM doesn't properly handle underflow case for service actions. One way to prevent it is to always complete command with target_complete_cmd_with_length(), however it requires access to data_sg, which is not always available. This change introduces target_set_cmd_data_length() function which allows to set command data length before completing it. Link: https://lore.kernel.org/r/20210209072202.41154-2-a.miloserdov@yadro.com Reviewed-by: Roman Bolshakov Reviewed-by: Bodo Stroesser Signed-off-by: Aleksandr Miloserdov Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/target/target_core_transport.c | 15 +++++++++++---- include/target/target_core_backend.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index f1b730b77a31..bdada97cd4fe 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -841,11 +841,9 @@ void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status) } EXPORT_SYMBOL(target_complete_cmd); -void target_complete_cmd_with_length(struct se_cmd *cmd, u8 scsi_status, int length) +void target_set_cmd_data_length(struct se_cmd *cmd, int length) { - if ((scsi_status == SAM_STAT_GOOD || - cmd->se_cmd_flags & SCF_TREAT_READ_AS_NORMAL) && - length < cmd->data_length) { + if (length < cmd->data_length) { if (cmd->se_cmd_flags & SCF_UNDERFLOW_BIT) { cmd->residual_count += cmd->data_length - length; } else { @@ -855,6 +853,15 @@ void target_complete_cmd_with_length(struct se_cmd *cmd, u8 scsi_status, int len cmd->data_length = length; } +} +EXPORT_SYMBOL(target_set_cmd_data_length); + +void target_complete_cmd_with_length(struct se_cmd *cmd, u8 scsi_status, int length) +{ + if (scsi_status == SAM_STAT_GOOD || + cmd->se_cmd_flags & SCF_TREAT_READ_AS_NORMAL) { + target_set_cmd_data_length(cmd, length); + } target_complete_cmd(cmd, scsi_status); } diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h index 51b6f50eabee..0deeff9b4496 100644 --- a/include/target/target_core_backend.h +++ b/include/target/target_core_backend.h @@ -69,6 +69,7 @@ int transport_backend_register(const struct target_backend_ops *); void target_backend_unregister(const struct target_backend_ops *); void target_complete_cmd(struct se_cmd *, u8); +void target_set_cmd_data_length(struct se_cmd *, int); void target_complete_cmd_with_length(struct se_cmd *, u8, int); void transport_copy_sense_to_cmd(struct se_cmd *, unsigned char *); -- 2.30.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel