From patchwork Tue Mar 28 15:09:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 76142 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2313822vqo; Tue, 28 Mar 2023 08:40:37 -0700 (PDT) X-Google-Smtp-Source: AKy350Zlk46zjJdF28iscB4cpTYtKEQMsjznukdVDiPUdMeL7It5j1e1K403lFpuNL8PpRkiajvf X-Received: by 2002:a05:6402:1841:b0:4fc:782c:dca3 with SMTP id v1-20020a056402184100b004fc782cdca3mr16769815edy.28.1680018037714; Tue, 28 Mar 2023 08:40:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680018037; cv=none; d=google.com; s=arc-20160816; b=WcOhNJhrXn03uW2xFZcQY1Bkw/lPt7FCnDyIFbfFhBHu9ZJAXKoseoE1RwQihpmNnW HclHVgqD7+JOan1on0Zh/YT7fVedQzWpnt/WfP5aCiAgtRAOZl82it6MVYvt3sSGOxe9 ZLax1+DfJjtEvcArMMrFEN0qzLPJynN1G3/dYVq+M56d6uMvUZcqaTfF9UKx34jl+cc6 j8l+nxHj0Nq1WxZnh1p+AIJz6QxxPcLjb3aQr4XGOOn5oROXU/J3/iAHodmdp0AerRbU SDu5uy02sBQpSHXrZnC8pxjanE9M/qO+u8XFVIBnHv1+u2ImTPUoTz3IpqYHTEuo780e P6/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cTxPpka+LhrPaNriA70AKnPyZgOXWneoLBopgtDoZwU=; b=LT5+TphJjlZ9W53Yj8jaKntTIefR4+XuEr59vBHMJmVD5ElTKrf2eVKkzJLVSIyP/e /NqtnW5gLT97HWqWvvVPnIlDgyKMRKfTzRGhkDuoBvxDGAdtoB7sQf0FvOYG5i7f0SeL G1TVlNeiy8NLI8jgY5itKeiHVueaGPX1ddL1cEnA1g5XfxLAOL3RBoqfzuWXEofuyLbh njxUb5b5wEs7nAA/QIalSZ56SSc0nokoKpydVkqqMALK4YIFnPSh6xItU13MrrsMcaaT cQf4X0i2cgaFn1PN5zQVPVxbLO7O8bhMmgHXAWYjt0Dadh1JQVQegEtb5iWH/CLOUeG7 m9ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UgZATod4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d14-20020a056402078e00b004ab41ef87c3si31863036edy.442.2023.03.28.08.40.12; Tue, 28 Mar 2023 08:40:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UgZATod4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232833AbjC1PXV (ORCPT + 99 others); Tue, 28 Mar 2023 11:23:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233808AbjC1PW5 (ORCPT ); Tue, 28 Mar 2023 11:22:57 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1AC5EB56 for ; Tue, 28 Mar 2023 08:20:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680016747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cTxPpka+LhrPaNriA70AKnPyZgOXWneoLBopgtDoZwU=; b=UgZATod4BzU6rhu1YYWJYatGc2EbZ4XKB3NZFSziMcaGbFbYc/6b6RrIOxflajpKdobhre SNk9eWnwomEbt/FSUzyHi7poNOMjkwrLGaoSBkOgaiqtCFn56vNwQ+4JIeQxiz5XF/9DKc WBER4CLETO4R+aFYdKyafkH+c/iGPXo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-240-PUrBr7alNgOUiXBQAgnAyQ-1; Tue, 28 Mar 2023 11:11:57 -0400 X-MC-Unique: PUrBr7alNgOUiXBQAgnAyQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8E7052823806; Tue, 28 Mar 2023 15:11:49 +0000 (UTC) Received: from localhost (ovpn-8-20.pek2.redhat.com [10.72.8.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EB1D4020C83; Tue, 28 Mar 2023 15:11:48 +0000 (UTC) From: Ming Lei To: Jens Axboe , io-uring@vger.kernel.org, linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Miklos Szeredi , ZiyangZhang , Xiaoguang Wang , Bernd Schubert , Pavel Begunkov , Stefan Hajnoczi , Dan Williams , Ming Lei Subject: [PATCH V5 13/16] block: ublk_drv: support to copy any part of request pages Date: Tue, 28 Mar 2023 23:09:55 +0800 Message-Id: <20230328150958.1253547-14-ming.lei@redhat.com> In-Reply-To: <20230328150958.1253547-1-ming.lei@redhat.com> References: <20230328150958.1253547-1-ming.lei@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761626593584064258?= X-GMAIL-MSGID: =?utf-8?q?1761626593584064258?= Add 'offset' to 'struct ublk_map_data', so that ublk_copy_user_pages() can be used to copy any sub-buffer(linear mapped) of the request. Signed-off-by: Ming Lei --- drivers/block/ublk_drv.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 0dc8eb04b9a5..32304942ab87 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -511,19 +511,36 @@ static void ublk_copy_io_pages(struct ublk_io_iter *data, } } +static bool ublk_advance_io_iter(const struct request *req, + struct ublk_io_iter *iter, unsigned int offset) +{ + struct bio *bio = req->bio; + + for_each_bio(bio) { + if (bio->bi_iter.bi_size > offset) { + iter->bio = bio; + iter->iter = bio->bi_iter; + bio_advance_iter(iter->bio, &iter->iter, offset); + return true; + } + offset -= bio->bi_iter.bi_size; + } + return false; +} + /* * Copy data between request pages and io_iter, and 'offset' * is the start point of linear offset of request. */ static size_t ublk_copy_user_pages(const struct request *req, - struct iov_iter *uiter, int dir) + unsigned offset, struct iov_iter *uiter, int dir) { - struct ublk_io_iter iter = { - .bio = req->bio, - .iter = req->bio->bi_iter, - }; + struct ublk_io_iter iter; size_t done = 0; + if (!ublk_advance_io_iter(req, &iter, offset)) + return 0; + while (iov_iter_count(uiter) && iter.bio) { unsigned nr_pages; size_t len, off; @@ -576,7 +593,7 @@ static int ublk_map_io(const struct ublk_queue *ubq, const struct request *req, import_single_range(dir, u64_to_user_ptr(io->addr), rq_bytes, &iov, &iter); - return ublk_copy_user_pages(req, &iter, dir); + return ublk_copy_user_pages(req, 0, &iter, dir); } return rq_bytes; } @@ -596,7 +613,7 @@ static int ublk_unmap_io(const struct ublk_queue *ubq, import_single_range(dir, u64_to_user_ptr(io->addr), io->res, &iov, &iter); - return ublk_copy_user_pages(req, &iter, dir); + return ublk_copy_user_pages(req, 0, &iter, dir); } return rq_bytes; }