Received-SPF: pass (google.com: domain of linux-kernel+bounces-36898-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: John Garry <john.g.garry@oracle.com>
To: axboe@kernel.dk, kbusch@kernel.org, hch@lst.de, sagi@grimberg.me,
        jejb@linux.ibm.com, martin.petersen@oracle.com, djwong@kernel.org,
        viro@zeniv.linux.org.uk, brauner@kernel.org, dchinner@redhat.com,
        jack@suse.cz
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-nvme@lists.infradead.org, linux-xfs@vger.kernel.org,
        linux-fsdevel@vger.kernel.org, tytso@mit.edu, jbongio@google.com,
        linux-scsi@vger.kernel.org, ming.lei@redhat.com, ojaswin@linux.ibm.com,
        bvanassche@acm.org, John Garry <john.g.garry@oracle.com>
Subject: [PATCH v3 12/15] scsi: sd: Add WRITE_ATOMIC_16 support
Date: Wed, 24 Jan 2024 11:38:38 +0000
Message-Id: <20240124113841.31824-13-john.g.garry@oracle.com>
In-Reply-To: <20240124113841.31824-1-john.g.garry@oracle.com>
References: <20240124113841.31824-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?pNBIbsfEI9nXd6uZi2dS+PdSDXpopxZvGuYyRPEkTkxcGeM27XFhNx3DRKZV?=
 =?us-ascii?Q?SKPL6Y/A5MFytowBMx6YjjQZII0kLdqFGA0k4ETC8MRYYI9rWFVp8LqBBG+r?=
 =?us-ascii?Q?TdSVA4WCF9sWPOSe31vRFaGiKt9pLS3yKO8z/V3hdvjiSQs+4Yrkn65dilVv?=
 =?us-ascii?Q?QysRl5sFbjA6EhDi0NE7NrLARvH7Gs+YurH0XhQaa/PaVYV8NP6/t6ix/T/p?=
 =?us-ascii?Q?9oQlg8qrUhnvcv+v9ZAg9tdIs4Vi3JpNC5n2IEpOhWnJchQjDAA8/UAR2vaZ?=
 =?us-ascii?Q?Iez0lSJR8tBKeIDD1CrEPCELEPQL2ssYAWJST/Vy10+iPeQldcKExFgaShr5?=
 =?us-ascii?Q?IbWqQZ8yjqxvH4sp+aH4yWoDstf3Vd9iFTBygiZHAO9hf/CL6oeW8430Bgwd?=
 =?us-ascii?Q?LzJIdQ8PksxkHihnsp1s7wxxNYg1tdpJm72NI+kgV5P7RB2JJBFHIhzliOLL?=
 =?us-ascii?Q?zJ4pwKo+2HUyzdtl48dEq8VVKimaXywHp7MwHK0nz5576lL5t7GFQG7/FGxp?=
 =?us-ascii?Q?7ZkI476msPDcIFB6j1stcgjPMaPlhaATPe2AmF0w3FBAfN/gfOPO/zdiWKSn?=
 =?us-ascii?Q?eNQLthYNk+rNQBaJYAGrE5rSU0qDJwqccOm/bedEwdczWqwJri4MrQmo3k/8?=
 =?us-ascii?Q?UxowgTvA4CLCOxNslHIi92pS1TC7tDzcuJuMv9tTvw80ecGzT61CBMIg7Is3?=
 =?us-ascii?Q?15jJorerp9IqexP9eAsjuIahTRQGXtz5Zg3D2TURGNCwN6vCdzBRr5VDL9Cr?=
 =?us-ascii?Q?6XJ52qGjrXyorvi1Bf//wvuTQFX+NgaIoEg3UDcpYvpUVjbHRTI102je+EBv?=
 =?us-ascii?Q?hQHyGaxoVR2Jsw4q+Qs8eFCYcDAY835rkaCzEQueLQBkdpIo77XCaXVGGLrT?=
 =?us-ascii?Q?xhwQ/rtpwC9R8/Nd1IvyuJgF8azSiI9bv2xuhnVuTgN3u71AP3ArZiEqmmRZ?=
 =?us-ascii?Q?uNkuz3YNTimIfpPLxEOxsCOSUMqogEr13JRCEKosEfV17zevQx9NOt7rzgsg?=
 =?us-ascii?Q?3v7e6b4u/d1O6K/0iWOrGxPTZDSJQupURw5c6p0aoLefDKvY8c+FEKPux/Ye?=
 =?us-ascii?Q?OLsu7H1DEAh3o300yuZGc4k0tNMTQL9sfsiFMp8oKB6OmpZXS7TA+iYus0M8?=
 =?us-ascii?Q?+UJQg4eT2uk/GpZ/5LOjGzaeq3iGW0mCQZJfml5TpEwwTYRVZdO64M4vLFK3?=
 =?us-ascii?Q?ao4VG5VkRAdX4Qk5zs2Jt3MoZYFm9qM70WHd6KVNdNUn+KVJi7ZsXT/7oXP2?=
 =?us-ascii?Q?b/mq9tJbIxtjCmPfv+NsitbCxcRFF7bmdo0PTDisN6IOECz8smq84vl+0hJz?=
 =?us-ascii?Q?smBelfcdFMmXo3yVgLApT4DV6MqHvY5pEFabHSlbSMnBlcwBDFdDR2CfYV3D?=
 =?us-ascii?Q?K3Mnwp7lL0OKMqys1Sl4P8HnADxzLH2epGb1eYd/jQhCQp/cUGdbPKURtCSm?=
 =?us-ascii?Q?TWw8Y2VMU1PCUIEGmZjNV567T1xGi8AhWEksz+BapB/VwyZ+1lfa1gb+lhCn?=
 =?us-ascii?Q?JsKLepCBjHNp3lDKwITSRfvfMjHoLfOkThl8vst1n/Pp4I++KkBa85rWxruT?=
 =?us-ascii?Q?/AWjuzzY0pgBEqmniAUGYY/Fe2xwnEfN/f/DAdl8PF9+aYOZNydWi0Aeaw1I?=
 =?us-ascii?Q?uw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	5ohyIq8jwxFaByjGnxR825DRm1yupSzCiJ0sn9hvv/vdPPB3ABr5q9fQj6z4/H9geXIOb8w07XEm0CPvfnNYasBoeanR1hhobtdsSil3wtuukBlswLRXpxFCwAC3Hwl2z0jEjy3XpCc4u3gw7hcG2QCZFgFltUp2TkCptJAkFr/TC9cfDkD3HDIe+f2XwEktJlFmmVWxxqr66aCjq0Ee1Hq8xQMVT2zn+V323fsa+8SMTWIG6SWhobvBocX393v1ct+HQoYaa35Xmcs2prkvmiVrkqNEDRB22CzOHy7g498KHt+41rHlLfmESwi4PAjmt3Em89olePzRCy7D5N1mJsfIGjfKzSJSVT1+Jy/jKNkKlik3lbq/uLXe19I2ZbtCPZCWn0D4OsLZ1LPj9vJT6biC21PqixOuzdj3+3ZF6jVEo4B/AyCUjjMcCo8Gu3yLuBWVdhQHz9nEaTFch3P895DwUHfNC++OG/wmbBJdcwYvOF0LLYHGnm5OYbtarL9wWBGGmbeCCt9EOLIxuIq9biuR8Qk/3Rd3JrDXqqAZyw8PnRWEKdfqVsxCQQzojNKiQlitLXH0gonVmtIra4o3J3X/hENKAFfGxdtuJakNQs8=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d2accf8b-1e09-45c7-33d5-08dc1cd11ba7
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2024 11:39:21.8287
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: h/eau/8LV6DUChFAYobMju62RCPcdXPJXWZy7vmjtBYM97MIOtp2Ev+uVdeE/LRrTiylz8b6JrzQ0Hom1v1BVQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB5815
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-01-24_06,2024-01-24_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0
 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 adultscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2401240083
X-Proofpoint-GUID: q9TkkVJMWBTu0z72auISEKWcTLU1YY-P
X-Proofpoint-ORIG-GUID: q9TkkVJMWBTu0z72auISEKWcTLU1YY-P

Add function sd_setup_atomic_cmnd() to setup an WRITE_ATOMIC_16
CDB for when REQ_ATOMIC flag is set for the request.

Also add trace info.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 drivers/scsi/scsi_trace.c   | 22 ++++++++++++++++++++++
 drivers/scsi/sd.c           | 24 ++++++++++++++++++++++++
 include/scsi/scsi_proto.h   |  1 +
 include/trace/events/scsi.h |  1 +
 4 files changed, 48 insertions(+)

diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
index 41a950075913..3e47c4472a80 100644
--- a/drivers/scsi/scsi_trace.c
+++ b/drivers/scsi/scsi_trace.c
@@ -325,6 +325,26 @@ scsi_trace_zbc_out(struct trace_seq *p, unsigned char *cdb, int len)
 	return ret;
 }
 
