From patchwork Wed Apr 16 08:42:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 881794 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4EC8216D9C2; Wed, 16 Apr 2025 08:43:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744793009; cv=none; b=lcQ4O+eYhjoZcfdg/f8p8z+MlqHqybsOZ8R8GWHtH+F2qrsLuJCQle/5ChCTKZkZGuLyjOTV+2+zTdnR3JPrvculyMtLuFHSgeGYar2opaMfUGj2cnMiBnhdX9mn1OCsoAsTzgiKUTXvGH+JBHAq/ILxVTXhAlrICVAUSGAEDa0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744793009; c=relaxed/simple; bh=lOyMiD9UoD5MQZTrgDpJRPHt2vdkigYv1J/uj0DvuAA=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cw6l/3uFvvcguZ5Dfbp7HcNOy0FMFjWRhx+7asB3HZuhskuxN2iCAZIUrCiLMjV3ZmMazIIASIJ75vmxL1Zz2nG/trQDWDj8GufUBeI0BBQHwy6EgCa71PuRUznQ1KM2o+OH2lqQf6QLAeTzuHxpBmJ72DbVcH1KmPd33nfdO0A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Xp0uctuS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Xp0uctuS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3AA76C4CEE9; Wed, 16 Apr 2025 08:43:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744793008; bh=lOyMiD9UoD5MQZTrgDpJRPHt2vdkigYv1J/uj0DvuAA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Xp0uctuSNYSXMK2/1inUMPZSdK2vCMQQ+gcqMXQYJq5rVFHnLh2cY5vgLl4wcYCHl NWkrb56FYKPlRmuxkbihQ/RDPwg4eG2xkT8aMprVKZhBSSZvON7FGZmATI5z82QscG STkmJisGD3VfIXreqHD9a3uZLQGdlhVh2cuojO3E2h+UMK7BEuIZrlao69ZD3wIXP9 3VY54bcSl1HLK4AZ9x+j/j6ctIKQMEnETEdZTmFON439jdst0iIZBY/Dm2z+lxKzh+ Q6J0AyboyKHrXgQi1JofS42g5SjHRm8YQC1pFWp0bXb7p8uNJcCL5K/EIjAK0bPW0L sl0eOjlBJPZtQ== From: Damien Le Moal To: linux-ide@vger.kernel.org, Niklas Cassel , linux-scsi@vger.kernel.org, "Martin K . Petersen" Subject: [PATCH 3/3] scsi: Improve CDL control Date: Wed, 16 Apr 2025 17:42:38 +0900 Message-ID: <20250416084238.258169-4-dlemoal@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250416084238.258169-1-dlemoal@kernel.org> References: <20250416084238.258169-1-dlemoal@kernel.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 With ATA devices supporting the CDL feature, using CDL requires that the feature be enabled with a SET FEATURES command. This command is issued as the translated command for the MODE SELECT command issued by scsi_cdl_enable() when the user enables CDL through the device cdl_enable sysfs attribute. However, the implementation of scsi_cdl_enable() always issues a MODE SELECT command for ATA devices when the enable argument is true, even if CDL is already enabled on the device. While this does not cause any issue with using CDL descriptors with read/write commands (the CDL feature will be enabled on the drive), issuing the MODE SELECT command even when the device CDL feature is already enabled will cause a reset of the ATA device CDL statistics log page (as defined in ACS, any CDL enable action must reset the device statistics). Avoid this needless actions (and the implied statistics log page reset) by modifying scsi_cdl_enable() to issue the MODE SELECT command to enable CDL if and only if CDL is not reported as already enabled on the device. And while at it, simplify the initialization of the is_ata boolean variable and move the declaration of the scsi mode data and sense header variables to within the scope of ATA device handling. Fixes: 1b22cfb14142 ("scsi: core: Allow enabling and disabling command duration limits") Cc: stable@vger.kernel.org Signed-off-by: Damien Le Moal Reviewed-by: Igor Pylypiv --- drivers/scsi/scsi.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 53daf923ad8e..518a252eb6aa 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -707,26 +707,23 @@ void scsi_cdl_check(struct scsi_device *sdev) */ int scsi_cdl_enable(struct scsi_device *sdev, bool enable) { - struct scsi_mode_data data; - struct scsi_sense_hdr sshdr; - struct scsi_vpd *vpd; - bool is_ata = false; char buf[64]; + bool is_ata; int ret; if (!sdev->cdl_supported) return -EOPNOTSUPP; rcu_read_lock(); - vpd = rcu_dereference(sdev->vpd_pg89); - if (vpd) - is_ata = true; + is_ata = rcu_dereference(sdev->vpd_pg89); rcu_read_unlock(); /* * For ATA devices, CDL needs to be enabled with a SET FEATURES command. */ if (is_ata) { + struct scsi_mode_data data; + struct scsi_sense_hdr sshdr; char *buf_data; int len; @@ -735,16 +732,30 @@ int scsi_cdl_enable(struct scsi_device *sdev, bool enable) if (ret) return -EINVAL; - /* Enable CDL using the ATA feature page */ + /* Enable or disable CDL using the ATA feature page */ len = min_t(size_t, sizeof(buf), data.length - data.header_length - data.block_descriptor_length); buf_data = buf + data.header_length + data.block_descriptor_length; - if (enable) - buf_data[4] = 0x02; - else - buf_data[4] = 0; + + /* + * If we want to enable CDL and CDL is already enabled on the + * device, do nothing. This avoids needlessly resetting the CDL + * statistics on the device as that is implied by the CDL enable + * action. Similar to this, there is no need to do anything if + * we want to disable CDL and CDL is already disabled. + */ + if (enable) { + if ((buf_data[4] & 0x03) == 0x02) + goto out; + buf_data[4] &= ~0x03; + buf_data[4] |= 0x02; + } else { + if ((buf_data[4] & 0x03) == 0x00) + goto out; + buf_data[4] &= ~0x03; + } ret = scsi_mode_select(sdev, 1, 0, buf_data, len, 5 * HZ, 3, &data, &sshdr); @@ -756,6 +767,7 @@ int scsi_cdl_enable(struct scsi_device *sdev, bool enable) } } +out: sdev->cdl_enable = enable; return 0;