From mboxrd@z Thu Jan 1 00:00:00 1970 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 1A6A2270EC8 for ; Thu, 27 Feb 2025 22:39:27 +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=1740695969; cv=none; b=ifgJrcNB5+orwNZOBVdykv4M043sDP+21iomqy22RhhXTXb3EDIEZokpdvKKq89VmqAvTMUkqZeeJNLFXi8M2hPY3k364ONFkN2Iph+t2ngZ82HlNQpmMpu3pC6RkFCristl7tHY7LolHI+1ev+ptfeB8EnKfijBVTHYGiFXTP0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740695969; c=relaxed/simple; bh=0+0C9RGt9fCy4+ZjRlJjHdJWrlJg1ksiB/2RJboOotI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TACXQmLOXj1yi8UDz954iqb6B5GZlcc2RNqgd/El6jDtonzxR4WXO5FZCYmKPbVbnuhXaDQww+dMjS5zB4yHp/sUAuacBPNCv5QloT+QSwSbCYAQUjq0+zzAelBOKpmJb7JcU27BHqAkuaG3r/ThbRIHnuUDVoxPCUQRuw6pOw0= 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=NPpadwCw; 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="NPpadwCw" 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 51RMbmhm032434 for ; Thu, 27 Feb 2025 14:39:27 -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=J9Cg0chcoH6lM3GPPTxsII2bjK54fyiWhbfyyN7RC7Y=; b=NPpadwCwYYKy rGz5bbrX001Yx5x4diyqsS202KAWf4ybc7S3fwRCnG1xPQdJ5+pDLkqNr5xgCKn0 kzzSjkCNqsDGE/vFI0xCHjXoV1odszXD5BZjpv4nDGMpwQpmnPP8feqWVndbAQtW aZ1wE9DMkKiCle1r7H8gMVi3r2dBrcWAb2sxElQfLVfY0JzURqbs3WT+PISEQQHf u9aMHRxOCoizI6PsTLGxS8aSkvSP/N7rRK+UroWJ4B0gCzxOQXHs5eheMHScf4WZ uvqvDOZfEyECKEp9bW4P1RXSZTkb/lMRTo/uIval2rLuJ+BY14PQ33Gk6+cu2bLU k6vDSv2CzA== Received: from mail.thefacebook.com ([163.114.134.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 4530qwg44m-11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 27 Feb 2025 14:39:27 -0800 (PST) Received: from twshared9216.15.frc2.facebook.com (2620:10d:c085:108::150d) by mail.thefacebook.com (2620:10d:c08b:78::c78f) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1544.14; Thu, 27 Feb 2025 22:39:15 +0000 Received: by devbig638.nha1.facebook.com (Postfix, from userid 544533) id 7815718882818; Thu, 27 Feb 2025 14:39:18 -0800 (PST) From: Keith Busch To: , , , , CC: , , Keith Busch Subject: [PATCHv8 5/6] ublk: zc register/unregister bvec Date: Thu, 27 Feb 2025 14:39:15 -0800 Message-ID: <20250227223916.143006-6-kbusch@meta.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250227223916.143006-1-kbusch@meta.com> References: <20250227223916.143006-1-kbusch@meta.com> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: a9MRyGbpaYNGuh08FOviisymq4I_ukyX X-Proofpoint-GUID: a9MRyGbpaYNGuh08FOviisymq4I_ukyX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_08,2025-02-27_01,2024-11-22_01 From: Keith Busch Provide new operations for the user to request mapping an active request to an io uring instance's buf_table. The user has to provide the index it wants to install the buffer. A reference count is taken on the request to ensure it can't be completed while it is active in a ring's buf_table. Signed-off-by: Keith Busch --- drivers/block/ublk_drv.c | 59 ++++++++++++++++++++++++++++++----- include/uapi/linux/ublk_cmd.h | 4 +++ 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index e8f52d8341fba..8d7d6862a80f5 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -51,6 +51,9 @@ /* private ioctl command mirror */ #define UBLK_CMD_DEL_DEV_ASYNC _IOC_NR(UBLK_U_CMD_DEL_DEV_ASYNC) =20 +#define UBLK_IO_REGISTER_IO_BUF _IOC_NR(UBLK_U_IO_REGISTER_IO_BUF) +#define UBLK_IO_UNREGISTER_IO_BUF _IOC_NR(UBLK_U_IO_UNREGISTER_IO_BUF) + /* All UBLK_F_* have to be included into UBLK_F_ALL */ #define UBLK_F_ALL (UBLK_F_SUPPORT_ZERO_COPY \ | UBLK_F_URING_CMD_COMP_IN_TASK \ @@ -197,12 +200,14 @@ struct ublk_params_header { =20 static bool ublk_abort_requests(struct ublk_device *ub, struct ublk_queu= e *ubq); =20 +static inline struct request *__ublk_check_and_get_req(struct ublk_devic= e *ub, + struct ublk_queue *ubq, int tag, size_t offset); static inline unsigned int ublk_req_build_flags(struct request *req); static inline struct ublksrv_io_desc *ublk_get_iod(struct ublk_queue *ub= q, int tag); static inline bool ublk_dev_is_user_copy(const struct ublk_device *ub) { - return ub->dev_info.flags & UBLK_F_USER_COPY; + return ub->dev_info.flags & (UBLK_F_USER_COPY | UBLK_F_SUPPORT_ZERO_COP= Y); } =20 static inline bool ublk_dev_is_zoned(const struct ublk_device *ub) @@ -592,7 +597,7 @@ static void ublk_apply_params(struct ublk_device *ub) =20 static inline bool ublk_support_user_copy(const struct ublk_queue *ubq) { - return ubq->flags & UBLK_F_USER_COPY; + return ubq->flags & (UBLK_F_USER_COPY | UBLK_F_SUPPORT_ZERO_COPY); } =20 static inline bool ublk_need_req_ref(const struct ublk_queue *ubq) @@ -1758,6 +1763,45 @@ static inline void ublk_prep_cancel(struct io_urin= g_cmd *cmd, io_uring_cmd_mark_cancelable(cmd, issue_flags); } =20 +static void ublk_io_release(void *priv) +{ + struct request *rq =3D priv; + struct ublk_queue *ubq =3D rq->mq_hctx->driver_data; + + ublk_put_req_ref(ubq, rq); +} + +static int ublk_register_io_buf(struct io_uring_cmd *cmd, + struct ublk_queue *ubq, unsigned int tag, + const struct ublksrv_io_cmd *ub_cmd, + unsigned int issue_flags) +{ + struct ublk_device *ub =3D cmd->file->private_data; + int index =3D (int)ub_cmd->addr, ret; + struct request *req; + + req =3D __ublk_check_and_get_req(ub, ubq, tag, 0); + if (!req) + return -EINVAL; + + ret =3D io_buffer_register_bvec(cmd, req, ublk_io_release, index, + issue_flags); + if (ret) { + ublk_put_req_ref(ubq, req); + return ret; + } + + return 0; +} + +static int ublk_unregister_io_buf(struct io_uring_cmd *cmd, + const struct ublksrv_io_cmd *ub_cmd, + unsigned int issue_flags) +{ + io_buffer_unregister_bvec(cmd, ub_cmd->addr, issue_flags); + return 0; +} + static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags, const struct ublksrv_io_cmd *ub_cmd) @@ -1809,6 +1853,10 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd= *cmd, =20 ret =3D -EINVAL; switch (_IOC_NR(cmd_op)) { + case UBLK_IO_REGISTER_IO_BUF: + return ublk_register_io_buf(cmd, ubq, tag, ub_cmd, issue_flags); + case UBLK_IO_UNREGISTER_IO_BUF: + return ublk_unregister_io_buf(cmd, ub_cmd, issue_flags); case UBLK_IO_FETCH_REQ: /* UBLK_IO_FETCH_REQ is only allowed before queue is setup */ if (ublk_queue_ready(ubq)) { @@ -2475,7 +2523,7 @@ static int ublk_ctrl_add_dev(struct io_uring_cmd *c= md) * buffer by pwrite() to ublk char device, which can't be * used for unprivileged device */ - if (info.flags & UBLK_F_USER_COPY) + if (info.flags & (UBLK_F_USER_COPY | UBLK_F_SUPPORT_ZERO_COPY)) return -EINVAL; } =20 @@ -2543,9 +2591,6 @@ static int ublk_ctrl_add_dev(struct io_uring_cmd *c= md) goto out_free_dev_number; } =20 - /* We are not ready to support zero copy */ - ub->dev_info.flags &=3D ~UBLK_F_SUPPORT_ZERO_COPY; - ub->dev_info.nr_hw_queues =3D min_t(unsigned int, ub->dev_info.nr_hw_queues, nr_cpu_ids); ublk_align_max_io_size(ub); @@ -2876,7 +2921,7 @@ static int ublk_ctrl_get_features(struct io_uring_c= md *cmd) { const struct ublksrv_ctrl_cmd *header =3D io_uring_sqe_cmd(cmd->sqe); void __user *argp =3D (void __user *)(unsigned long)header->addr; - u64 features =3D UBLK_F_ALL & ~UBLK_F_SUPPORT_ZERO_COPY; + u64 features =3D UBLK_F_ALL; =20 if (header->len !=3D UBLK_FEATURES_LEN || !header->addr) return -EINVAL; diff --git a/include/uapi/linux/ublk_cmd.h b/include/uapi/linux/ublk_cmd.= h index 8093acdeaa114..7255b36b5cf63 100644 --- a/include/uapi/linux/ublk_cmd.h +++ b/include/uapi/linux/ublk_cmd.h @@ -94,6 +94,10 @@ _IOWR('u', UBLK_IO_COMMIT_AND_FETCH_REQ, struct ublksrv_io_cmd) #define UBLK_U_IO_NEED_GET_DATA \ _IOWR('u', UBLK_IO_NEED_GET_DATA, struct ublksrv_io_cmd) +#define UBLK_U_IO_REGISTER_IO_BUF \ + _IOWR('u', 0x23, struct ublksrv_io_cmd) +#define UBLK_U_IO_UNREGISTER_IO_BUF \ + _IOWR('u', 0x24, struct ublksrv_io_cmd) =20 /* only ABORT means that no re-fetch */ #define UBLK_IO_RES_OK 0 --=20 2.43.5