From mboxrd@z Thu Jan 1 00:00:00 1970 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 239D732E129 for ; Mon, 27 Oct 2025 22:29:46 +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=1761604188; cv=none; b=FHGAvKoA+7yL9+buBWmQH3pnj6kyrzq/wxVdvvZaWWeOStQ4oMMupoi9uY4iQIQO9318zQi22zx/Wud7fwVRUScx7NviHdpB5h57TI/5WOneStvaZqMhkPNqGedxgc9nRRp1fZXYf/Xs8i4K1PiX6y/gncUhfVl2h4MJwEVbFPc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761604188; c=relaxed/simple; bh=SrDZ+DLNBGOu3nimpXfUjnM4yJ1VEfalsKv638KNQyM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KaIXZTRJtxip7WVNXNDFBwveqQPMPb4dnKCPYlUROn/8SLeiIwq4DpDccHe6ch+jXXC3miOz25zt+nZ/HUGO4DnEIIgdf+T5KiMcmr1n/tamWB/3mAj6zmwlTMxfBZ6bQWw3BFP4MIvGcSM4OvPrxfVFeg3OkBVffm+V4nsTy94= 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=dvuTGIjh; arc=none smtp.client-ip=209.85.214.177 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="dvuTGIjh" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-292322d10feso43837405ad.0 for ; Mon, 27 Oct 2025 15:29:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761604186; x=1762208986; 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=OgRF61PFPbChj1vp/o1QNZYukk3nxmzm0YChQApjqKc=; b=dvuTGIjhlHCYjeKn38LgAgS3ieBOJzizc7GEroj7Wd4vI7TfdS4VIszioPjRujSx2x pR8uN6H7Q78TJuLGtHf0+h7c+0feGuUJf9qf2H1JpR0jEw5N7iOzlFLJd4RfxaB8Xrmp MOwfqCs5BiE1gknZYnbEAQWLOBrCtPENpnzlV9FlZfi3TE6R1i3MLb6zYaGT414hzG1b zniA1aBpZrYmirFd0Mdj8r3lbEPTKu/dY/1b+z6S5sxwlP5fsGSR4CIN19RTmkAy+ejR Pq3h5xBQxnXm3Nlad0gAQTMYZSO79kGHG8V84UPW9Zk/cSBOOjYIK9YUACLPZSqtQbZK sHCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761604186; x=1762208986; 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=OgRF61PFPbChj1vp/o1QNZYukk3nxmzm0YChQApjqKc=; b=rm/PW3dg/536Tf3EUkjef3LrAMDtgpNDug3p/jm+yIclR1L+kqaANhMV4fo4F/VZRM 347Zp21k2BFcGkQCBOh0UKd1tGRxoN9vtvDZ3kSa2UByluqBPk4ru3Sw4CVoxts9HwwP N2kvst+oRGyisFf2Oh8bRXI/4iaUQKRXd30TQlW4PBZ5iQ8Zaua87SQ2i0TZtpQdnO5A dzFne1JVwxPU4jnnlHWkNfEsZyRE9S/nIhZN8ZsewNKdLBNADWMtzkDuWueWxEvW+C/g 4M9/dkjdnx5/oD4Q0zPoDyZuPhPY+vvg8AMTj3aLa6U2aE0XPfr38jzYnwolrt0t7eTW rD3w== X-Forwarded-Encrypted: i=1; AJvYcCXymXlaMkTtp+lPhDGxEu2FFxOgJyUiWwp9ZyZVISYiPpqcNfcqo0M81OnI34uh+IsIEvfN1CS6wg==@vger.kernel.org X-Gm-Message-State: AOJu0Yww4OhhTnK1L8jX2e4yngc/hSZIucoQBlm4cUGrZMQfTMM+Sizi fPuGhFFK5tDMneFeWzTSEbNlhcz0Gcb8xsjk17FbtZunkGbbqxrN8/0E X-Gm-Gg: ASbGncuCAC/Jz49Efd+2oaEGmoP03X9KO6OaOBk9r60YpJTMo49rq9jROnXNhQqLh1v 6r7VKs3UozpFKOqLPbgv0AhBiYF7m5enb8NvR4igbkqe61rfn57fZHGGosxKtuZz4UBLrywH57L K4zGJ3qMiXWzDyuzae4J4evYIG9CE0rWhaA8OUTeiHz0T8OUGrFflXyR3eRfnbjCp7rV4HWRZBj cEiTCm7I0QZ3V4lEMfrbPOuIkoJ0SPuzzHpUtknn6OC3Nz4gpZTxF/RsDkhX86EzpCbCC3KGMdh zMgQ5m4pYgniOijXiF/7ZJjntWj0Zh5Avr6tY+1wL9xPdFoLEede81cKlg0JvcS61jja0kRhpuu tFaZ/1rH5cWDfpwXeLxjNBGMl67myraozWK1e39O8bNRMG6RslP+HpFz4tNYhkYvJ/EBODrwEj3 5Xu/rRiW5RQhKTQWj16R3Zi8dQIjqvc3PePA== X-Google-Smtp-Source: AGHT+IFVeyUuVXwYqaVSQ8PyIlEt9z22Qp/hZ8ZdfQtCmyIhJN79YO7UOU6Zi1O1KfyCfbulX0B8IA== X-Received: by 2002:a17:902:e788:b0:290:b10f:9aec with SMTP id d9443c01a7336-294cc77a4b7mr10498995ad.26.1761604186312; Mon, 27 Oct 2025 15:29:46 -0700 (PDT) Received: from localhost ([2a03:2880:ff::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29498cf3405sm95430175ad.2.2025.10.27.15.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Oct 2025 15:29:45 -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 4/8] fuse: refactor io-uring header copying from ring Date: Mon, 27 Oct 2025 15:28:03 -0700 Message-ID: <20251027222808.2332692-5-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 Move header copying from ring logic into a new copy_header_from_ring() function. This consolidates error handling. Signed-off-by: Joanne Koong --- fs/fuse/dev_uring.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/fs/fuse/dev_uring.c b/fs/fuse/dev_uring.c index e94af90d4d46..faa7217e85c4 100644 --- a/fs/fuse/dev_uring.c +++ b/fs/fuse/dev_uring.c @@ -585,6 +585,17 @@ 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) +{ + if (copy_from_user(header, ring, header_size)) { + pr_info_ratelimited("Copying header from ring failed.\n"); + return -EFAULT; + } + + return 0; +} + static int fuse_uring_copy_from_ring(struct fuse_ring *ring, struct fuse_req *req, struct fuse_ring_ent *ent) @@ -595,10 +606,10 @@ static int fuse_uring_copy_from_ring(struct fuse_ring *ring, int err; struct fuse_uring_ent_in_out ring_in_out; - err = copy_from_user(&ring_in_out, &ent->headers->ring_ent_in_out, - sizeof(ring_in_out)); + err = copy_header_from_ring(&ring_in_out, &ent->headers->ring_ent_in_out, + sizeof(ring_in_out)); if (err) - return -EFAULT; + return err; err = import_ubuf(ITER_SOURCE, ent->payload, ring->max_payload_sz, &iter); @@ -789,10 +800,10 @@ 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_from_user(&req->out.h, &ent->headers->in_out, - sizeof(req->out.h)); + err = copy_header_from_ring(&req->out.h, &ent->headers->in_out, + sizeof(req->out.h)); if (err) { - req->out.h.error = -EFAULT; + req->out.h.error = err; goto out; } -- 2.47.3