From patchwork Thu Mar 30 11:36:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 77124 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1059978vqo; Thu, 30 Mar 2023 04:41:45 -0700 (PDT) X-Google-Smtp-Source: AKy350aHVERoBBkmYTClyjISVoVrOzRqGdc58/QiaNDLq2uLWaZb7O3KhoDkqufNnWhZUso3qFMo X-Received: by 2002:a17:90a:1942:b0:240:9bf7:8df2 with SMTP id 2-20020a17090a194200b002409bf78df2mr11686919pjh.37.1680176505590; Thu, 30 Mar 2023 04:41:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680176505; cv=none; d=google.com; s=arc-20160816; b=0uq8qe8hCQCemA+q46AU9HpahTkIDQrEPBj0ILpCMW4yG3m7SXzfhGqhV6xihcelRW Ts8pFRgzuv1H0hd1txYN4QCaoDuZI+4saxHdzntgI+3s6VXhB8uaHYx9nlIdReFoK7kj VqdiNA3BHZhTKFN+CSFFD8J3tQA+RuXDU29NCKHRXS9djkoqOrPWWRARgm8DqkGNBA/O dDZvhBhAiKLYEhoqXDMDm/W7rC0AXz9+PVAzBYPtqUEuXb7JLZ671/sDBHSxWr9X+oj5 U3hnlLrM9mGto3lwcENwaHYL/q9zLdARaiaBJ4wE8ijOdo2HSjUx9hWHa8RrV+Ju+bBj HpnA== 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=P/CiefYb2kOrc+i3GnqeG3N+IU/sYl+gCptQqwyiP8Wg+9xDHX4QfdIzhFsOC7BAMX 1d6RIj1DQE767NqcWedY2dxHcG7KzplKW2mIbcw+YmSWLFnmALya68FMuELTcaDpq+n6 E3lBRSOEnrCg3qewLOqHZT8T7sEmRRKErxZXmKSQNA6v+11A16Bs6TifLIB+k8C6PyYx Lm+8UaGboPmXiYDFazIere919YyYRu83pC28pmWdx+Hf7M5kWkdEsiVKHd7IooMgN6qi NCTFNoYswD1SXGGHapqXaqww4BuaMC7zxXk/I1guPecRRdyaX8HiivB/VoHJyu0DvRaH /yIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=eCOZhpzf; 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 v12-20020a63f84c000000b0051392b219dfsi1806196pgj.334.2023.03.30.04.41.31; Thu, 30 Mar 2023 04:41:45 -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=eCOZhpzf; 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 S231847AbjC3Lj7 (ORCPT + 99 others); Thu, 30 Mar 2023 07:39:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231901AbjC3LjV (ORCPT ); Thu, 30 Mar 2023 07:39:21 -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 258FF93F4 for ; Thu, 30 Mar 2023 04:37:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680176265; 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=eCOZhpzfv2r7l2HGXajEHU+68gpywdRpN+tRR3giXPPpsIujen9hO0OVpOQeFeojczByK/ LaqXFaCLb20EsbbludfIw/adK7IbT2wG3+SEZ3ji0Fmg3LuLoy8v9C5d8OFl1OujUvxHwK hbjtI88/GJmIXF2Oru/dwkqp3cXe25Q= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-451-VPwHtt-QMliJ16sPFx-2aQ-1; Thu, 30 Mar 2023 07:37:42 -0400 X-MC-Unique: VPwHtt-QMliJ16sPFx-2aQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 74C34101A54F; Thu, 30 Mar 2023 11:37:41 +0000 (UTC) Received: from localhost (ovpn-8-19.pek2.redhat.com [10.72.8.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E96918EC6; Thu, 30 Mar 2023 11:37:40 +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 V6 14/17] block: ublk_drv: support to copy any part of request pages Date: Thu, 30 Mar 2023 19:36:27 +0800 Message-Id: <20230330113630.1388860-15-ming.lei@redhat.com> In-Reply-To: <20230330113630.1388860-1-ming.lei@redhat.com> References: <20230330113630.1388860-1-ming.lei@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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?1761792759749444559?= X-GMAIL-MSGID: =?utf-8?q?1761792759749444559?= 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; }