From patchwork Tue Dec 10 19:47:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 13902003 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) (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 700CC23ED44 for ; Tue, 10 Dec 2024 20:26:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.145.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733862363; cv=none; b=deEFRdLSvw6Sq0AMmynZ+npiWW9xLfHGzgRw5dqm5HQVt87i5j76f/flDyk/wVHJpTUy7mD0zMbxHDa1rwmzPCxh3YoHvn8DxWDXU5ytHOLY/gbwmihv1M0biB6hW0S69SpkRA8E3B9WU16OY88bpJwDLqkyUQiI1ZfxM5oENe8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733862363; c=relaxed/simple; bh=E9ZNDSxL0eVvcu/oD61YwID/6ZeGsMTPAFATVdwy/F4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=u0WupMAjrkdTDRxTBzfEE9gNC0mkVx59SvdZmI0GOdSKHJHRVrFimy0/3BJe4GweXGvxjBSbSdxQYFgOqd6qGppV4+Xli+2gxIAcrl0arstktmihidd+JkmUR5wF/liapwvvlUsYrvpuPGmJPrGYrmLbTZUo0UAEYLkl8xrlyVo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meta.com; spf=pass smtp.mailfrom=meta.com; dkim=pass (2048-bit key) header.d=meta.com header.i=@meta.com header.b=eWP60xGX; arc=none smtp.client-ip=67.231.145.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meta.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=meta.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=meta.com header.i=@meta.com header.b="eWP60xGX" Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4BAHvRp8030100 for ; Tue, 10 Dec 2024 12:26:01 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=s2048-2021-q4; bh=924Fq1a7MqtuYjIm12r9i7+BviK2AxhmOrAIwHZ2dfo=; b=eWP60xGXAGym dxeGptt8caqa2+Ns4mCDH5t9b0UWGwXUeYZOPjoXvsISKt2yJRL10YPKaiyi33l4 X2MwC37yktGh/iGjqkHQ0Hu6f3xZPRY3bdmrN3/PT9/QLN/gQMdAbxT5zyDy2ytF YKlZW+E3UkNIRe4w13kTsGF788lzTtzw+NEoVxWVHceX1naVDm0OARGz7DZCgwMR ZR/6mpyA1eNv68gXf/FlkoQxJHjwaHOcpcTPVxMDsc3nc9QDpOq7rYCGy1SEXAyc zH8m7GMtQKBQ4oOExjoAZej+NT83xJo/xgjwmsBMe/ANTho9/RPtqA27GuEUndM0 nGTZZ8OSdQ== Received: from maileast.thefacebook.com ([163.114.135.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 43etg996xk-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 10 Dec 2024 12:26:01 -0800 (PST) Received: from twshared9216.15.frc2.facebook.com (2620:10d:c0a8:1b::30) by mail.thefacebook.com (2620:10d:c0a9:6f::237c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1544.11; Tue, 10 Dec 2024 20:25:39 +0000 Received: by devbig638.nha1.facebook.com (Postfix, from userid 544533) id 8DB2115D5C7CA; Tue, 10 Dec 2024 11:48:08 -0800 (PST) From: Keith Busch To: , , , , , CC: , , , , Keith Busch , Hannes Reinecke Subject: [PATCHv13 06/11] io_uring: enable per-io write streams Date: Tue, 10 Dec 2024 11:47:17 -0800 Message-ID: <20241210194722.1905732-7-kbusch@meta.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20241210194722.1905732-1-kbusch@meta.com> References: <20241210194722.1905732-1-kbusch@meta.com> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: Z_cBBjgjMN-qTeMOCi8ruPb1tDfNiCgN X-Proofpoint-GUID: Z_cBBjgjMN-qTeMOCi8ruPb1tDfNiCgN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-05_03,2024-10-04_01,2024-09-30_01 From: Keith Busch Allow userspace to pass a per-I/O write stream in the SQE: __u8 write_stream; The __u8 type matches the size the filesystems and block layer support. Application can query the supported values from the statx max_write_streams field. Unsupported values are ignored by file operations that do not support write streams or rejected with an error by those that support them. Reviewed-by: Hannes Reinecke Signed-off-by: Keith Busch Reviewed-by: Nitesh Shetty --- include/uapi/linux/io_uring.h | 4 ++++ io_uring/io_uring.c | 2 ++ io_uring/rw.c | 1 + 3 files changed, 7 insertions(+) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 38f0d6b10eaf7..986a480e3b9c2 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -92,6 +92,10 @@ struct io_uring_sqe { __u16 addr_len; __u16 __pad3[1]; }; + struct { + __u8 write_stream; + __u8 __pad4[3]; + }; }; union { struct { diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index ae36aa702f463..b561c5e8879ac 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -3869,6 +3869,8 @@ static int __init io_uring_init(void) BUILD_BUG_SQE_ELEM(44, __s32, splice_fd_in); BUILD_BUG_SQE_ELEM(44, __u32, file_index); BUILD_BUG_SQE_ELEM(44, __u16, addr_len); + BUILD_BUG_SQE_ELEM(44, __u8, write_stream); + BUILD_BUG_SQE_ELEM(45, __u8, __pad4[0]); BUILD_BUG_SQE_ELEM(46, __u16, __pad3[0]); BUILD_BUG_SQE_ELEM(48, __u64, addr3); BUILD_BUG_SQE_ELEM_SIZE(48, 0, cmd); diff --git a/io_uring/rw.c b/io_uring/rw.c index 5b24fd8b69f62..416ccd89a77ed 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -316,6 +316,7 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe, } rw->kiocb.dio_complete = NULL; rw->kiocb.ki_flags = 0; + rw->kiocb.ki_write_stream = READ_ONCE(sqe->write_stream); rw->addr = READ_ONCE(sqe->addr); rw->len = READ_ONCE(sqe->len);