From patchwork Wed Sep 20 13:03:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13392745 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8232DCE79D3 for ; Wed, 20 Sep 2023 13:05:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CD1556B015C; Wed, 20 Sep 2023 09:05:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C5AE66B015E; Wed, 20 Sep 2023 09:05:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD3786B015D; Wed, 20 Sep 2023 09:05:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 825C36B015C for ; Wed, 20 Sep 2023 09:05:05 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 412FBA065B for ; Wed, 20 Sep 2023 13:05:05 +0000 (UTC) X-FDA: 81256996170.18.E7E44E0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf21.hostedemail.com (Postfix) with ESMTP id 28F0A1C002F for ; Wed, 20 Sep 2023 13:05:02 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NEs3FwcL; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695215103; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0wrDnIJNvyLeCaZ76kAPm12sjpZAz+xrWcuHtRTLq38=; b=396WfUj2Rbvj11S3Cw/fAQcOaLl25HdekcT0pauWRKFLGTfSafD4jgwoUFjnaxoddUze8K Er8hiNVU+h0i1OdRHno5YcZKMCBHuibdN1SnvwPk0r5BKM6CHL18XjUDvOjG/Gk20mz5Ph 2EA9kA6VwEJuErqw6zIHDIxQCqN6BH0= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NEs3FwcL; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695215103; a=rsa-sha256; cv=none; b=M1AqgFwhNrdCkqmA2NM2Y4R7SCOhnsWNLqMoPIrmns8XFBD69hkR3DcJL7CYRkvwS+Ok68 qBjBJRCz+ZKesH+YcQNWH0+upYmxM6zgCImbe5WQdW5zFljnOBkbdwllOaaShINYUTFd/j L20KHte3baVK6LzhPv0rRXzb42FGhA8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695215102; 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=0wrDnIJNvyLeCaZ76kAPm12sjpZAz+xrWcuHtRTLq38=; b=NEs3FwcLwwhC2rSwEtLV9+dNtl9VwmXsh4kVrsyjVi4frosdByjyhou4vBeTdox1ZT1HRO 2jcx76WIyLKbc6NM8XqQyH/9CJSJ44zw5qlw+9bYWiopoj1fXDG/WUuc8jP1+YTX0tYDOr x5qL77rVVwFOkRFbvoYtQT11tXVyuks= 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-231-GSu9rdLnNoOiK0fFC_BW6g-1; Wed, 20 Sep 2023 09:04:54 -0400 X-MC-Unique: GSu9rdLnNoOiK0fFC_BW6g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CA268101A585; Wed, 20 Sep 2023 13:04:51 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id C3ABF40C6EBF; Wed, 20 Sep 2023 13:04:44 +0000 (UTC) From: David Howells To: Jens Axboe Cc: David Howells , Al Viro , Linus Torvalds , Christoph Hellwig , Christian Brauner , David Laight , Matthew Wilcox , Brendan Higgins , David Gow , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, Christian Brauner , David Hildenbrand , John Hubbard Subject: [RFC PATCH v2 4/9] iov_iter: Consolidate bvec pattern checking Date: Wed, 20 Sep 2023 14:03:55 +0100 Message-ID: <20230920130400.203330-5-dhowells@redhat.com> In-Reply-To: <20230920130400.203330-1-dhowells@redhat.com> References: <20230920130400.203330-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Rspamd-Queue-Id: 28F0A1C002F X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: oeo7e81hzdanfbkmzf5n8hej3swxkik8 X-HE-Tag: 1695215102-886250 X-HE-Meta: U2FsdGVkX1/GwUm4yICNjAuoPeA3BG/tVB3wiYZh+6t90waacdO9aQ8WDJbkrYmWDalqkMlMeXIFMZFrgOHCnwGfjr+wGwb8HqIc+mvM6CI5U9iA6B8RynJv4lNpM5V70+TOBj54jBYjh4fQgOfep6FI0LX5Jjw2jwmY2E3Q8mpWj3EpSlQp2J/4SO4oO6gxx2xiPc/GxTUAAyLwciUCpcE+ZaryO61SQ75io6jCUxKG+n2OfgNHnp2kncW09Td6HTjT57OJz0jkvLx08TlLnKvp9nXn6OS9wmw67AXafTPeaXRd9ueMD0WgePwzhzSzNg1iVJUGBcmFuX+9O9xm8HSLcqsyhE2vO5Y4umJTPL+6fXM5mvdwS0dRCPAZyxsGofRDiyxIRB4XiP4AbloSdlJjCu3t0NqVNdpn+MkPEsURfvT3avJTqXYvtzqTjfwf2EQfnT0hSgD4tKU3kvA50kegEailIDItRlThQeoSdrNGGfwrqxb0H3O6GRE8hiGNmR+Rsxkqxzv3VbEbDjDK9DQnS2hbh8ZghoE4XluuwZyFQ5YsXs2r/2LrANhefEOwf6A4PZ+s8MfVxgqCmM8jeXVrFYvht/1wrAQMxssI56m32ftc4GiyIdC5u07SOBhfTO4fWm0E3K4fY/04RN1CrY3QmwYohnceHWpwgCmACuMsq7CXk/6tNkPyUK6+WzlaCvs/pstiZpozLdCUS76dkl9s97UWITsmD3974vrUkoFPlMMSJwL3nZxj2JvNaHVTuC4AWxCCs+uAymnMUwyndgw055RhSuj8jEwwawjIqOFmw+SIpEtjsJi6sTA6LaupL3ESI6rXHp/CKTfeIorPULhaTYpIFXlr10bZG1KNCOTFMZxYZKlMLkroQCjAT/8tmvGvNh0p+WQWIeFk3qCnpFshzQB55BFEYZOsxcp6T0QhcHOCMDTEQ9MKzCYMSQBwO1oFZRXBmEoWVnT6rnZ KynukuyI c05gIacyXlrFL199aEMlt4N9G/A0OVNUF1wPsS7g46R+aLq4DPfCApetKC5ubZuB90lX0WoPltYXJqA+hFJNkA3lz0+OEsSXxj6XMaAQ42tx4/I7kYwkhrThhbRzA78rj0zq8bEgnKfbcyfUc1EmCES+eDOI2tgtyNVggoV4SIELgcSQuZfoFNtrznDXV0WCMsUxBFP8zw3bSxgFLGbQFox/lQPAyH2zY9CUuhFU5piE4LEJnkUzC8vJoEXMsb5vYK0+8MBgHoCw2DPzdF7ci13Ou607dftBcXwDi0VCpTwNiH6vWyL8G3k1yy3N7pZfXlmWEMqqQ0I/bqh2wz2AKT4clKVanSIAHh3OsWu8Du/S8Wq51yJt9LeMyzClBWyKsMKIa6X0I+JhuvO9pvGyCQXU5qdka6ckac3GCbJIUt0ew3G9NNeUcmeaTzpR4bdo2OCZFBsTQw0J5yGM5moivy9BGSBl+6l52UNcwIZDP0Ot6gByRkfuc9eVboqexWH3dRMNC X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Make the BVEC-testing functions use the consolidated pattern checking functions to reduce the amount of duplicated code. Signed-off-by: David Howells cc: Christoph Hellwig cc: Christian Brauner cc: Jens Axboe cc: Al Viro cc: David Hildenbrand cc: John Hubbard cc: Brendan Higgins cc: David Gow cc: linux-kselftest@vger.kernel.org cc: kunit-dev@googlegroups.com cc: linux-mm@kvack.org cc: linux-fsdevel@vger.kernel.org --- lib/kunit_iov_iter.c | 42 +++++++++++------------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/lib/kunit_iov_iter.c b/lib/kunit_iov_iter.c index 4925ca37cde6..eb86371b67d0 100644 --- a/lib/kunit_iov_iter.c +++ b/lib/kunit_iov_iter.c @@ -107,9 +107,11 @@ static void iov_kunit_build_to_reference_pattern(struct kunit *test, u8 *scratch int i, patt = 0; memset(scratch, 0, bufsize); - for (; pr->page >= 0; pr++) + for (; pr->page >= 0; pr++) { + u8 *p = scratch + pr->page * PAGE_SIZE; for (i = pr->from; i < pr->to; i++) - scratch[i] = pattern(patt++); + p[i] = pattern(patt++); + } } /* @@ -124,8 +126,10 @@ static void iov_kunit_build_from_reference_pattern(struct kunit *test, u8 *buffe memset(buffer, 0, bufsize); for (; pr->page >= 0; pr++) { + size_t patt = pr->page * PAGE_SIZE; + for (j = pr->from; j < pr->to; j++) { - buffer[i++] = pattern(j); + buffer[i++] = pattern(patt + j); if (i >= bufsize) return; } @@ -287,13 +291,12 @@ static void __init iov_kunit_load_bvec(struct kunit *test, */ static void __init iov_kunit_copy_to_bvec(struct kunit *test) { - const struct iov_kunit_range *pr; struct iov_iter iter; struct bio_vec bvec[8]; struct page **spages, **bpages; u8 *scratch, *buffer; size_t bufsize, npages, size, copied; - int i, patt; + int i; bufsize = 0x100000; npages = bufsize / PAGE_SIZE; @@ -315,16 +318,7 @@ static void __init iov_kunit_copy_to_bvec(struct kunit *test) KUNIT_EXPECT_EQ(test, iter.count, 0); KUNIT_EXPECT_EQ(test, iter.nr_segs, 0); - /* Build the expected image in the scratch buffer. */ - patt = 0; - memset(scratch, 0, bufsize); - for (pr = bvec_test_ranges; pr->page >= 0; pr++) { - u8 *p = scratch + pr->page * PAGE_SIZE; - - for (i = pr->from; i < pr->to; i++) - p[i] = pattern(patt++); - } - + iov_kunit_build_to_reference_pattern(test, scratch, bufsize, bvec_test_ranges); iov_kunit_check_pattern(test, buffer, scratch, bufsize); KUNIT_SUCCEED(); } @@ -334,13 +328,12 @@ static void __init iov_kunit_copy_to_bvec(struct kunit *test) */ static void __init iov_kunit_copy_from_bvec(struct kunit *test) { - const struct iov_kunit_range *pr; struct iov_iter iter; struct bio_vec bvec[8]; struct page **spages, **bpages; u8 *scratch, *buffer; size_t bufsize, npages, size, copied; - int i, j; + int i; bufsize = 0x100000; npages = bufsize / PAGE_SIZE; @@ -362,20 +355,7 @@ static void __init iov_kunit_copy_from_bvec(struct kunit *test) KUNIT_EXPECT_EQ(test, iter.count, 0); KUNIT_EXPECT_EQ(test, iter.nr_segs, 0); - /* Build the expected image in the main buffer. */ - i = 0; - memset(buffer, 0, bufsize); - for (pr = bvec_test_ranges; pr->page >= 0; pr++) { - size_t patt = pr->page * PAGE_SIZE; - - for (j = pr->from; j < pr->to; j++) { - buffer[i++] = pattern(patt + j); - if (i >= bufsize) - goto stop; - } - } -stop: - + iov_kunit_build_from_reference_pattern(test, buffer, bufsize, bvec_test_ranges); iov_kunit_check_pattern(test, buffer, scratch, bufsize); KUNIT_SUCCEED(); }