From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 702F032C93B for ; Mon, 27 Oct 2025 22:29:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761604190; cv=none; b=Y+niiAwcRTiksxs4aW0q/zpXKilOKepJLhhoY8DXckQrexOtQ8j/Svmg2vIwDcq7Pyc4XRjFi4KmDq2Bk/7v69UhZM2VAkLLI3iy5u5raDs4MYTHxZFzjP8SIdKM9NBN2c9Va6d/FTlATuAziXTv1IcWvBz75QpHrCA6AS256VI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761604190; c=relaxed/simple; bh=5trlzOSoRPBFJPoaGzJTtndg8Nr6g9bCoxITw82CJq0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uycN0otWYdz63wbarREs812fRc9vaWAZbN8/+Sudgd4+jnzEC08ac18YeQXXnETPrHjTu+CH19gvg2W8BO/J8rRpp3QnLlRASjFjGpGuHyycdMcTDj0opO6EEXyu0mIkg1Pm1D08eTNuA3prqlcqRl/1iyoM2TiUqFT1i5F/3Hc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kssTMzm/; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kssTMzm/" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-77f5d497692so6335207b3a.1 for ; Mon, 27 Oct 2025 15:29:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761604188; x=1762208988; 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=QIHHD2cgpgFsPTROt8Cpq6Fz2TimP3yx8nTisLh/mlQ=; b=kssTMzm/q/kimiBVq15ecfBPF8CuLRqD/WaJNaOnCIMQ/SZ65wdv1YuicBx4F1LROZ +OTmfKewKxvbhrnO3tZ6BCCsdanf1MvByZs4MX50/9VZYSlGSRQZhZir5RkPpbLtj+K1 AOTAZLCXNtDynH9YQki/tEQKudNsvBA1/99okNcj69qy64OU6XIfon9hGiZnPb/8YrN/ FdY7G4bas2/h3oFdhBIif2hWOV7N02MDPN9HqP/ErBkIFqKbfy820hG493J3+BaEUGJW ujZxn1/QAyln+TcBLG3OtKviLGMNlD+aQGEvMsASLTfawobZoOyg9Ml5GYPHcvfUb2k4 FDCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761604188; x=1762208988; 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=QIHHD2cgpgFsPTROt8Cpq6Fz2TimP3yx8nTisLh/mlQ=; b=TBny7paedfM63cE+mnlq28brVZvU1Ka561CG2foJfiai97EacTTWzDLbQmhHs/+1Ma VHRNtIpplWIGSfKmEQloQZ3uh8ax61F2HpjKK+QPJH7Yg6YNneiz3RUWtnLcpcAJibBF diOSFcUi/5EyiIGQ/nkQkSDIcpbyH2XZUOrTvnO8EIwHtOw1J8RP9PyaAHBtOh+7UD7N VLM9Y7YghvvI98vyf3MMwkLUlzmjpB1irEC6ziDLb8dbXjZu1vHcY7jB4qSaM3qvfJ95 VAkrPEubq5QMms9LRd2DSLE6d6JBVRSCejoYwkBf4Y39i1TSrygXszOlxZCsFoB2AlqU 8WFw== X-Forwarded-Encrypted: i=1; AJvYcCWoR0r5DXcCp66DDL02L6OLUexhkobl6TvtZtlFdoKMXFDKgSrPCvYkHbs4QabQqfa8AVAHuTaIFQ==@vger.kernel.org X-Gm-Message-State: AOJu0YweLe++MK0+PQbzXBM8iFbIt8O57nkcEEYsjHNlU/FIM01TZ7Rx wlAIHG6J8umt+T35dwlg4JyV1YffS5rUjg/+Y6zPwFnFYLDDuw3E6DPS X-Gm-Gg: ASbGncvXHpqIeqENSCFoZleygm1iXdGyxJqb2i62cHN1120+nNu9quq503wQ7qvA6zD r2rO0DXU1g6HvfF/R2u+6XtwDNCXTklX4CFHvpfvrecK+Mnmv0GapWXykkOheBIDUQUlnzENSc/ 8/tFv9MVmdp/ZF3fIn7PRdz9XmqCPZ+ecPDTkb6f1Cmg/cjBi3KQ1T4/SlfRj5LczlQvCjiR3d4 wHwrg/xWqb9n6OejWwBsv1FepkGBKHPPDiMnKvO7hlE3wa03MzOG0eH9eMgnpIFLgSdmsmKUL19 dWo0l/kzatGRMqf47WdELyBE1QI2rRsDT8ivrmM3ZbpxmQ8746zCMsOIiGm65lE1PbntygWW/Tc yKE/o/9mcv5oQd645BHBB5/Pt5bNGTF4VJLhpU5QRhT42Nc1uEftj/soWUD19FQxzZwhbjGeK7w z9Ga8l4dzPk3n4EplJzwc9JsBPCt/OTPKJ4j3nNlzE3o86CMc= X-Google-Smtp-Source: AGHT+IGKmCGKGySNicqs4xJGk+i+s9kw/CHqN9iUzNLfPqlhccuKV5IcvEHMXa4//k4WJEgaY9FAEw== X-Received: by 2002:a05:6a00:391a:b0:7a2:78ec:4f48 with SMTP id d2e1a72fcca58-7a441c476ffmr1466362b3a.23.1761604187646; Mon, 27 Oct 2025 15:29:47 -0700 (PDT) Received: from localhost ([2a03:2880:ff:7::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a414068f0fsm9509337b3a.46.2025.10.27.15.29.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Oct 2025 15:29:47 -0700 (PDT) From: Joanne Koong To: miklos@szeredi.hu, axboe@kernel.dk Cc: linux-fsdevel@vger.kernel.org, bschubert@ddn.com, asml.silence@gmail.com, io-uring@vger.kernel.org, xiaobing.li@samsung.com, csander@purestorage.com, kernel-team@meta.com Subject: [PATCH v2 5/8] fuse: use enum types for header copying Date: Mon, 27 Oct 2025 15:28:04 -0700 Message-ID: <20251027222808.2332692-6-joannelkoong@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251027222808.2332692-1-joannelkoong@gmail.com> References: <20251027222808.2332692-1-joannelkoong@gmail.com> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use enum types to identify which part of the header needs to be copied. This improves the interface and will simplify both kernel-space and user-space header addresses when fixed buffer support is added. Signed-off-by: Joanne Koong --- fs/fuse/dev_uring.c | 55 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/fs/fuse/dev_uring.c b/fs/fuse/dev_uring.c index faa7217e85c4..d96368e93e8d 100644 --- a/fs/fuse/dev_uring.c +++ b/fs/fuse/dev_uring.c @@ -31,6 +31,12 @@ struct fuse_uring_pdu { static const struct fuse_iqueue_ops fuse_io_uring_ops; +enum fuse_uring_header_type { + FUSE_URING_HEADER_IN_OUT, + FUSE_URING_HEADER_OP, + FUSE_URING_HEADER_RING_ENT, +}; + static void uring_cmd_set_ring_ent(struct io_uring_cmd *cmd, struct fuse_ring_ent *ring_ent) { @@ -574,9 +580,31 @@ static int fuse_uring_out_header_has_err(struct fuse_out_header *oh, return err; } -static int copy_header_to_ring(void __user *ring, const void *header, - size_t header_size) +static void __user *get_user_ring_header(struct fuse_ring_ent *ent, + enum fuse_uring_header_type type) +{ + switch (type) { + case FUSE_URING_HEADER_IN_OUT: + return &ent->headers->in_out; + case FUSE_URING_HEADER_OP: + return &ent->headers->op_in; + case FUSE_URING_HEADER_RING_ENT: + return &ent->headers->ring_ent_in_out; + } + + WARN_ON_ONCE(1); + return NULL; +} + +static int copy_header_to_ring(struct fuse_ring_ent *ent, + enum fuse_uring_header_type type, + const void *header, size_t header_size) { + void __user *ring = get_user_ring_header(ent, type); + + if (!ring) + return -EINVAL; + if (copy_to_user(ring, header, header_size)) { pr_info_ratelimited("Copying header to ring failed.\n"); return -EFAULT; @@ -585,9 +613,15 @@ static int copy_header_to_ring(void __user *ring, const void *header, return 0; } -static int copy_header_from_ring(void *header, const void __user *ring, - size_t header_size) +static int copy_header_from_ring(struct fuse_ring_ent *ent, + enum fuse_uring_header_type type, + void *header, size_t header_size) { + const void __user *ring = get_user_ring_header(ent, type); + + if (!ring) + return -EINVAL; + if (copy_from_user(header, ring, header_size)) { pr_info_ratelimited("Copying header from ring failed.\n"); return -EFAULT; @@ -606,8 +640,8 @@ static int fuse_uring_copy_from_ring(struct fuse_ring *ring, int err; struct fuse_uring_ent_in_out ring_in_out; - err = copy_header_from_ring(&ring_in_out, &ent->headers->ring_ent_in_out, - sizeof(ring_in_out)); + err = copy_header_from_ring(ent, FUSE_URING_HEADER_RING_ENT, + &ring_in_out, sizeof(ring_in_out)); if (err) return err; @@ -656,7 +690,7 @@ static int fuse_uring_args_to_ring(struct fuse_ring *ring, struct fuse_req *req, * Some op code have that as zero size. */ if (args->in_args[0].size > 0) { - err = copy_header_to_ring(&ent->headers->op_in, + err = copy_header_to_ring(ent, FUSE_URING_HEADER_OP, in_args->value, in_args->size); if (err) @@ -675,7 +709,8 @@ static int fuse_uring_args_to_ring(struct fuse_ring *ring, struct fuse_req *req, } ent_in_out.payload_sz = cs.ring.copied_sz; - return copy_header_to_ring(&ent->headers->ring_ent_in_out, &ent_in_out, + return copy_header_to_ring(ent, FUSE_URING_HEADER_RING_ENT, + &ent_in_out, sizeof(ent_in_out)); } @@ -705,7 +740,7 @@ static int fuse_uring_copy_to_ring(struct fuse_ring_ent *ent, } /* copy fuse_in_header */ - return copy_header_to_ring(&ent->headers->in_out, &req->in.h, + return copy_header_to_ring(ent, FUSE_URING_HEADER_IN_OUT, &req->in.h, sizeof(req->in.h)); } @@ -800,7 +835,7 @@ static void fuse_uring_commit(struct fuse_ring_ent *ent, struct fuse_req *req, struct fuse_conn *fc = ring->fc; ssize_t err = 0; - err = copy_header_from_ring(&req->out.h, &ent->headers->in_out, + err = copy_header_from_ring(ent, FUSE_URING_HEADER_IN_OUT, &req->out.h, sizeof(req->out.h)); if (err) { req->out.h.error = err; -- 2.47.3