+static const char *
+scsi_trace_atomic_write16_out(struct trace_seq *p, unsigned char *cdb, int len)
+{
+	const char *ret = trace_seq_buffer_ptr(p);
+	unsigned int boundary_size;
+	unsigned int nr_blocks;
+	sector_t lba;
+
+	lba = get_unaligned_be64(&cdb[2]);
+	boundary_size = get_unaligned_be16(&cdb[10]);
+	nr_blocks = get_unaligned_be16(&cdb[12]);
+
+	trace_seq_printf(p, "lba=%llu txlen=%u boundary_size=%u",
+			  lba, nr_blocks, boundary_size);
+
+	trace_seq_putc(p, 0);
+
+	return ret;
+}
+
 static const char *
 scsi_trace_varlen(struct trace_seq *p, unsigned char *cdb, int len)
 {
@@ -385,6 +405,8 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
 		return scsi_trace_zbc_in(p, cdb, len);
 	case ZBC_OUT:
 		return scsi_trace_zbc_out(p, cdb, len);
+	case WRITE_ATOMIC_16:
+		return scsi_trace_atomic_write16_out(p, cdb, len);
 	default:
 		return scsi_trace_misc(p, cdb, len);
 	}
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 32dfb5327f92..7df05d796387 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1240,6 +1240,26 @@ static int sd_cdl_dld(struct scsi_disk *sdkp, struct scsi_cmnd *scmd)
 	return (hint - IOPRIO_HINT_DEV_DURATION_LIMIT_1) + 1;
 }
 
