From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 1922132C952 for ; Mon, 27 Oct 2025 22:29:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761604192; cv=none; b=QYHgz3rjwwW/L4OTWB8ZHK9AAs7XQ2Hgs5YUZ1Js3YgtYZVo+9uXLNdT7Q5migFE+KGtUYIa15rxZkfYUn0ufl1b1DQJsQpHopoqarwfFJEhXiWkIH21doBDdw/oJZO+6qjUi+NuJIUQwH/kprTfZE+ydSA06kjW2tcN2aGPYSg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761604192; c=relaxed/simple; bh=1E18qGvEdVDEk2lUFERAFuFP8ZQrwhZtxHG5TjAD79s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FIFO/lBUb/SHc0Bukpgsn5liTrqsXJ/Z0e5/XBnBub+cts0Y1WI8vSAe3+lup4PmGwOeDQbzDxWblgaht/8mcyiSvFZcGNISoB2/yA/4a9VnhtVtzaCUtvH6BHAPBZvsVh0Kwsi0R3FP9g0EZSHdCTJiFLEQHQAel0s/p3Bq+kA= 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=EoN3eeeL; arc=none smtp.client-ip=209.85.214.180 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="EoN3eeeL" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-290ab379d48so48667015ad.2 for ; Mon, 27 Oct 2025 15:29:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761604190; x=1762208990; 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=L0beltc7+RSlROfm77N8Sgc2Yv4Aur58ceDXgjV4dII=; b=EoN3eeeLKUwSIaaJuviSbFmA3nj/9xFVIufVPJbd++RZ1odoRXNLRXMb0RgQAUzKCX j9Xc25qydG2+XsvhmsSx2L+R4FskuGxusFnEO1M1H+JsjVznzeMpwkOk3icAlaZbUaMf FCRmR/Pwr23eW27bQ7eVgu3IeOvFtIRmOQs+d3PT+pU09M3Thtpw/5ECpuBcSb+KI5AV xMBGDv5306214+ywJc8iwUXl+6ODQkxplX7hLf//VqynrRgzL35emlVkIOW0Dfxmxt9Z 8RLMyS4XtE+88IGqS2yD+rjUw8wx5fc5K9veF4AQRYriYtmJSnesjvYjcoUuaqUB7CjY PGUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761604190; x=1762208990; 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=L0beltc7+RSlROfm77N8Sgc2Yv4Aur58ceDXgjV4dII=; b=ekFdNrGi77EZKeH9Mgo5cLuv9dJk9C1GZvJ1DPkhyhg1sgSexWr7dpycl7CtY4i8mz PlJigZ9CFW4BkVZeBA4W1WfCFy1EXNjDEujGixWiQm5BYHJA9rYAbmBeEXOoHfwB5crx ECkbJ0jq4IUd0IGt0Fef/oQJvGh4gJmrnBlqBSCpmUi6WVdOd2+TXX0fIoQUSKbdQI24 KoWXS6oANyQ5KzJdc1L4ktonVVNGwSzpvPbPo+0EdNTtNo8/XVXuFadDqpLVn6FJAafX fT4a2sJd9bHgTSfK1XHxWCvdYtFOA7TxbyvI+C0ELpzIAPkY2lr43FlAH+ZSNMSfOqGu 5Npw== X-Forwarded-Encrypted: i=1; AJvYcCUWruplqAaMnNYXvAu4xqN8H0hn52B2jUXyONp1oa4TVuO5xrsMkU6nBAT0zIvsOhFB4gSbcQTY3w==@vger.kernel.org X-Gm-Message-State: AOJu0YymmoTdrjpBGQ+Ff4sH2+1t63aFShVAvOLs5G1UVjUoOj6kAjgI 9aVPJJdSDQsvVUB35TngSllg8ddhr+Wmi+diSLM/SiBPnzyhJ0oU7Z1o X-Gm-Gg: ASbGncsduknkcW7z/m79SFJin/zCtI3czkmSTwsL72OhRin0qdM00xiIEl/Uf32tKmt B/zqo1wxP4ElglZd8Y81Ix7Ll2bKzoCgJBI7V3pFWca5x2jCgK6NZmC/8sB23Ja+h24tkHM78Wp 86J+umJ7XQKDNeWVUokYOmNooM6se+LaqkfNUHm29M7P1a05bTyWLFl4t1ZAKAlAXLgC1+sQRoq EPzYUHgZidHymiMBBdKJletaHPfTnYjMyt0NugiltqfjdMnRyRPj5BjW7Z3inp9jyws9bK+9yme luCrtT1qdH9u8FciedMQJcgLWXZOmBNosldgWaFFgPh2Nh/9mjQNCGTbQaHDA7vui1bHJDQa5ti OEVfpHyz0sVuu1k1y3uYz7c0E4Mtq5NaOJm4pqW42wue5GGjLFeFzu61QdmbkDLEUoJFmMsWYkL YkiOFfygNFc0xyFgHp9xAe53ukV/E= X-Google-Smtp-Source: AGHT+IGea/IcFkG+vaNyLf95tzBj2KuTnXXoH/07XommnwBjRVX13r9SSjC9dhwtAj4nt1tMpgQ9JQ== X-Received: by 2002:a17:903:304d:b0:25c:e895:6a75 with SMTP id d9443c01a7336-294cb3ecd57mr9577085ad.28.1761604190399; Mon, 27 Oct 2025 15:29:50 -0700 (PDT) Received: from localhost ([2a03:2880:ff:4f::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33fed7d1fdesm9803952a91.5.2025.10.27.15.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Oct 2025 15:29:50 -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 7/8] fuse: refactor setting up copy state for payload copying Date: Mon, 27 Oct 2025 15:28:06 -0700 Message-ID: <20251027222808.2332692-8-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 Add a new helper function setup_fuse_copy_state() to contain the logic for setting up the copy state for payload copying. Signed-off-by: Joanne Koong --- fs/fuse/dev_uring.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/fs/fuse/dev_uring.c b/fs/fuse/dev_uring.c index c814b571494f..c6b22b14b354 100644 --- a/fs/fuse/dev_uring.c +++ b/fs/fuse/dev_uring.c @@ -630,6 +630,28 @@ static int copy_header_from_ring(struct fuse_ring_ent *ent, return 0; } +static int setup_fuse_copy_state(struct fuse_ring *ring, struct fuse_req *req, + struct fuse_ring_ent* ent, int rw, + struct iov_iter *iter, + struct fuse_copy_state *cs) +{ + int err; + + err = import_ubuf(rw, ent->user_payload, ring->max_payload_sz, + iter); + if (err) { + pr_info_ratelimited("fuse: Import of user buffer failed\n"); + return err; + } + + fuse_copy_init(cs, rw == ITER_DEST, iter); + + cs->is_uring = true; + cs->req = req; + + return 0; +} + static int fuse_uring_copy_from_ring(struct fuse_ring *ring, struct fuse_req *req, struct fuse_ring_ent *ent) @@ -645,15 +667,10 @@ static int fuse_uring_copy_from_ring(struct fuse_ring *ring, if (err) return err; - err = import_ubuf(ITER_SOURCE, ent->user_payload, ring->max_payload_sz, - &iter); + err = setup_fuse_copy_state(ring, req, ent, ITER_SOURCE, &iter, &cs); if (err) return err; - fuse_copy_init(&cs, false, &iter); - cs.is_uring = true; - cs.req = req; - return fuse_copy_out_args(&cs, args, ring_in_out.payload_sz); } @@ -674,15 +691,9 @@ static int fuse_uring_args_to_ring(struct fuse_ring *ring, struct fuse_req *req, .commit_id = req->in.h.unique, }; - err = import_ubuf(ITER_DEST, ent->user_payload, ring->max_payload_sz, &iter); - if (err) { - pr_info_ratelimited("fuse: Import of user buffer failed\n"); + err = setup_fuse_copy_state(ring, req, ent, ITER_DEST, &iter, &cs); + if (err) return err; - } - - fuse_copy_init(&cs, true, &iter); - cs.is_uring = true; - cs.req = req; if (num_args > 0) { /* -- 2.47.3