From nobody Sun Feb 8 21:28:04 2026 Received: from mail-pl1-f226.google.com (mail-pl1-f226.google.com [209.85.214.226]) (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 A7136238C0F for ; Sat, 3 Jan 2026 00:45:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.226 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767401138; cv=none; b=pLvkh+ktxCgaYB5OubX8auG1YMkb9YjHPl/8cQ4OWa4yrzUhfqHtWfdSFbpxZHotaXRn6Drnvbfs6+RkW2nAIh8qTRyBbbMNa8Httg7QM8I18NDQ1EmCYeJYF2pFHpNnSRvXePLyNIKXGtgM00V7c7qM2IESpspTN0/A0l4a45w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767401138; c=relaxed/simple; bh=gZdfTxZk5VaNifciQtGbLhQujcMObhkbytoMuzp9Q8A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a3DUyQFAB63TXXp+MgJFbRw/Y+Q9VoCbY6ewf4sEfXHffKWbqgegTNTkc9ilOrdscIMgmriJeuyp1iGSA1c1LfTPyuH1AG/+Qet+db1FcGZXy+wx2fgZixl70FJ7DJnxI6oFEgj3H5mmX24hGqgUG4xZHvOysLH/t3Tvxx6vlco= 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=fM4h2r1Y; arc=none smtp.client-ip=209.85.214.226 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="fM4h2r1Y" Received: by mail-pl1-f226.google.com with SMTP id d9443c01a7336-2a07fb1527cso31989685ad.3 for ; Fri, 02 Jan 2026 16:45:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1767401134; x=1768005934; 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=K93ipimKyaXS6w3F3nTrbjfIYkiy6EMTwAT5DBS8tQg=; b=fM4h2r1Y+nBo6GJi7lOfp0/thNX96ILy3aoeYclWJ4RWeK7jMHvtjgi0e/f1CbRwO5 c+JvBvZjBRmoKQa5V5Dh6QXpddEy3MjpIg78+YJ9lhXefREBn4DElmMeWGpX3Rl1SoxP EA8e2VuIxVUcj3outUkPAPDtZ4S9Th6SghAAF7FC6IuFjEpZ0eAh+91jWS3OwDNalgE/ 5A4yYwLmp3/eQ5jiflCY5VV8N+f4++ctS07Ux5HL4sWKXXtS3XEps8+q/EAztMBrjAMm Y4cck98u19GFSq3WYAujaKxjjpQ73WylPG1KgwXh2cMhP4CZxql8vb3Tgfh6iXcX+QPf FiSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767401134; x=1768005934; 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=K93ipimKyaXS6w3F3nTrbjfIYkiy6EMTwAT5DBS8tQg=; b=hIgwAGbWWXWEhRTBQO0dIhKpEPaEoesjFJ2+rgLPZ3izYOR2Pthg/eJYOMSNHVpjQY kKLH7DB3E1hlSK4+23fEKFtm68Q+wfwpR4u71E6w8RExpGw9jiTqziRdbXB5Z+4ZdSw2 2Mo4w1iJcyOnauYO1Rc7EUNg31LxOc/Qqsf1SdqHPojedsn0LQa3K9OAxj8k4xEdSzxY OGQq7IuyCYikEbQ5rZfodcckYPHC9mXOJXlXT0nK/erAiG+2XI5eYFtjE0Q6b9zPIfY1 vKjxZ7ZLSHSHgtn0Xmp2MG0dZnIYAhcXhYqSd7vDCGZhhjtySLHZ/Wll5UDW+GuKt1Zq G1JA== X-Forwarded-Encrypted: i=1; AJvYcCUzNzRtDOOp0B2p3/NPqVDKtRII0c18HyRme+uFCg3gFcf9+TwVBqrMtgotuBo8H+MLQTJLWoJ9uzQUCfY=@vger.kernel.org X-Gm-Message-State: AOJu0YxXO7CD2dEr91MkTr7nbkj1d9Ekj5Q+1oOLpm5vbJORR4j5dtDr t0FJKsV663shFQj4Et+yjud1G6DWPaFj7u7NbTyLNQXIrMkF5sagr2CddlnEH/A2JcdqhN+Syki seyoO/PAsOEQtUmInNCYDzCavsenr5XYdxznw X-Gm-Gg: AY/fxX7tJf7a0Rov0N7kw1/hlAGvKCaXE6nTzzj93OpMSvHy/OBQTQeXaaMdyIMId+U j6Ib9YEVTp25bbgeocTlrLp1qzrgPYo/ihq5/b7H+VmHjNM8tgYCj7sQGCHvZ0zsWfn5iGhoWN4 MFd81gxdrVY0ogW1NxQCpKWyy6rf6h7vBM1Ia7vNLA+9bkeOl78WqePUF7Fq12Ji1Dn9RThZfJE 6tC2tUTh3YcPdT2THTvZhH1vme1KY/T1oCp8u9FTEp19y+C9m56UaNEDcEhYwPaarhIA6qvPY0b Ij6PWv0SDr8UKdpDdpAqfLfLIwgOeyWtJZNK71OFkIVgXk5sy+sdGniGYcxH99b2mrb917E7CSd PQz220I++9vaFKs8XQzEJ/HaxsgQ1ZL+XfpCqa73xfw== X-Google-Smtp-Source: AGHT+IHBmS6K1J76/7U1o+5EfKCLNr5VBY8ZE1oDAMOqu9UGnI/oFXwHEJioMfZeokHhXfBgobMdAGQ3DvRf X-Received: by 2002:a05:7022:264a:b0:11b:862d:8031 with SMTP id a92af1059eb24-121721380fcmr16129514c88.0.1767401133910; Fri, 02 Jan 2026 16:45:33 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.128]) by smtp-relay.gmail.com with ESMTPS id a92af1059eb24-12172439a90sm8664373c88.0.2026.01.02.16.45.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jan 2026 16:45:33 -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 736E93402EE; Fri, 2 Jan 2026 17:45:33 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 70398E4426F; Fri, 2 Jan 2026 17:45:33 -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 , Caleb Sander Mateos Subject: [PATCH v2 09/19] ublk: implement integrity user copy Date: Fri, 2 Jan 2026 17:45:19 -0700 Message-ID: <20260103004529.1582405-10-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260103004529.1582405-1-csander@purestorage.com> References: <20260103004529.1582405-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" From: Stanley Zhang Add a function ublk_copy_user_integrity() to copy integrity information between a request and a user iov_iter. This mirrors the existing ublk_copy_user_pages() but operates on request integrity data instead of regular data. Check UBLKSRV_IO_INTEGRITY_FLAG in iocb->ki_pos in ublk_user_copy() to choose between copying data or integrity data. Signed-off-by: Stanley Zhang [csander: change offset units from data bytes to integrity data bytes, test UBLKSRV_IO_INTEGRITY_FLAG after subtracting UBLKSRV_IO_BUF_OFFSET, fix CONFIG_BLK_DEV_INTEGRITY=3Dn build, rebase on ublk user copy refactor] Signed-off-by: Caleb Sander Mateos --- drivers/block/ublk_drv.c | 52 +++++++++++++++++++++++++++++++++-- include/uapi/linux/ublk_cmd.h | 4 +++ 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 3149d705cb9a..82b193d63583 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -646,10 +646,15 @@ static inline unsigned ublk_pos_to_tag(loff_t pos) { return ((pos - UBLKSRV_IO_BUF_OFFSET) >> UBLK_TAG_OFF) & UBLK_TAG_BITS_MASK; } =20 +static inline bool ublk_pos_is_integrity(loff_t pos) +{ + return !!((pos - UBLKSRV_IO_BUF_OFFSET) & UBLKSRV_IO_INTEGRITY_FLAG); +} + static void ublk_dev_param_basic_apply(struct ublk_device *ub) { const struct ublk_param_basic *p =3D &ub->params.basic; =20 if (p->attrs & UBLK_ATTR_READ_ONLY) @@ -1072,10 +1077,37 @@ static size_t ublk_copy_user_pages(const struct req= uest *req, break; } return done; } =20 +#ifdef CONFIG_BLK_DEV_INTEGRITY +static size_t ublk_copy_user_integrity(const struct request *req, + unsigned offset, struct iov_iter *uiter, int dir) +{ + size_t done =3D 0; + struct bio *bio =3D req->bio; + struct bvec_iter iter; + struct bio_vec iv; + + if (!blk_integrity_rq(req)) + return 0; + + bio_for_each_integrity_vec(iv, bio, iter) { + if (!ublk_copy_user_bvec(&iv, &offset, uiter, dir, &done)) + break; + } + + return done; +} +#else /* #ifdef CONFIG_BLK_DEV_INTEGRITY */ +static size_t ublk_copy_user_integrity(const struct request *req, + unsigned offset, struct iov_iter *uiter, int dir) +{ + return 0; +} +#endif /* #ifdef CONFIG_BLK_DEV_INTEGRITY */ + static inline bool ublk_need_map_req(const struct request *req) { return ublk_rq_has_data(req) && req_op(req) =3D=3D REQ_OP_WRITE; } =20 @@ -2686,10 +2718,12 @@ 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; + unsigned data_len; + bool is_integrity; size_t buf_off; u16 tag, q_id; ssize_t ret; =20 if (!user_backed_iter(iter)) @@ -2699,10 +2733,11 @@ ublk_user_copy(struct kiocb *iocb, struct iov_iter = *iter, int dir) 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); + is_integrity =3D ublk_pos_is_integrity(iocb->ki_pos); =20 if (q_id >=3D ub->dev_info.nr_hw_queues) return -EINVAL; =20 ubq =3D ublk_get_queue(ub, q_id); @@ -2715,21 +2750,31 @@ ublk_user_copy(struct kiocb *iocb, struct iov_iter = *iter, int dir) io =3D &ubq->ios[tag]; req =3D __ublk_check_and_get_req(ub, q_id, tag, io); if (!req) return -EINVAL; =20 - if (buf_off > blk_rq_bytes(req)) { + if (is_integrity) { + struct blk_integrity *bi =3D &req->q->limits.integrity; + + data_len =3D bio_integrity_bytes(bi, blk_rq_sectors(req)); + } else { + data_len =3D blk_rq_bytes(req); + } + if (buf_off > data_len) { ret =3D -EINVAL; goto out; } =20 if (!ublk_check_ubuf_dir(req, dir)) { ret =3D -EACCES; goto out; } =20 - ret =3D ublk_copy_user_pages(req, buf_off, iter, dir); + if (is_integrity) + ret =3D ublk_copy_user_integrity(req, buf_off, iter, dir); + else + ret =3D ublk_copy_user_pages(req, buf_off, iter, dir); =20 out: ublk_put_req_ref(io, req); return ret; } @@ -3963,11 +4008,12 @@ static struct miscdevice ublk_misc =3D { static int __init ublk_init(void) { int ret; =20 BUILD_BUG_ON((u64)UBLKSRV_IO_BUF_OFFSET + - UBLKSRV_IO_BUF_TOTAL_SIZE < UBLKSRV_IO_BUF_OFFSET); + UBLKSRV_IO_BUF_TOTAL_SIZE + + UBLKSRV_IO_INTEGRITY_FLAG < UBLKSRV_IO_BUF_OFFSET); BUILD_BUG_ON(sizeof(struct ublk_auto_buf_reg) !=3D 8); =20 init_waitqueue_head(&ublk_idr_wq); =20 ret =3D misc_register(&ublk_misc); diff --git a/include/uapi/linux/ublk_cmd.h b/include/uapi/linux/ublk_cmd.h index a22de3fc5447..87262f5c054b 100644 --- a/include/uapi/linux/ublk_cmd.h +++ b/include/uapi/linux/ublk_cmd.h @@ -132,10 +132,14 @@ #define UBLK_MAX_NR_QUEUES (1U << UBLK_QID_BITS) =20 #define UBLKSRV_IO_BUF_TOTAL_BITS (UBLK_QID_OFF + UBLK_QID_BITS) #define UBLKSRV_IO_BUF_TOTAL_SIZE (1ULL << UBLKSRV_IO_BUF_TOTAL_BITS) =20 +/* Copy to/from request integrity buffer instead of data buffer */ +#define UBLK_INTEGRITY_FLAG_OFF UBLKSRV_IO_BUF_TOTAL_BITS +#define UBLKSRV_IO_INTEGRITY_FLAG (1ULL << UBLK_INTEGRITY_FLAG_OFF) + /* * ublk server can register data buffers for incoming I/O requests with a = sparse * io_uring buffer table. The request buffer can then be used as the data = buffer * for io_uring operations via the fixed buffer index. * Note that the ublk server can never directly access the request data me= mory. --=20 2.45.2