From nobody Sat Feb 7 09:59:24 2026 Received: from mail-pl1-f228.google.com (mail-pl1-f228.google.com [209.85.214.228]) (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 9496E21420B for ; Tue, 6 Jan 2026 00:58:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767661092; cv=none; b=pc16LQCn0Nl8ZbpRsgngr6j9F5qvZ+ptGSoWCihB8nyNGp4K6nZBDzImZHWIDTE7p1+PMAEO8uGxjmdyrflgxtesKEp1DJ1PkXV2fzy3SKEWkB1Q3galJ8izr7tl315l0Gbf8b3QYJ5yYRWAcOtK1FxodUneC0F8IQPo8lL6B/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767661092; c=relaxed/simple; bh=jzyih9dafZ4XR2piw4ZWjyPqJoo0c71+VM6fgrf47l8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r4ntQKcdMaAy7jEz/SoQhPeFEI+mm/P3JGuSZyFw1a0mxjoSRhNrbzeMfc9OJBlv+GLYDV5SqL82mSL69o7xSkekdUUH7xvnbaHZXd+GROZo6CYVEe0RCsycbc/bMjYVbf6/kBr6W8GFSq8iAsZfdD6/hMBZFKvKn1O3qo26NCg= 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=gI1Z29pP; arc=none smtp.client-ip=209.85.214.228 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="gI1Z29pP" Received: by mail-pl1-f228.google.com with SMTP id d9443c01a7336-29f08b909aeso1204235ad.2 for ; Mon, 05 Jan 2026 16:58:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1767661089; x=1768265889; 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=ieqTxRr9zPk5de54duzCoKw16y8ifpstASg31G9cIt4=; b=gI1Z29pP4yAXZVJRn4QamN2Jy0wSyUYwFPSB1tS1W+rn5Puz5rbJGKEkx42meRq3bN JUqSUxqEocyePhUbXWGi+2L8GMF3SLTsoqxzdYmdZrVQPc6ZRFtqgd/GXu+VUcYrVvKM P5ntAUeiumiqZrznCOJ37C6TLaVPzcOYKf0HGflGWzQ3GnfZHiSFJK5zYpDDluuCTlqH jwGQBWd50yv3WzstUaYUthE/E2+UrVek+eh2zzNooo4hd3u32o+G0gBs8yqxV8PRJPnu SHDnm33/H5m7hwFZaytbYDHLyBg93tpIrUivECX+1C88MOXe/2fPa2me0MX4UNsCyjXy Hmsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767661089; x=1768265889; 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=ieqTxRr9zPk5de54duzCoKw16y8ifpstASg31G9cIt4=; b=QoadQnBJE7wT7AlscuxIzhGYRZ2O3/iF0/T0TGU6RETzGzm9v7QCKtM3JswcQotY2I 0oXedR3j+JZmBvfPOV+c1BACtm7px/i+IW/al4FZY8x7f/DZFr08WRiOBnB5/JhX3k06 oGakBeBirYPFB+I9BMFX2vmqBGlZ21fQNL0asMNXagAdMMgh7GSmc9BAhtDNPSN5mMvh 5FEFrabmWY6+BnogZfWzdcOLv0SRoqXZXOhoc7CPbuw6YIyz0IJQUuLHfL6z+V5c2e5Z CE/9xgoksyNx5JEplwZiOKO6rXCzeZVfEPA6eG3i7zlzYBEhXoWo+rSjfkoBeSiXuije nMlQ== X-Forwarded-Encrypted: i=1; AJvYcCUpvKSEA81vjaWkRcG/mT4rIAyQFiEi4sMQl2ag4S8JMSoxJpX7JBoOmPWEXK8Fn1aoeaqinDHdPNmQVVw=@vger.kernel.org X-Gm-Message-State: AOJu0Yyed2DhbQ0MHE0zOsdf5sR3274V309h9wS8UPJPAjLWGN8XkNjx 3eYI+GKwNe63O7kChSeSiOyihfzsxHRVZwG1+G8Lrad9PpcSOUEzThaZwclLqSzA8gAAJ3QjRxF KGt70hOmvbaPNJwu87XiwA8UlAnuG8aohNj8+ X-Gm-Gg: AY/fxX4gUtsy2fIqocRatUCNFANvVYVEeQ/pgK1CNABaU5S3Ivl62xTzjt6RZid+Npk whJoDhI0Ic43vDMDpsFt81etm3ePBCEroMpW+WT/hw2UVS+mRuaRrsRuKipydoMHnwDWJArxx3D 4Mcwmqd2nsCMF7QxAc8IBwSmaTwoY7vtwwN77I1WaKYN1m5VNrjn0z9ocWJuP8gW20/tTlHps3D 9cpBIWfmhRmmajlxU8j/kvWRNSB7/tgoGQ396dLy/iS1cVp5Tt6LsPW+IZUwYAqNBcYlyOVnd6D Gd7p+tY2ThbSsaD1U9n4aV4l39TzahOAHOZwuPVU9XtH/JxFudX0F16b74f6HcfclyySLQS91xU G+mINlRdBs5h+yFT76rNw2LYYFihBDTAH7IOAvSfKVg== X-Google-Smtp-Source: AGHT+IGUUIlq0t3uefFMiXwBaG09hS89DAoxd/gq2atTHMJ0YrjcZZdAsObR5myPEQGUUl2SKt5hQt3PWz7w X-Received: by 2002:a17:903:2f8a:b0:2a0:992c:1ddd with SMTP id d9443c01a7336-2a3e2e22affmr8386995ad.8.1767661089556; Mon, 05 Jan 2026 16:58:09 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.128]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-2a3e3cc48e4sm850425ad.41.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 202AC341D2E; Mon, 5 Jan 2026 17:58:09 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 11EC9E44554; Mon, 5 Jan 2026 17:58:09 -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 07/19] ublk: inline ublk_check_and_get_req() into ublk_user_copy() Date: Mon, 5 Jan 2026 17:57:39 -0700 Message-ID: <20260106005752.3784925-8-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ublk_check_and_get_req() has a single callsite in ublk_user_copy(). It takes a ton of arguments in order to pass local variables from ublk_user_copy() to ublk_check_and_get_req() and vice versa. And more are about to be added. Combine the functions to reduce the argument passing noise. Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 51 ++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 33 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index c3832ed8cec1..abb668b460a8 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -2650,70 +2650,55 @@ static inline bool ublk_check_ubuf_dir(const struct= request *req, return true; =20 return false; } =20 -static struct request *ublk_check_and_get_req(struct kiocb *iocb, - struct iov_iter *iter, size_t *off, int dir, - struct ublk_io **io) +static ssize_t +ublk_user_copy(struct kiocb *iocb, struct iov_iter *iter, int dir) { struct ublk_device *ub =3D iocb->ki_filp->private_data; struct ublk_queue *ubq; struct request *req; + struct ublk_io *io; size_t buf_off; u16 tag, q_id; + ssize_t ret; =20 if (!user_backed_iter(iter)) - return ERR_PTR(-EACCES); + return -EACCES; =20 if (ub->dev_info.state =3D=3D UBLK_S_DEV_DEAD) - return ERR_PTR(-EACCES); + return -EACCES; =20 tag =3D ublk_pos_to_tag(iocb->ki_pos); q_id =3D ublk_pos_to_hwq(iocb->ki_pos); buf_off =3D ublk_pos_to_buf_off(iocb->ki_pos); =20 if (q_id >=3D ub->dev_info.nr_hw_queues) - return ERR_PTR(-EINVAL); + return -EINVAL; =20 ubq =3D ublk_get_queue(ub, q_id); if (!ublk_dev_support_user_copy(ub)) - return ERR_PTR(-EACCES); + return -EACCES; =20 if (tag >=3D ub->dev_info.queue_depth) - return ERR_PTR(-EINVAL); + return -EINVAL; =20 - *io =3D &ubq->ios[tag]; - req =3D __ublk_check_and_get_req(ub, q_id, tag, *io, buf_off); + io =3D &ubq->ios[tag]; + req =3D __ublk_check_and_get_req(ub, q_id, tag, io, buf_off); if (!req) - return ERR_PTR(-EINVAL); - - if (!ublk_check_ubuf_dir(req, dir)) - goto fail; - - *off =3D buf_off; - return req; -fail: - ublk_put_req_ref(*io, req); - return ERR_PTR(-EACCES); -} - -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; + return -EINVAL; =20 - req =3D ublk_check_and_get_req(iocb, iter, &buf_off, dir, &io); - if (IS_ERR(req)) - return PTR_ERR(req); + if (!ublk_check_ubuf_dir(req, dir)) { + ret =3D -EACCES; + goto out; + } =20 ret =3D ublk_copy_user_pages(req, buf_off, iter, dir); - ublk_put_req_ref(io, req); =20 +out: + ublk_put_req_ref(io, req); return ret; } =20 static ssize_t ublk_ch_read_iter(struct kiocb *iocb, struct iov_iter *to) { --=20 2.45.2