From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx1-f100.google.com (mail-yx1-f100.google.com [74.125.224.100]) (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 937B221A95D for ; Tue, 6 Jan 2026 00:58:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.100 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767661094; cv=none; b=mgjbsEsDS9dETEVlBGoHRZVWZa1CO6ooDkifFdsV2JKDvxUcm9d99zwDFrfYLB8VvniQb0r/3DNqLJUIjyZo2geOAqAurc7YF+QSopCQG+b6Xk9k7+geaIWXo7YjhUjuXp2B3o40/ONSjvJ8zRUm916VSPPoVq2ptqpUihcMBms= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767661094; c=relaxed/simple; bh=h2X1ZWO1y4UUJFzrWl61pBJcNiTBynvwTGaZHdcC50o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uY3XzGBLbBgmxlmodsNGiuuYDbNZWL8nZS+/1+tEupO7in5bmUzHbRYDYULdXnHHkQOjUJUgLgomF8mg0NsnHxO9AfLUHj07SK4aWyMcBCI6mSXahR6iHDyYqtI5I3RmmWciUJ7qO0ONDpLefJB0C6yjpHqOMaKUa4rEO0Gk+9s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=Grk2hLNa; arc=none smtp.client-ip=74.125.224.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="Grk2hLNa" Received: by mail-yx1-f100.google.com with SMTP id 956f58d0204a3-6446c7c5178so74120d50.1 for ; Mon, 05 Jan 2026 16:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1767661090; x=1768265890; 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=slGh8Pjkarq3D8VYCdEWTgiawZdNotszyBup3yDWJ94=; b=Grk2hLNaEV7yrCWug6KF3ZVe1mLxzbOur7BpKSC6b0aXtbvgr+tzRfwcTSfrfTwy0Q WFMgvxCoLCrXUjxHPKM/vJY1zmUlBEfrjapNFmbNG889MGofaOYfaejCj+mZh/zTfsFy Px4AU2MF+SVVEwCwEBOePogYXY5XcDaJIEEZnT0UAxS+pDn6aFuhCrQq8FixEl67IiZd 36/GHHKrG7SdAwUJ+oWpDZ3c0xSwlgOqBMlNi4e0X0XN1XW+mAVzxjjQ6Qj9uMf2s4Mr M3j/CEIsZAqJZO3oOVa2rtDQpN2iSNbUwQCCQFu4gYax0qSB5A/ydRd2mCyijcJE4eAT DXbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767661090; x=1768265890; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=slGh8Pjkarq3D8VYCdEWTgiawZdNotszyBup3yDWJ94=; b=Q0W7ex4Oy4PYX6wqbrgPIIYw9b/Omi1cnTSqbTn1T2HTDOMh+FttPK6ryCsiOsU75r 6xTUqs6Cc1buzG63PelFuw9Qg+5jf7E4igtCbis22EanMUFrxIDR7ztogJbvboay4ymr Wsw9SZbBw6D9TVjhD2cA2VAfl4sO3KgHS1qlCsRJAC0/39wpP1BajT9ZxrUfc0o/UQba tHq9G4Z9XXqr4/H8ino1lVXu86B/n++p2MNESFwv8CJ3vjzdlkdfpeYyRsGDm7kMs5M6 8R/Dcm/H9iJlWpBX1rRTgCLZLwX2kPLDOCfrzXlWjMntIYEedPT0B+AOJtTe3zBxTvCM 5Vnw== X-Gm-Message-State: AOJu0Yx0ApeYxibGJ1YHTK6acLfcZymN4oOUfm7LEzQpZqgq2oPqFx0B WW9+Rpb6W2q072qPUwDr18rwUsuCjijkdrNIZVjJE4OwbbPW3LmA9VL7WavC4AKb6Y0VLsw9DBJ iZhAAKhTTKI2CtHOM12HN+ppZTt9Gd0Shop2pKbENNAzVIkCwTVQT X-Gm-Gg: AY/fxX6lJFG4aeHW2aglIBvRhdtzSNIBTX1Fhaa73jbSljLv3P2Kfv7bVuwxKqVzGwZ z/Tw0kvj4a33a4RdPoiwdPpIKHfEGzrFN68sVIPHLtNyb4tPRcXKyAosiPjR5T8DQAfsXwgzHiK +fG+ILGm5bXHT0k5xJfF1bN2XYP/Au2CnmlvTfKfgVcU9f/Rxg8TXL5BpdtL3jbbpJ/JYEw4GNU c2t2E9PoRRNMXcrtVUS9wAl+MyhdUPpEyviQkiwlbgaY9XzOIu0fzO4KFqdtFKlDo4bAlVK98OT 4Mr4hi45UgNAeaOgQwYXQ9/3rL9mo4VaQvAandcU0mR3v1zA+wYrZDzpYPfwJNtv1mH5bJ0ew1K vpCH92aJklBsAgM2SnDsLQI0jwzM= X-Google-Smtp-Source: AGHT+IGGt5rJUjZMWpNtDxleRmkLfQrCcatBCgXXwQ9lzfw8U+88G65krAcdFvyhL5DbzEgyenmVPsTejlPO X-Received: by 2002:a05:690e:b4a:b0:644:7182:dab3 with SMTP id 956f58d0204a3-6470c8413dbmr1146154d50.2.1767661089760; Mon, 05 Jan 2026 16:58:09 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id 956f58d0204a3-6470d8c4d07sm70913d50.13.2026.01.05.16.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jan 2026 16:58:09 -0800 (PST) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.49.34.222]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id E6802340960; Mon, 5 Jan 2026 17:58:08 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id D8B53E44554; Mon, 5 Jan 2026 17:58:08 -0700 (MST) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe , Shuah Khan Cc: linux-block@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Stanley Zhang , Uday Shankar , "Martin K . Petersen" , Caleb Sander Mateos Subject: [PATCH v3 06/19] ublk: split out ublk_user_copy() helper Date: Mon, 5 Jan 2026 17:57:38 -0700 Message-ID: <20260106005752.3784925-7-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260106005752.3784925-1-csander@purestorage.com> References: <20260106005752.3784925-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ublk_ch_read_iter() and ublk_ch_write_iter() are nearly identical except for the iter direction. Split out a helper function ublk_user_copy() to reduce the code duplication as these functions are about to get larger. Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 2ce9afdecc15..c3832ed8cec1 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -2695,42 +2695,36 @@ static struct request *ublk_check_and_get_req(struct kiocb *iocb, fail: ublk_put_req_ref(*io, req); return ERR_PTR(-EACCES); } -static ssize_t ublk_ch_read_iter(struct kiocb *iocb, struct iov_iter *to) +static ssize_t +ublk_user_copy(struct kiocb *iocb, struct iov_iter *iter, int dir) { struct request *req; struct ublk_io *io; size_t buf_off; size_t ret; - req = ublk_check_and_get_req(iocb, to, &buf_off, ITER_DEST, &io); + req = ublk_check_and_get_req(iocb, iter, &buf_off, dir, &io); if (IS_ERR(req)) return PTR_ERR(req); - ret = ublk_copy_user_pages(req, buf_off, to, ITER_DEST); + ret = ublk_copy_user_pages(req, buf_off, iter, dir); ublk_put_req_ref(io, req); return ret; } -static ssize_t ublk_ch_write_iter(struct kiocb *iocb, struct iov_iter *from) +static ssize_t ublk_ch_read_iter(struct kiocb *iocb, struct iov_iter *to) { - struct request *req; - struct ublk_io *io; - size_t buf_off; - size_t ret; - - req = ublk_check_and_get_req(iocb, from, &buf_off, ITER_SOURCE, &io); - if (IS_ERR(req)) - return PTR_ERR(req); - - ret = ublk_copy_user_pages(req, buf_off, from, ITER_SOURCE); - ublk_put_req_ref(io, req); + return ublk_user_copy(iocb, to, ITER_DEST); +} - return ret; +static ssize_t ublk_ch_write_iter(struct kiocb *iocb, struct iov_iter *from) +{ + return ublk_user_copy(iocb, from, ITER_SOURCE); } static const struct file_operations ublk_ch_fops = { .owner = THIS_MODULE, .open = ublk_ch_open, -- 2.45.2