From patchwork Wed May 10 15:20:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 9720053 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 46BFF60236 for ; Wed, 10 May 2017 15:21:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39C8928609 for ; Wed, 10 May 2017 15:21:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E25428618; Wed, 10 May 2017 15:21:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9977528609 for ; Wed, 10 May 2017 15:21:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753610AbdEJPVO (ORCPT ); Wed, 10 May 2017 11:21:14 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34050 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753357AbdEJPVK (ORCPT ); Wed, 10 May 2017 11:21:10 -0400 Received: by mail-wm0-f65.google.com with SMTP id d127so537487wmf.1; Wed, 10 May 2017 08:21:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=gXDgt7z5ISu/7HAOcMdZ18jtJpP0q+JEEt+H1dKz64E=; b=sQsQB7rbx7em4e63hOPZCFFxktT2ua2ST03oW9kC0cqUHHNsE8fIv5n1B38J6yroEG kQZfvg7nXr4sMROU+bT71gkbrzNiBjb9SPfhCLaoLcQ6w21UOhF5+Z8iGWP3b5WW6R3m KJNfci53mnAendG2eq5ikGjno7pnaBCrK27uovkyyeMthgRzSvpwSSBbmgTBi7CAy7Md epnZ+Hn0QfjngKtU+UI8JvVQuDSTGXUorc26rZVa+eQvCSOGaALubQ3jfo5DTfCcaGxz OGQN/0w0HC/jHnRF6AgUstdVnuc3pPJ9NHwCYjt1hPootxI0llV3I7Ua7o7Y4ibifYOP HGUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=gXDgt7z5ISu/7HAOcMdZ18jtJpP0q+JEEt+H1dKz64E=; b=hK+ahUW0JwJfgwQ0p2ZVGiFwGxV9MHBJpjh3FhcOQFQW3TNG0ZCMtB3IHyEH+18C3R B8mBJLGOzGPkNpYPsZ4lXdS1S34uAN2NKhka4ykiGe1o7TFv2UyXDlOM0NNzaD5ySUAR SGusoOVttRIry3N4PV+nD9qo061WqcwHIBt04+rn0WuqXoQ1En64KtAYCa9rxswe4rWS NQuakeWeHOZD4vPMR4nZiwa8XrdRl2hercJgow0+mcEKX/GuUWUl86cfWywrL4u294AP nuqXOsbzCPiKh8YoUuMMPb/OC9QVuooPgDx7IoCG/t73RtzKaAo0b3kBzrnNn5hgRjje bwHQ== X-Gm-Message-State: AODbwcDsTFEEebza9ERgLdYsQt5MmuI9PLL8KKlMMdLsqXgNla2iYOsy HCKkBcTZZ1nTQk13y7Q= X-Received: by 10.25.37.139 with SMTP id l133mr2963059lfl.3.1494429668474; Wed, 10 May 2017 08:21:08 -0700 (PDT) Received: from smtp.gmail.com (msk-vpn.virtuozzo.com. [195.214.232.6]) by smtp.gmail.com with ESMTPSA id 129sm608290ljf.36.2017.05.10.08.21.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 May 2017 08:21:07 -0700 (PDT) From: Dmitry Monakhov To: fstests@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, Dmitry Monakhov Subject: [PATCH 9/9] bio-integrity: Restore original iterator on verify stage Date: Wed, 10 May 2017 19:20:52 +0400 Message-Id: <1494429652-9488-10-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1494429652-9488-1-git-send-email-dmonakhov@openvz.org> References: <1494429652-9488-1-git-send-email-dmonakhov@openvz.org> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently ->verify_fn not woks at all because at the moment it is called bio->bi_iter.bi_size == 0, so we do not iterate integrity bvecs at all. In order to perform verification we need to know original data vector, with new bvec rewind API this is trivial. testcase: https://github.com/dmonakhov/xfstests/commit/3c6509eaa83b9c17cd0bc95d73fcdd76e1c54a85 Reviewed-by: Hannes Reinecke Reviewed-by: Christoph Hellwig Signed-off-by: Dmitry Monakhov --- block/bio-integrity.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/block/bio-integrity.c b/block/bio-integrity.c index 9b9ace3..4b03128 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c @@ -184,9 +184,10 @@ static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi, /** * bio_integrity_process - Process integrity metadata for a bio * @bio: bio to generate/verify integrity metadata for + * @proc_iter: iterator to process * @proc_fn: Pointer to the relevant processing function */ -static int bio_integrity_process(struct bio *bio, +static int bio_integrity_process(struct bio *bio, struct bvec_iter *proc_iter, integrity_processing_fn *proc_fn) { struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev); @@ -200,10 +201,10 @@ static int bio_integrity_process(struct bio *bio, iter.disk_name = bio->bi_bdev->bd_disk->disk_name; iter.interval = 1 << bi->interval_exp; - iter.seed = bip_get_seed(bip); + iter.seed = proc_iter->bi_sector; iter.prot_buf = prot_buf; - bio_for_each_segment(bv, bio, bviter) { + __bio_for_each_segment(bv, bio, bviter, *proc_iter) { void *kaddr = kmap_atomic(bv.bv_page); iter.data_buf = kaddr + bv.bv_offset; @@ -333,7 +334,8 @@ int bio_integrity_prep(struct bio *bio) /* Auto-generate integrity metadata if this is a write */ if (bio_data_dir(bio) == WRITE) - bio_integrity_process(bio, bi->profile->generate_fn); + bio_integrity_process(bio, &bio->bi_iter, + bi->profile->generate_fn); return 0; err_end_io: bio->bi_error = err; @@ -357,9 +359,15 @@ static void bio_integrity_verify_fn(struct work_struct *work) container_of(work, struct bio_integrity_payload, bip_work); struct bio *bio = bip->bip_bio; struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev); - - bio->bi_error = bio_integrity_process(bio, bi->profile->verify_fn); - + struct bvec_iter iter = bio->bi_iter; + + /* At the moment verify is called bio's iterator was advanced + * during split and completion, we need to rewind iterator to + * it's original position */ + bio->bi_error = bio_rewind_iter(bio, &iter, iter.bi_done); + if (!bio->bi_error) + bio->bi_error = bio_integrity_process(bio, &iter, + bi->profile->verify_fn); /* Restore original bio completion handler */ bio->bi_end_io = bip->bip_end_io; bio_endio(bio);