From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 6329F37C0EC for ; Fri, 3 Jul 2026 08:52:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783068728; cv=none; b=YdvTN0cCRTNZroyKKkbbssRuHht0TJ+v6C0C7zA36wPtxPfKru4m0ABi0tt91n/phO3gh1gXvsv2eZsvDZzKVb57RwjA43gewvJtLQKBYPzuzWrQnwLuClBVRLjD8Vrvx/fcVWxhBrtdYMveSj5Ngwf6jx4/GBTDmt5QOl78hLo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783068728; c=relaxed/simple; bh=6qjr7o0A9uHhXTy0kRVCpMpJ1v82smRpfFTLoBZYyDU=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B/gEskmhI2KQiKGvH/SUIojXjciv8hw7BR+Y9Ccn9HXZc10PhuWdQ2mW7l+nYaEZLj3gaUkCAOlKZGtv0le2nRHfkKesmr86fQKrHssTwrzK/7b3X0PLgkAJXPwCHCmyBFAJGXfctNbeFZXS+G6MGUJs3v2TZwCaUzziMRCb2oc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jDa3FVx1; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jDa3FVx1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 985401F00A3E; Fri, 3 Jul 2026 08:52:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783068725; bh=lT/e9emlTrtz/Sy+ETutc9C19KnR55aBr4lwuC8KqGM=; h=From:To:Subject:Date:In-Reply-To:References; b=jDa3FVx1JWlSxuacCvFUhl1b6ScGTW873fTlMZSOzu9dxyHGiNOb7M7yu+yUouErt QD+ImBAaJAi7x0rjO/DcRlvzcPG5enzcvyBxzCyWLBvCm/Jfeji0mEKtJ4EzfWYAyB WdmaeHtiBclIAXP96Wz0tUaad6eCA2bKv4NTeinPrR5nOUMFeYjyv1qtRjFBPkETsz PFkkccfNVW9+NTuSdPpQJGiFAWslJC01kgViPjKW7jRFBhpreiha7o1pcAeUJfbN0L joqGgVBWBO4XFIPqSLQ471p8CYMeY6dYxcPnt4l8jPf4/j2kf3gfOw9ScHts13pRAX LtBdZXruNoddg== From: Damien Le Moal To: linux-ide@vger.kernel.org, Niklas Cassel Subject: [PATCH v4 3/5] ata: libata-scsi: improve service action support in ata_scsi_report_supported_opcodes() Date: Fri, 3 Jul 2026 17:51:50 +0900 Message-ID: <20260703085152.2350034-4-dlemoal@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260703085152.2350034-1-dlemoal@kernel.org> References: <20260703085152.2350034-1-dlemoal@kernel.org> Precedence: bulk X-Mailing-List: linux-ide@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ata_scsi_report_supported_opcodes() is ignoring the service action specified in the SCSI command CDB, but the one command format must take this field into consideration. With the reporting options field set to 1, the REPORT SUPPORTED OPERATION CODES command must be failed if the specified opcode to check has service actions, while reporting option 3 must match supported opcodes together with the specified service action. Stop ignoring the service action by passing it to ata_scsi_cmd_is_supported() and searching for commands in the array of supported commands (ata_supported_cmds) using both the command opcode and service action. Introduce the helper function ata_scsi_supported_cmd_use_sa() to determine if a particular command has service actions and use this function to fail a REPORT SUPPORTED OPERATION CODES command if such command is specified with reporting options 1. Signed-off-by: Damien Le Moal Reviewed-by: Hannes Reinecke --- drivers/ata/libata-scsi.c | 41 ++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 196adb684433..39323d39fd75 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -3682,32 +3682,46 @@ static const struct ata_scsi_cmd ata_supported_cmds[] = { { .op = SECURITY_PROTOCOL_OUT, .cdb_len = 12 }, }; -static const struct ata_scsi_cmd *ata_scsi_get_supported_cmd(u8 op) +static const struct ata_scsi_cmd *ata_scsi_get_supported_cmd(u8 op, u16 sa) { const struct ata_scsi_cmd *cmd; int i; for (i = 0; i < ARRAY_SIZE(ata_supported_cmds); i++) { cmd = &ata_supported_cmds[i]; - if (cmd->op == op) + if (cmd->op == op && cmd->sa == sa) return cmd; } return NULL; } +static bool ata_scsi_supported_cmd_use_sa(u8 op) +{ + const struct ata_scsi_cmd *cmd; + int i; + + for (i = 0; i < ARRAY_SIZE(ata_supported_cmds); i++) { + cmd = &ata_supported_cmds[i]; + if (cmd->op == op) + return cmd->sa_valid; + } + + return false; +} + struct ata_scsi_cmd_support { u8 cdlp; u8 rwcdlp; }; -static bool ata_scsi_cmd_is_supported(struct ata_device *dev, u8 op, +static bool ata_scsi_cmd_is_supported(struct ata_device *dev, u8 op, u16 sa, struct ata_scsi_cmd_support *sup) { const struct ata_scsi_cmd *cmd; /* First, see if we support the command. */ - cmd = ata_scsi_get_supported_cmd(op); + cmd = ata_scsi_get_supported_cmd(op, sa); if (!cmd) return false; @@ -3753,15 +3767,28 @@ static unsigned int ata_scsi_report_supported_opcodes(struct ata_device *dev, { struct ata_scsi_cmd_support sup; u8 *cdb = cmd->cmnd; - - if (cdb[2] != 1 && cdb[2] != 3) { + u16 sa = 0; + + switch (cdb[2]) { + case 1: + /* One command format with command support data, ignore sa. */ + if (ata_scsi_supported_cmd_use_sa(cdb[3])) { + ata_scsi_set_invalid_field(dev, cmd, 3, 0xff); + return 0; + } + break; + case 3: + /* One command format */ + sa = get_unaligned_be16(&cdb[4]); + break; + default: ata_dev_warn(dev, "invalid command format %d\n", cdb[2]); ata_scsi_set_invalid_field(dev, cmd, 2, 0xff); return 0; } /* One command format */ - if (ata_scsi_cmd_is_supported(dev, cdb[3], &sup)) { + if (ata_scsi_cmd_is_supported(dev, cdb[3], sa, &sup)) { rbuf[0] = sup.rwcdlp; rbuf[1] = (sup.cdlp << 3) | 0x03; } else { -- 2.54.0