+static blk_status_t sd_setup_atomic_cmnd(struct scsi_cmnd *cmd,
+					sector_t lba, unsigned int nr_blocks,
+					bool boundary, unsigned char flags)
+{
+	cmd->cmd_len  = 16;
+	cmd->cmnd[0]  = WRITE_ATOMIC_16;
+	cmd->cmnd[1]  = flags;
+	put_unaligned_be64(lba, &cmd->cmnd[2]);
+	put_unaligned_be16(nr_blocks, &cmd->cmnd[12]);
+	if (boundary)
+		put_unaligned_be16(nr_blocks, &cmd->cmnd[10]);
+	else
+		put_unaligned_be16(0, &cmd->cmnd[10]);
+	put_unaligned_be16(nr_blocks, &cmd->cmnd[12]);
+	cmd->cmnd[14] = 0;
+	cmd->cmnd[15] = 0;
+
+	return BLK_STS_OK;
+}
+
 static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd)
 {
 	struct request *rq = scsi_cmd_to_rq(cmd);
@@ -1311,6 +1331,10 @@ static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd)
 	if (protect && sdkp->protection_type == T10_PI_TYPE2_PROTECTION) {
 		ret = sd_setup_rw32_cmnd(cmd, write, lba, nr_blocks,
 					 protect | fua, dld);
+	} else if (rq->cmd_flags & REQ_ATOMIC && write) {
+		ret = sd_setup_atomic_cmnd(cmd, lba, nr_blocks,
+				sdkp->use_atomic_write_boundary,
+				protect | fua);
 	} else if (sdp->use_16_for_rw || (nr_blocks > 0xffff)) {
 		ret = sd_setup_rw16_cmnd(cmd, write, lba, nr_blocks,
 					 protect | fua, dld);
diff --git a/include/scsi/scsi_proto.h b/include/scsi/scsi_proto.h
index 07d65c1f59db..833de67305b5 100644
--- a/include/scsi/scsi_proto.h
+++ b/include/scsi/scsi_proto.h
@@ -119,6 +119,7 @@
 #define WRITE_SAME_16	      0x93
 #define ZBC_OUT		      0x94
 #define ZBC_IN		      0x95
+#define WRITE_ATOMIC_16	0x9c
 #define SERVICE_ACTION_BIDIRECTIONAL 0x9d
 #define SERVICE_ACTION_IN_16  0x9e
 #define SERVICE_ACTION_OUT_16 0x9f
diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
index 8e2d9b1b0e77..05f1945ed204 100644
--- a/include/trace/events/scsi.h
+++ b/include/trace/events/scsi.h
@@ -102,6 +102,7 @@
 		scsi_opcode_name(WRITE_32),			\
 		scsi_opcode_name(WRITE_SAME_32),		\
 		scsi_opcode_name(ATA_16),			\
+		scsi_opcode_name(WRITE_ATOMIC_16),		\
 		scsi_opcode_name(ATA_12))
 
 #define scsi_hostbyte_name(result)	{ result, #result }
-- 
2.31.1