Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
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,
        jaswin@linux.ibm.com, bvanassche@acm.org,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH v2 09/16] block: Error an attempt to split an atomic write bio
Date:   Tue, 12 Dec 2023 11:08:37 +0000
Message-Id: <20231212110844.19698-10-john.g.garry@oracle.com>
In-Reply-To: <20231212110844.19698-1-john.g.garry@oracle.com>
References: <20231212110844.19698-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5jWhRlyWq4JkCLK9oEjRLMCTuZBvw/fU3kytPjc+3noKN0mHT31jYSTbp48e?=
 =?us-ascii?Q?zmj6DyCumKl4ANY9eA0UJaiMmyU3V0MghIe/87H8bGdm9Ea+r7gUaC4eHSjx?=
 =?us-ascii?Q?h/JAXGOKH95FGKL5m0fWmlTW3wztocHRVNUizUq1dS4X9k77cnBGTifSWr0P?=
 =?us-ascii?Q?Qby2yCZiNKakonYyGOQ3Aou4g2ayTVFkDxKayTVluVo+N3SY2Y0GUtlad8mH?=
 =?us-ascii?Q?uwj88kkyWWwgmwIXUzh2fLvXIDPoHbFRc3Xe3yyL4gumldiT0SWJ8BqMFCjd?=
 =?us-ascii?Q?7fv/tAkeiCBM8M4UPUGksO+hNxA8bP2G7219M4jiF/Q441d/2G1gl+fKoihi?=
 =?us-ascii?Q?jNJ13zX0/hmYuhqf1IDjj5M4EP8rfuTI0p4Z10X6H9+ddP0wwWm2saaQAMi+?=
 =?us-ascii?Q?hmNDGj+SyO9VXPkehfWrQdHPHDyRANiDGRGcnXAVgoYXWXBrKv5aR/8Gr6IA?=
 =?us-ascii?Q?oPhHjxp+R/OoN01AmEPc2thKFk/y7A5F+mQbArmuAv6mJBBxAbSAcLgxyr+N?=
 =?us-ascii?Q?Boh+p8WmQVddAzvBKvTGMP7GxgvnCd7z6CjzHbqo0nyrLot/fSvbUvkYC5gx?=
 =?us-ascii?Q?Tt4ROR3kT0RJHt7Fq5apgP0u7Jc0+ZWesXRZ8KmUNgC6DfVf6PkPHQO8yy+h?=
 =?us-ascii?Q?h0i+HXb2pCtBU0oBbzxEWCKOXVNfMbN1KHyzsC+B/Kxt22JKZFDD+Z4rNuD8?=
 =?us-ascii?Q?1IQ2xYx7NrbyQsM4zofbxzQI9GTDBxlKHxpX8clrgXf94nEpKwvvyDHAZahe?=
 =?us-ascii?Q?6m/s0H/soK7eqdXoAFKa1GcCKqawFHXEXnfY/mS54qm6WJJCQtSSqxCwkYqp?=
 =?us-ascii?Q?Fwws8m4MHTgu8WFoGp6aMHoGyELREUX2jXTFSVXptYp28uXJqno46bUMcbTZ?=
 =?us-ascii?Q?Mdp8IgEzKqRsgtACVkHx8jM9MyKJLuuTEGOOG3VhAx4V49lEFavf8tCE8YwB?=
 =?us-ascii?Q?HGV5PUeZibFmIm1UCV+TLN7n9MnIHrR56YmAR+8oDGxen8KmC8kqlqhfz8rz?=
 =?us-ascii?Q?RXO057XZG5Ylb1iUxMzHjjMx4z2nYgT+QvhNX3PYeqmxS1zsbeCSlWlxAezR?=
 =?us-ascii?Q?MQQ+ESJu4EYQYa7poQfRJkJJVp3FdqArBsqY9OG0ebrWIM62+awWee2TImAb?=
 =?us-ascii?Q?OrpZwmUdtZdgW+vJUy2VKNi6PI/izLz1zwtftyUeIUW+enn+8dpBttIVawly?=
 =?us-ascii?Q?T1mAykgre0DxpHbCLGUEde60Lj4gzEgHf2v5n9mVI13Ko2LxYvYUtUeMNURg?=
 =?us-ascii?Q?ypWvutcaZOXwf5ZEyeheG56YpR59smJslDnVOAPKQurCpg/1ZwKV9envUtLi?=
 =?us-ascii?Q?KURiQMNko0JNa9CzI1WFOM5PmzDfh+XY5F1J6Q7Vknygrr51iFkaObNZx04A?=
 =?us-ascii?Q?dyI/h4HLuIvkOn3F6LEkZfkHBajQUq9iXWU7vRLBHMCufhc0tJfMDl00Fxdi?=
 =?us-ascii?Q?9xCGwnBg/BpQm3CdttVZZqJ1Yl5hML6Etj+JeDb/AA18Oe6i2xcKUA72W1X/?=
 =?us-ascii?Q?vN8EHLe+LAICT0ItjDiFSc2KnWYmxsVB9VK4vhLxfjk6xh08IhP+QFrUdUh1?=
 =?us-ascii?Q?EEeuJBSu9WVdgQhzH+eAJ+Gif140fNT5tgdqSxFdVJ+GDz/5yOBIDsI+aaGQ?=
 =?us-ascii?Q?Fw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: nOT/esikKOMFcIHsVs+2/809kSYnH4clK3ho60jO58iDWJeFArQNWSYcqPA13/nCNUV9MBCSzdFo0TMLNfjvmMNpJfs+6+2FLUaMMSccG4Z7C6WBwPMo0tTvr17aU3aVN9Yas9nsBBsYIpyoEQRX5XXa1ElcpWRFgkUzTcor3PGfiiIu3vVB864ywirhYisSwkIfsw/MC61YW/VFMihtrXqMOtlo9vemiFjLDzYyDxfbIR3oMDwMmk+0VEPG1m0Orqi47r5l4RLQwa8VHTODnsWyURbKM9HcrdH1AFFoU61u+VFBZlBlmOIcYAAsdqb3F5qTLVYL5NAPkRlE6/51TZ50mo8ueMILJ2S4RdxDjCFUWsM3lEmCDNYYoT02BSW5mG2251AUDLey35A5D8ieFQElQbxiA5C2yKeXEhaBDe2xyxe7OAdgA07VafHzdffV8dK/i0LO6dnwOmqpcZp7H/SXTiJKQOVRpIECqeMdVQkG5FyV8Pljv7IIQCM1DUtwtYdX7B014/r9J8PnWbr24BzLRAKrRiOkI9abNH9BiZB2VKlvHdqTCv6nTYtOfxP2IV/8OVVNU3esProWbXWTtfqUH7dZ3HOJi63U4yMMeBw=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 809b23a5-acf0-4b67-5e01-08dbfb02cc58
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2023 11:09:24.1206
 (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: PQakJvdJMvasrKfyyp1dAimmYggIpla4ZFwaSUejn7CvCnU4dvGea6LiMilpWtlPp4tqOpF6GPYNjD2NR/6UzA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6663
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-12-12_04,2023-12-12_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 malwarescore=0 spamscore=0
 suspectscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2312120089
X-Proofpoint-ORIG-GUID: DMgOnbWTaz44WN15Adm_VKhvivd5NfaK
X-Proofpoint-GUID: DMgOnbWTaz44WN15Adm_VKhvivd5NfaK
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Tue, 12 Dec 2023 03:10:39 -0800 (PST)

As the name suggests, we should not be splitting these.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 block/blk-merge.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 8d4de9253fe9..bc21f8ff4842 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -319,6 +319,11 @@ struct bio *bio_split_rw(struct bio *bio, const struct queue_limits *lim,
 	*segs = nsegs;
 	return NULL;
 split:
+	if (bio->bi_opf & REQ_ATOMIC) {
+		bio->bi_status = BLK_STS_IOERR;
+		bio_endio(bio);
+		return ERR_PTR(-EIO);
+	}
 	/*
 	 * We can't sanely support splitting for a REQ_NOWAIT bio. End it
 	 * with EAGAIN if splitting is required and return an error pointer.
-- 
2.35.3