From patchwork Wed Mar 12 14:23:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sidong Yang X-Patchwork-Id: 14013612 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70C6F24E012 for ; Wed, 12 Mar 2025 14:24:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741789446; cv=none; b=VHvT8x34xrN5RbuBzIbmpK2puztfvZqtuyzaUvvciSSgUjgn40oNmmebWe3V4dwbF1v73G1W1hXzf40/CQcJNSUwD0ZAG2nsj87LoARZgLcyTxFRVeCbvypuIP4PxrQMy14QMh6fviZq+Z8Lhjvxuy7/Uhf3+ezwYdazSuijGBs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741789446; c=relaxed/simple; bh=ueLLfb2g6ooAKzkCZNWnsaYYsRz9CK6dnjSm/F8mDd8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WTgxEDWZQHm7/xjI2e96x8YPvfPofpIZrA7tNPlamVJ6FLxj2aHzOzf14WlcgECnHfgIQMceLQrQeZf9c1SdTdr0fYxyXcgWRnYKjSfkxyqSkPyS3+lZ6k39jov7BniwsWU0dF1p6jqHyG4LAqsHWsLDIpTaQ5ORFKCQLWbyGZU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=furiosa.ai; spf=none smtp.mailfrom=furiosa.ai; dkim=pass (2048-bit key) header.d=furiosa-ai.20230601.gappssmtp.com header.i=@furiosa-ai.20230601.gappssmtp.com header.b=VpC7xg30; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=furiosa.ai Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=furiosa.ai Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=furiosa-ai.20230601.gappssmtp.com header.i=@furiosa-ai.20230601.gappssmtp.com header.b="VpC7xg30" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2254e0b4b79so47023155ad.2 for ; Wed, 12 Mar 2025 07:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=furiosa-ai.20230601.gappssmtp.com; s=20230601; t=1741789445; x=1742394245; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0xE5xU4H97yAwT+GSMKnaXD9mzHnmpKqghu02U5UNnw=; b=VpC7xg30l1h4FAr8iEL6sODXobJWIdIyvkZ1BftrdM+DwlLEdrzR39EZulh7SFpX+b 3zHRWQU798dj6mW5iKFwvkED+t6wPj16rdSVFPWvwcVgYuVKko4+hmhax2kilYLgQmfw rtboAnV4b0ivyBMYS7zHQ3QTXjJAgCzXCbG2eNtSbO4xf0vak15Rq1WjkPUjqrqsE1TC 5T007ewHZr7tW3+aN3qpGTmic8aKdWf+KUnIKvyFe5GEi3UMvRfo5AmFyfwEpSrWusMH Wbw0T5cAe3XdiyrcGh6pEdscd+g9Y2OAsr6DgLWBm9MsyyvutjcyH9bCepgGwFd/yXnI j0Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741789445; x=1742394245; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0xE5xU4H97yAwT+GSMKnaXD9mzHnmpKqghu02U5UNnw=; b=wEJMXJgw+2rkc3VfLXHlQDOknM2m2thro2N2I75Tnq4+7eW+Dly4W6zYcxFb8Jkiv9 uO0Xf1eYu/dHBZ8hrZ7bxOv54Hwo1Dfvc6q3VnPDREBZhC4wSR3w3dsTLjfT0b3b4Gby 3ohMSSzdmBTVPC08cr8vgT/1vtBB8bPTaGdKdpc64dpD2UZkF+I9phwzsLTlw8YOUyaS dT3h1c1utIhlcR/Iw03wLcl/ftYIDnyeHktpmZ6EsFTRm1BMCpKBcdBcWT1bXDrzrDxV E2SOSiUBePvy/jVZ5Ct8yPVOdszz8r3Wy3V3iGCnkbsuK39GxtL6w43GOmu1mVbDP2ml 1wIA== X-Gm-Message-State: AOJu0YwTvnERgRkqH0bHima1Say1+Aem15YpovepxSQa5wvyfe6SIlnL 1s9YVByxaD81ycyHSIK7s75DaZM9FTWGAz4E0juBldBi+fcoGmPcaYf6fdV3Ro8= X-Gm-Gg: ASbGnctL4xP8RG8rvMnjaa8X9r3Tw2PzYGxdoopEzKKnNP8Wiorm4JwXxOTf0ERNycp DdErr7DItK1DjPMmlGqObs630He6+whWDjIVv0c6xUn6xWsjCUD2tJyN0+qEUZoWmmbIFNtHqFD Ds9XOAbBtJCWv3JjD5bj2S1cGnZdfkBIs6x27Zx+aMo4HY5XtsWj0Wfs/LJ1pUR60hg8TOcwL/m 4oU5DDKBhZe7ygzhD87pdInZ6SkLBLNrQWPZNObQWwCwoYK7TKFTi3X6Djqt0uzYjbSpHSNi8AC lDn5hHgLucmuJCDBeJGyzfSe8uw9OAgoa2z5nUqWApr6XYHmGyU6THi+TrYBV17lZMZJUAlNY6n VLIXL X-Google-Smtp-Source: AGHT+IEFkanN727wtkiJd8Cv9m0pOpd+cskICbFK6tPN+bU3UWDrxWUgeUfFa42vbUkQzGost6P7tw== X-Received: by 2002:a05:6a00:174c:b0:736:9f20:a16c with SMTP id d2e1a72fcca58-736aa9e96e1mr28852100b3a.5.1741789444707; Wed, 12 Mar 2025 07:24:04 -0700 (PDT) Received: from sidong.sidong.yang.office.furiosa.vpn ([61.83.209.48]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736cc972eabsm7413860b3a.144.2025.03.12.07.24.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Mar 2025 07:24:04 -0700 (PDT) From: Sidong Yang To: Josef Bacik , David Sterba , Jens Axboe , Pavel Begunkov Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, io-uring@vger.kernel.org, Sidong Yang Subject: [RFC PATCH v2 1/2] io_uring: cmd: introduce io_uring_cmd_import_fixed_vec Date: Wed, 12 Mar 2025 14:23:25 +0000 Message-ID: <20250312142326.11660-2-sidong.yang@furiosa.ai> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250312142326.11660-1-sidong.yang@furiosa.ai> References: <20250312142326.11660-1-sidong.yang@furiosa.ai> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 io_uring_cmd_import_fixed_vec() could be used for using multiple fixed buffer in uring_cmd callback. Signed-off-by: Sidong Yang --- include/linux/io_uring/cmd.h | 14 ++++++++++++++ io_uring/uring_cmd.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/include/linux/io_uring/cmd.h b/include/linux/io_uring/cmd.h index 598cacda4aa3..b0e09c685941 100644 --- a/include/linux/io_uring/cmd.h +++ b/include/linux/io_uring/cmd.h @@ -44,6 +44,12 @@ int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, struct io_uring_cmd *ioucmd, unsigned int issue_flags); +int io_uring_cmd_import_fixed_vec(struct io_uring_cmd *ioucmd, + const struct iovec __user *uiovec, + unsigned long nr_segs, int rw, + unsigned int issue_flags, + struct iov_iter *iter, struct bio_vec **bvec); + /* * Completes the request, i.e. posts an io_uring CQE and deallocates @ioucmd * and the corresponding io_uring request. @@ -76,6 +82,14 @@ io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, { return -EOPNOTSUPP; } +int io_uring_cmd_import_fixed_vec(struct io_uring_cmd *ioucmd, + const struct iovec __user *uiovec, + unsigned long nr_segs, int rw, + unsigned int issue_flags, + struct iov_iter *iter, struct bio_vec **bvec); +{ + return -EOPNOTSUPP; +} static inline void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, u64 ret2, unsigned issue_flags) { diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index de39b602aa82..6bf076f45e6a 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 +#include "linux/io_uring_types.h" #include #include #include @@ -255,6 +256,36 @@ int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, } EXPORT_SYMBOL_GPL(io_uring_cmd_import_fixed); +int io_uring_cmd_import_fixed_vec(struct io_uring_cmd *ioucmd, + const struct iovec __user *uiovec, + unsigned long nr_segs, int rw, + unsigned int issue_flags, + struct iov_iter *iter, struct bio_vec **bvec) +{ + struct io_kiocb *req = cmd_to_io_kiocb(ioucmd); + struct iovec *iov; + int ret; + bool is_compat = io_is_compat(req->ctx); + struct iou_vec iou_vec; + + if (!bvec) + return -EINVAL; + + iov = iovec_from_user(uiovec, nr_segs, 0, NULL, is_compat); + if (IS_ERR(iov)) + return PTR_ERR(iov); + + iou_vec.iovec = iov; + iou_vec.nr = nr_segs; + + ret = io_import_reg_vec(rw, iter, req, &iou_vec, iou_vec.nr, 0, + issue_flags); + + *bvec = iou_vec.bvec; + return ret; +} +EXPORT_SYMBOL_GPL(io_uring_cmd_import_fixed_vec); + void io_uring_cmd_issue_blocking(struct io_uring_cmd *ioucmd) { struct io_kiocb *req = cmd_to_io_kiocb(ioucmd); From patchwork Wed Mar 12 14:23:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sidong Yang X-Patchwork-Id: 14013613 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 844BF2505B9 for ; Wed, 12 Mar 2025 14:24:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741789449; cv=none; b=obefQpJjK3N06O85Spw3VJP//kd7KiIaVJLWGP2SIKVM1bbntdoy2KXGUcJZGTdkooigglHs8DyesWjFnIrZO+O5k8DovOOpQ/uJ/Hy+nqSPEUYcBwj4bJ6dJCjt+iStLDG1edtQw0H/x1epr9Fv57asdgTmRbyvMFLjtmmvY1o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741789449; c=relaxed/simple; bh=ga2LSmT61md5n2p7rdCucn4O99aWE/jCY95aOOLVTH4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Nl7+ECGTa+v/r+hgzX9+/8AO4HgkOscEN4nBeRv3KmwZtMfN3b/u/DlJJfUtguShpweUF+gnkIWjg0jsOfySheBN0SZWknVbR0N061dhsNWv1zhNpC7GZwbOnTePQez9tZPqNRbDRxXr0tIiMlqqhFqVLsrxPQMOsqrsLLWH/xI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=furiosa.ai; spf=none smtp.mailfrom=furiosa.ai; dkim=pass (2048-bit key) header.d=furiosa-ai.20230601.gappssmtp.com header.i=@furiosa-ai.20230601.gappssmtp.com header.b=bB3zlehi; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=furiosa.ai Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=furiosa.ai Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=furiosa-ai.20230601.gappssmtp.com header.i=@furiosa-ai.20230601.gappssmtp.com header.b="bB3zlehi" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-223959039f4so136232445ad.3 for ; Wed, 12 Mar 2025 07:24:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=furiosa-ai.20230601.gappssmtp.com; s=20230601; t=1741789448; x=1742394248; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Sf5Mim88v1zsUv2CF9zajfgiTTZumS4UoXrfg/qlMyE=; b=bB3zlehiZTFURQmVJcfQacyW7bM61oTMRio0061Ul84NaT+OpR0HreJbtIBbn5l5G1 Awfru6ADxBPtzGeali+x/cD0Xgan7BJb/beK3eyfzmmMY7SnLnjMqckW5OrPpXUW1L/r 92z5LkcWZjJ/brlJITek8PoT4axxVyFJ8BqfrUJABI3Z1BJd59zduodfxqJf/ZQ1Awlu 2P5vChH/QxlRz92kfsEs9r7L/iu0RJiIilyO/s5SHtU5JIQD8iIDegSc/nG1+nWYIDY+ 9pS2wFqWSu0kRzjthDvr9C5GFjUdhiwV79/JeyfRYiZMatRalXqfxx1cQa5OHrVvvMCS 8B2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741789448; x=1742394248; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Sf5Mim88v1zsUv2CF9zajfgiTTZumS4UoXrfg/qlMyE=; b=l89Mk0uaVYMnO9u06hRyqMRaZB3kvTMDcNTHIO5V/3DzR8xbpoDVIREiogQYb/jd0g ZlgmrbfGQYu4Wo49ShJ5S6JsuPYXjvDjtTEa0M4pPP2U+NNIM/ycwQ2Hk3vT+scpNkc6 x9fTFBdl4E4bTsb1RJ3gifeTA/7WpWsPDcky4CDx1UAGxnMAzCAzw0xvNE915zki0eMQ F+sAfIi2ngrldApD26chv3sw8l6Vtftr/A82LBWB0tcoZlY9xHQ5owCydILGPrG+SIDQ bfc2eTwPSUBf/dXa1h6ZIkAEOklQSWzqn1qj3Ert12CLkhi9pXKm80L5ixrNjb2JFBFr iFlQ== X-Gm-Message-State: AOJu0Yw0WRWWOzntEWdT7rQmWUPbCd8qXEeyY5cXSSO07bLGW/ujAc32 Lnw83gFhg5/QmyUV3DNWFtZsUrC4F5pQL7UFP/Fbf2OKWMOccBgTX0PuI9DqbN0= X-Gm-Gg: ASbGnctI/PdGPR6lmqwZGktImu8gACwoQmK9mDvPTJdFxp7ZCOxV3J2k3IlJFhc5+Df q3ocxAonQUI6OGd7G1zzMCCx+aQft5bP4oArvaDq+pj+Fp2q9YliCS1Hdq20dd7NsJYiPmSWHfo Mk5oxE55rUWamxoNMReSeGqJMPvLw3dEFl/NOLccCGLfMXy0UmEV9nY3siX9HTLvfdoSZwPEKXr 3RIOhINsV2IWhBwRKlWqDUSefOqqBJU3ae3Cbmm8bSCHoTrZSE8hthZQM4SCz/A+SWksVYAlfZv z46qAxtgFbF+xWSL4ILJsuTdcJU/FbBJjO/zAacON7jXUu1DGzv5rmT1liB6EAwp42I02HVdzg+ 4CW8T X-Google-Smtp-Source: AGHT+IEB7zRsn2sn891Qv++mKti8pmW2qB36bnhHeSKSGpIvhV7qeTB7jRROPtq3qpgTC2s59IzhKQ== X-Received: by 2002:a05:6a00:1401:b0:736:34a2:8a23 with SMTP id d2e1a72fcca58-736aaabee7amr27951202b3a.15.1741789447564; Wed, 12 Mar 2025 07:24:07 -0700 (PDT) Received: from sidong.sidong.yang.office.furiosa.vpn ([61.83.209.48]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736cc972eabsm7413860b3a.144.2025.03.12.07.24.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Mar 2025 07:24:07 -0700 (PDT) From: Sidong Yang To: Josef Bacik , David Sterba , Jens Axboe , Pavel Begunkov Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, io-uring@vger.kernel.org, Sidong Yang Subject: [RFC PATCH v2 2/2] btrfs: ioctl: use registered buffer for IORING_URING_CMD_FIXED Date: Wed, 12 Mar 2025 14:23:26 +0000 Message-ID: <20250312142326.11660-3-sidong.yang@furiosa.ai> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250312142326.11660-1-sidong.yang@furiosa.ai> References: <20250312142326.11660-1-sidong.yang@furiosa.ai> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This patch supports IORING_URING_CMD_FIXED flags in io-uring cmd. It means that user provided buf_index in sqe that is registered before submitting requests. In this patch, btrfs_uring_encoded_read() makes iov_iter bvec type by checking the io-uring cmd flag. And there is additional bvec field in btrfs_uring_priv for remaining bvec lifecycle. Signed-off-by: Sidong Yang --- fs/btrfs/ioctl.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 6c18bad53cd3..7ac5a387ae5d 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3,6 +3,7 @@ * Copyright (C) 2007 Oracle. All rights reserved. */ +#include "linux/bvec.h" #include #include #include @@ -4644,6 +4645,7 @@ struct btrfs_uring_priv { unsigned long nr_pages; struct kiocb iocb; struct iovec *iov; + struct bio_vec *bvec; struct iov_iter iter; struct extent_state *cached_state; u64 count; @@ -4711,6 +4713,7 @@ static void btrfs_uring_read_finished(struct io_uring_cmd *cmd, unsigned int iss kfree(priv->pages); kfree(priv->iov); + kfree(priv->bvec); kfree(priv); } @@ -4730,7 +4733,8 @@ static int btrfs_uring_read_extent(struct kiocb *iocb, struct iov_iter *iter, struct extent_state *cached_state, u64 disk_bytenr, u64 disk_io_size, size_t count, bool compressed, - struct iovec *iov, struct io_uring_cmd *cmd) + struct iovec *iov, struct io_uring_cmd *cmd, + struct bio_vec *bvec) { struct btrfs_inode *inode = BTRFS_I(file_inode(iocb->ki_filp)); struct extent_io_tree *io_tree = &inode->io_tree; @@ -4767,6 +4771,7 @@ static int btrfs_uring_read_extent(struct kiocb *iocb, struct iov_iter *iter, priv->start = start; priv->lockend = lockend; priv->err = 0; + priv->bvec = bvec; ret = btrfs_encoded_read_regular_fill_pages(inode, disk_bytenr, disk_io_size, pages, priv); @@ -4818,6 +4823,7 @@ static int btrfs_uring_encoded_read(struct io_uring_cmd *cmd, unsigned int issue u64 start, lockend; void __user *sqe_addr; struct btrfs_uring_encoded_data *data = io_uring_cmd_get_async_data(cmd)->op_data; + struct bio_vec *bvec = NULL; if (!capable(CAP_SYS_ADMIN)) { ret = -EPERM; @@ -4875,9 +4881,19 @@ static int btrfs_uring_encoded_read(struct io_uring_cmd *cmd, unsigned int issue } data->iov = data->iovstack; - ret = import_iovec(ITER_DEST, data->args.iov, data->args.iovcnt, - ARRAY_SIZE(data->iovstack), &data->iov, - &data->iter); + + if (cmd && (cmd->flags & IORING_URING_CMD_FIXED)) { + ret = io_uring_cmd_import_fixed_vec( + cmd, data->args.iov, data->args.iovcnt, + ITER_DEST, issue_flags, &data->iter, &bvec); + data->iov = NULL; + } else { + ret = import_iovec(ITER_DEST, data->args.iov, + data->args.iovcnt, + ARRAY_SIZE(data->iovstack), + &data->iov, &data->iter); + } + if (ret < 0) goto out_acct; @@ -4929,13 +4945,14 @@ static int btrfs_uring_encoded_read(struct io_uring_cmd *cmd, unsigned int issue ret = btrfs_uring_read_extent(&kiocb, &data->iter, start, lockend, cached_state, disk_bytenr, disk_io_size, count, data->args.compression, - data->iov, cmd); + data->iov, cmd, bvec); goto out_acct; } out_free: kfree(data->iov); + kfree(bvec); out_acct: if (ret > 0)