From patchwork Thu Nov 9 15:11:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 13451197 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CA73BC4332F for ; Thu, 9 Nov 2023 15:11:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: Mime-Version:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=24dhMVObA32VcQhAH8IMAz5hZiU8HYCW/lfX6MFyS6M=; b=JGt wz+Z4xcNx4Baod6ugvnSBrXN4PsQJOozDe0WHBbF0gwCObIJqzuCnvNxCmODoCjBjBLATE+nQxHp+ JlN8zQ40hQ0G17Nobu13RuCaNM7QC1qJvDwL97YPcffyvfbaz8eXj54XT0P7K5L5mD+KVtsvyyE0S m5yAlEdEayncVAhcJhL5MJb3irtoD3qONeySQVRjfHIAQsYWBGepEMBJt5wVvENNr4FjtsdLPbzPU 8KNyVbPCf5qEkVz7cXScISXn6CAIOoI14ndu+55oIFgaxaGfUcUrG9cuh9+tx8C94OgEcXpr/y/iO cE0hUu0qF06xoPw6R4JMeCiSGO/uWew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r16gj-006YM3-10; Thu, 09 Nov 2023 15:11:21 +0000 Received: from mail-ej1-x649.google.com ([2a00:1450:4864:20::649]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r16gf-006YKw-2L for linux-arm-kernel@lists.infradead.org; Thu, 09 Nov 2023 15:11:19 +0000 Received: by mail-ej1-x649.google.com with SMTP id a640c23a62f3a-9d2606301eeso123587566b.0 for ; Thu, 09 Nov 2023 07:11:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699542674; x=1700147474; darn=lists.infradead.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=ep1qJd3r3CicksEB8/VS0CthWKnz6BMcAhHrRuSJk70=; b=KL0N62knyh5ufuRsODgWFGCnDDLGyRwNgVUPDoY868BCjHK3GtEGYgq0JI/9PRVDJa esQBsglLJTU7bLgAgOk04P60eHwy5194ZGtiDIIE+rZ5xxCbQku04N2bYTW1v5xXO95Y 9TqqvTVHpofinjiWUzcQmtM1FgBTsE8sNTsBCHG/cdhbInu3Z4/SX9dTXOma7DWjnU5M mmKQ1yKokh8dwUQpNyCM7edVkVj7H/bdEyYACygP+1w8hD+sgpRmUSalRnLRc0LBpfK8 dyiKGDYYjkNqwpDJTkdzDO+TZahZ7yv53G2TXcpfRhggfVfKPcB9xWjVcR+kpXDv/ZZn bIOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699542674; x=1700147474; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ep1qJd3r3CicksEB8/VS0CthWKnz6BMcAhHrRuSJk70=; b=MQ4/WtL7OEN0tgQcirJwHV1CJwc5POwGirL4ZAhJe9ZQZ1nX19AjRESmyW6yPjyJVt DcUAEh868CmvcnzgKqQomNE14oy0JqUrIjoc3aK117welVNwbozTwm2X9JnOgOruRGmF ysB0l46eiuc7QEamUVSVQNF3eHwmSeunCuWrtiW2cM9jXbhxy9shLYv9MopYid2ZK8ww jTJPLj7otGDu9CnlVeYbvdlI1Jjgo9MMQMxTc5hfulHz4lXHKl8rab600FGr6NwXI4Vm 1W8sQC2PlJFxtoa2Muf7FhI1Xjx/l1lDTI71XlLPIfq1gBWuUxw9xDBdcHe6p9Ps0uT3 n/mw== X-Gm-Message-State: AOJu0Yx/opO5Ks79H43YSDH345pknPrv+27HmNXSBNNtPckJXGw+O+uJ TUUe1SYP6BmHv0VtEXUMU78i6zU7FdE= X-Google-Smtp-Source: AGHT+IEiflMT9gNcyi8oG+hBojxdMUjX7PqQ5j936LfU7yCowVQPVRqjTxMkAe/yIXx6Gw+1KQwBGJrtslY= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:c5e3:4628:e996:9f03]) (user=glider job=sendgmr) by 2002:a17:907:b90:b0:9dd:9808:bed1 with SMTP id ey16-20020a1709070b9000b009dd9808bed1mr91850ejc.7.1699542674589; Thu, 09 Nov 2023 07:11:14 -0800 (PST) Date: Thu, 9 Nov 2023 16:11:04 +0100 Mime-Version: 1.0 X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog Message-ID: <20231109151106.2385155-1-glider@google.com> Subject: [PATCH v12 1/3] lib/bitmap: add bitmap_{read,write}() From: Alexander Potapenko To: glider@google.com, catalin.marinas@arm.com, will@kernel.org, pcc@google.com, andreyknvl@gmail.com, andriy.shevchenko@linux.intel.com, aleksander.lobakin@intel.com, linux@rasmusvillemoes.dk, yury.norov@gmail.com, alexandru.elisei@arm.com Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, eugenis@google.com, syednwaris@gmail.com, william.gray@linaro.org, Arnd Bergmann X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231109_071117_768778_13DAD5F5 X-CRM114-Status: GOOD ( 19.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Syed Nayyar Waris The two new functions allow reading/writing values of length up to BITS_PER_LONG bits at arbitrary position in the bitmap. The code was taken from "bitops: Introduce the for_each_set_clump macro" by Syed Nayyar Waris with a number of changes and simplifications: - instead of using roundup(), which adds an unnecessary dependency on , we calculate space as BITS_PER_LONG-offset; - indentation is reduced by not using else-clauses (suggested by checkpatch for bitmap_get_value()); - bitmap_get_value()/bitmap_set_value() are renamed to bitmap_read() and bitmap_write(); - some redundant computations are omitted. Cc: Arnd Bergmann Signed-off-by: Syed Nayyar Waris Signed-off-by: William Breathitt Gray Link: https://lore.kernel.org/lkml/fe12eedf3666f4af5138de0e70b67a07c7f40338.1592224129.git.syednwaris@gmail.com/ Suggested-by: Yury Norov Co-developed-by: Alexander Potapenko Signed-off-by: Alexander Potapenko Reviewed-by: Andy Shevchenko --- This patch was previously part of the "Implement MTE tag compression for swapped pages" series (https://lore.kernel.org/linux-arm-kernel/20231011172836.2579017-4-glider@google.com/T/) This patch was previously called "lib/bitmap: add bitmap_{set,get}_value()" (https://lore.kernel.org/lkml/20230720173956.3674987-2-glider@google.com/) v11: - rearrange whitespace as requested by Andy Shevchenko, add Reviewed-by:, update a comment v10: - update comments as requested by Andy Shevchenko v8: - as suggested by Andy Shevchenko, handle reads/writes of more than BITS_PER_LONG bits, add a note for 32-bit systems v7: - Address comments by Yury Norov, Andy Shevchenko, Rasmus Villemoes: - update code comments; - get rid of GENMASK(); - s/assign_bit/__assign_bit; - more vertical whitespace for better readability; - more compact code for bitmap_write() (now for real) v6: - As suggested by Yury Norov, do not require bitmap_read(..., 0) to return 0. v5: - Address comments by Yury Norov: - updated code comments and patch title/description - replace GENMASK(nbits - 1, 0) with BITMAP_LAST_WORD_MASK(nbits) - more compact bitmap_write() implementation v4: - Address comments by Andy Shevchenko and Yury Norov: - prevent passing values >= 64 to GENMASK() - fix commit authorship - change comments - check for unlikely(nbits==0) - drop unnecessary const declarations - fix kernel-doc comments - rename bitmap_{get,set}_value() to bitmap_{read,write}() --- include/linux/bitmap.h | 77 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index 03644237e1efb..7dd00e2e6d539 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h @@ -77,6 +77,10 @@ struct device; * bitmap_to_arr64(buf, src, nbits) Copy nbits from buf to u64[] dst * bitmap_get_value8(map, start) Get 8bit value from map at start * bitmap_set_value8(map, value, start) Set 8bit value to map at start + * bitmap_read(map, start, nbits) Read an nbits-sized value from + * map at start + * bitmap_write(map, value, start, nbits) Write an nbits-sized value to + * map at start * * Note, bitmap_zero() and bitmap_fill() operate over the region of * unsigned longs, that is, bits behind bitmap till the unsigned long @@ -599,6 +603,79 @@ static inline void bitmap_set_value8(unsigned long *map, unsigned long value, map[index] |= value << offset; } +/** + * bitmap_read - read a value of n-bits from the memory region + * @map: address to the bitmap memory region + * @start: bit offset of the n-bit value + * @nbits: size of value in bits, nonzero, up to BITS_PER_LONG + * + * Returns: value of @nbits bits located at the @start bit offset within the + * @map memory region. For @nbits = 0 and @nbits > BITS_PER_LONG the return + * value is undefined. + */ +static inline unsigned long bitmap_read(const unsigned long *map, + unsigned long start, + unsigned long nbits) +{ + size_t index = BIT_WORD(start); + unsigned long offset = start % BITS_PER_LONG; + unsigned long space = BITS_PER_LONG - offset; + unsigned long value_low, value_high; + + if (unlikely(!nbits || nbits > BITS_PER_LONG)) + return 0; + + if (space >= nbits) + return (map[index] >> offset) & BITMAP_LAST_WORD_MASK(nbits); + + value_low = map[index] & BITMAP_FIRST_WORD_MASK(start); + value_high = map[index + 1] & BITMAP_LAST_WORD_MASK(start + nbits); + return (value_low >> offset) | (value_high << space); +} + +/** + * bitmap_write - write n-bit value within a memory region + * @map: address to the bitmap memory region + * @value: value to write, clamped to nbits + * @start: bit offset of the n-bit value + * @nbits: size of value in bits, nonzero, up to BITS_PER_LONG. + * + * bitmap_write() behaves as-if implemented as @nbits calls of __assign_bit(), + * i.e. bits beyond @nbits are ignored: + * + * for (bit = 0; bit < nbits; bit++) + * __assign_bit(start + bit, bitmap, val & BIT(bit)); + * + * For @nbits == 0 and @nbits > BITS_PER_LONG no writes are performed. + */ +static inline void bitmap_write(unsigned long *map, unsigned long value, + unsigned long start, unsigned long nbits) +{ + size_t index; + unsigned long offset; + unsigned long space; + unsigned long mask; + bool fit; + + if (unlikely(!nbits || nbits > BITS_PER_LONG)) + return; + + mask = BITMAP_LAST_WORD_MASK(nbits); + value &= mask; + offset = start % BITS_PER_LONG; + space = BITS_PER_LONG - offset; + fit = space >= nbits; + index = BIT_WORD(start); + + map[index] &= (fit ? (~(mask << offset)) : ~BITMAP_FIRST_WORD_MASK(start)); + map[index] |= value << offset; + if (fit) + return; + + map[index + 1] &= BITMAP_FIRST_WORD_MASK(start + nbits); + map[index + 1] |= (value >> space); +} + #endif /* __ASSEMBLY__ */ #endif /* __LINUX_BITMAP_H */ From patchwork Thu Nov 9 15:11:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 13451199 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 21DB9C4167B for ; Thu, 9 Nov 2023 15:11:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=bNzb0yZIVjrvbM7BLKPHqBlhvKp/IuVsDoVesvATnoQ=; b=UReWqcjheVs8jW9jTKVvjY28xC RnPJRuW9qXn+SHwVjxTjgzVqneg4guEN4PdIOiWkxnxIMfkLSlg7Fae0zgoR8k3Zz4vwKFksKGg8h Y0niYm27gRmMLIXN1ArIwso/BZxeM1VExrfKxHqykwZ0gHC+lGDtRM2jqwydOhNKfEx0oa/crwBGw W+xD9ytcNHMDYk2OjN3zVynIxAXqSzjGLM7HpfYryXe+THEShjwB1wHCYlijimZ94sO/kxswieoda X+ws3ZOraNA/NfEaQxcNZi3g8rhBFJ0Reyj5akv9F24nQkMeI/7UEbDhcF7h9QXuGtb/cuwNrb6Qp lgz+rY9w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r16gp-006YNp-1r; Thu, 09 Nov 2023 15:11:27 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r16gl-006YLa-2E for linux-arm-kernel@lists.infradead.org; Thu, 09 Nov 2023 15:11:25 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d9ab79816a9so1195335276.3 for ; Thu, 09 Nov 2023 07:11:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699542678; x=1700147478; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=rYtwHw5KxPlHY+qTyolEKNpKCDTbmBEbL/z50TnWG7A=; b=BRHamm64JNjlVIqsyPkkdUYu/K5z0Hr4ZZ0nUEJns3UuCOpxqKw235TUbMOFhmOHGu 5Bq8KB35LC/3WT3OqPPP4tup3IedR0f1DB/OWLhVsjzaMuhvwhCDrkFGjEpJq6m1uQlh oVeDbGPt/h8YG+jfFBMehFCdmdBrMn/besrUyVmugX9WRIOCHBun1gjNMVWhpb6s1k9x dljt8NJP/fXdO9BtFY7fVF8VEilNEGPu5T8BCbHmKUqdyd1g2aREy8RZev2RFgg4p0st pJ9CcMWb2e5wxQA6QoBvIHXHycNcBmFCTVHNzTdMcgTwn9++GHmAeHBns6ANdLKIjaie NeKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699542678; x=1700147478; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rYtwHw5KxPlHY+qTyolEKNpKCDTbmBEbL/z50TnWG7A=; b=pfXWYeu8tJBygP46lSNOzVqkUA9o8OrDRgKDaUYe/Saqg3HgbwVyl1Unfba04eKSoD X6u/gSDraeds84nJkk7QUdvvYCW91fFYaF+zTpSz9qM3AYqMRtHdcmWW3E2bky2KQjH1 Nlx20hAkMtdVFNYWSl/QC1FnwuWWIJMmKw39JlqVZdVpUPi98UChtnJjbUvKFuAIOs0G +8pLEpKDfbbeix/NeCudRUvpB28gCGwTsg+J5t6ZerznkpFM4tnR5exZggT0aMD+ESj5 5ATUHid1MeGZI3HCzSd03hWH1LvUZGVsfQmeUTVTphjbT98xqwBKGYZURqG09rqc91WC mKsA== X-Gm-Message-State: AOJu0YxOXowY2bdsSWAVunYV2lF5+NCy6VNbs6/DrsOVEfBwX5k+xERp wg3jy2rIKlLzS2LQKRyUl1G7+/VITLA= X-Google-Smtp-Source: AGHT+IG43y2awN0GsJPKqKokTF5OcZyfzFY0gCbKv0bj0cfhgD6tJdIp6TmUnzTsHNckbq2mwcfrpb4gMYk= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:c5e3:4628:e996:9f03]) (user=glider job=sendgmr) by 2002:a05:6902:91:b0:dae:baac:55f0 with SMTP id h17-20020a056902009100b00daebaac55f0mr129667ybs.5.1699542678046; Thu, 09 Nov 2023 07:11:18 -0800 (PST) Date: Thu, 9 Nov 2023 16:11:05 +0100 In-Reply-To: <20231109151106.2385155-1-glider@google.com> Mime-Version: 1.0 References: <20231109151106.2385155-1-glider@google.com> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog Message-ID: <20231109151106.2385155-2-glider@google.com> Subject: [PATCH v12 2/3] lib/test_bitmap: add tests for bitmap_{read,write}() From: Alexander Potapenko To: glider@google.com, catalin.marinas@arm.com, will@kernel.org, pcc@google.com, andreyknvl@gmail.com, andriy.shevchenko@linux.intel.com, aleksander.lobakin@intel.com, linux@rasmusvillemoes.dk, yury.norov@gmail.com, alexandru.elisei@arm.com Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, eugenis@google.com, syednwaris@gmail.com, william.gray@linaro.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231109_071123_731974_C4091A6B X-CRM114-Status: GOOD ( 24.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add basic tests ensuring that values can be added at arbitrary positions of the bitmap, including those spanning into the adjacent unsigned longs. Two new performance tests, test_bitmap_read_perf() and test_bitmap_write_perf(), can be used to assess future performance improvements of bitmap_read() and bitmap_write(): [ 0.431119][ T1] test_bitmap: Time spent in test_bitmap_read_perf: 615253 [ 0.433197][ T1] test_bitmap: Time spent in test_bitmap_write_perf: 916313 (numbers from a Intel(R) Xeon(R) Gold 6154 CPU @ 3.00GHz machine running QEMU). Signed-off-by: Alexander Potapenko Reviewed-by: Andy Shevchenko --- This patch was previously part of the "Implement MTE tag compression for swapped pages" series (https://lore.kernel.org/linux-arm-kernel/20231011172836.2579017-4-glider@google.com/T/) This patch was previously called "lib/test_bitmap: add tests for bitmap_{set,get}_value()" (https://lore.kernel.org/lkml/20230720173956.3674987-3-glider@google.com/) and "lib/test_bitmap: add tests for bitmap_{set,get}_value_unaligned" (https://lore.kernel.org/lkml/20230713125706.2884502-3-glider@google.com/) v12: - as suggested by Alexander Lobakin, replace expect_eq_uint() with expect_eq_ulong() and a cast v9: - use WRITE_ONCE() to prevent optimizations in test_bitmap_read_perf() - update patch description v8: - as requested by Andy Shevchenko, add tests for reading/writing sizes > BITS_PER_LONG v7: - as requested by Yury Norov, add performance tests for bitmap_read() and bitmap_write() v6: - use bitmap API to initialize test bitmaps - as requested by Yury Norov, do not check the return value of bitmap_read(..., 0) - fix a compiler warning on 32-bit systems v5: - update patch title - address Yury Norov's comments: - rename the test cases - factor out test_bitmap_write_helper() to test writing over different background patterns; - add a test case copying a nontrivial value bit-by-bit; - drop volatile v4: - Address comments by Andy Shevchenko: added Reviewed-by: and a link to the previous discussion - Address comments by Yury Norov: - expand the bitmap to catch more corner cases - add code testing that bitmap_set_value() does not touch adjacent bits - add code testing the nbits==0 case - rename bitmap_{get,set}_value() to bitmap_{read,write}() v3: - switch to using bitmap_{set,get}_value() - change the expected bit pattern in test_set_get_value(), as the test was incorrectly assuming 0 is the LSB. --- lib/test_bitmap.c | 179 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 172 insertions(+), 7 deletions(-) diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c index f2ea9f30c7c5d..2761edbc83d73 100644 --- a/lib/test_bitmap.c +++ b/lib/test_bitmap.c @@ -60,18 +60,17 @@ static const unsigned long exp3_1_0[] __initconst = { }; static bool __init -__check_eq_uint(const char *srcfile, unsigned int line, - const unsigned int exp_uint, unsigned int x) +__check_eq_ulong(const char *srcfile, unsigned int line, + const unsigned long exp_ulong, unsigned long x) { - if (exp_uint != x) { - pr_err("[%s:%u] expected %u, got %u\n", - srcfile, line, exp_uint, x); + if (exp_ulong != x) { + pr_err("[%s:%u] expected %lu, got %lu\n", + srcfile, line, exp_ulong, x); return false; } return true; } - static bool __init __check_eq_bitmap(const char *srcfile, unsigned int line, const unsigned long *exp_bmap, const unsigned long *bmap, @@ -185,7 +184,8 @@ __check_eq_str(const char *srcfile, unsigned int line, result; \ }) -#define expect_eq_uint(...) __expect_eq(uint, ##__VA_ARGS__) +#define expect_eq_ulong(...) __expect_eq(ulong, ##__VA_ARGS__) +#define expect_eq_uint(x, y) expect_eq_ulong((unsigned int)(x), (unsigned int)(y)) #define expect_eq_bitmap(...) __expect_eq(bitmap, ##__VA_ARGS__) #define expect_eq_pbl(...) __expect_eq(pbl, ##__VA_ARGS__) #define expect_eq_u32_array(...) __expect_eq(u32_array, ##__VA_ARGS__) @@ -1222,6 +1222,168 @@ static void __init test_bitmap_const_eval(void) BUILD_BUG_ON(~var != ~BIT(25)); } +/* + * Test bitmap should be big enough to include the cases when start is not in + * the first word, and start+nbits lands in the following word. + */ +#define TEST_BIT_LEN (1000) + +/* + * Helper function to test bitmap_write() overwriting the chosen byte pattern. + */ +static void __init test_bitmap_write_helper(const char *pattern) +{ + DECLARE_BITMAP(bitmap, TEST_BIT_LEN); + DECLARE_BITMAP(exp_bitmap, TEST_BIT_LEN); + DECLARE_BITMAP(pat_bitmap, TEST_BIT_LEN); + unsigned long w, r, bit; + int i, n, nbits; + + /* + * Only parse the pattern once and store the result in the intermediate + * bitmap. + */ + bitmap_parselist(pattern, pat_bitmap, TEST_BIT_LEN); + + /* + * Check that writing a single bit does not accidentally touch the + * adjacent bits. + */ + for (i = 0; i < TEST_BIT_LEN; i++) { + bitmap_copy(bitmap, pat_bitmap, TEST_BIT_LEN); + bitmap_copy(exp_bitmap, pat_bitmap, TEST_BIT_LEN); + for (bit = 0; bit <= 1; bit++) { + bitmap_write(bitmap, bit, i, 1); + __assign_bit(i, exp_bitmap, bit); + expect_eq_bitmap(exp_bitmap, bitmap, + TEST_BIT_LEN); + } + } + + /* Ensure writing 0 bits does not change anything. */ + bitmap_copy(bitmap, pat_bitmap, TEST_BIT_LEN); + bitmap_copy(exp_bitmap, pat_bitmap, TEST_BIT_LEN); + for (i = 0; i < TEST_BIT_LEN; i++) { + bitmap_write(bitmap, ~0UL, i, 0); + expect_eq_bitmap(exp_bitmap, bitmap, TEST_BIT_LEN); + } + + for (nbits = BITS_PER_LONG; nbits >= 1; nbits--) { + w = IS_ENABLED(CONFIG_64BIT) ? 0xdeadbeefdeadbeefUL + : 0xdeadbeefUL; + w >>= (BITS_PER_LONG - nbits); + for (i = 0; i <= TEST_BIT_LEN - nbits; i++) { + bitmap_copy(bitmap, pat_bitmap, TEST_BIT_LEN); + bitmap_copy(exp_bitmap, pat_bitmap, TEST_BIT_LEN); + for (n = 0; n < nbits; n++) + __assign_bit(i + n, exp_bitmap, w & BIT(n)); + bitmap_write(bitmap, w, i, nbits); + expect_eq_bitmap(exp_bitmap, bitmap, TEST_BIT_LEN); + r = bitmap_read(bitmap, i, nbits); + expect_eq_ulong(r, w); + } + } +} + +static void __init test_bitmap_read_write(void) +{ + unsigned char *pattern[3] = {"", "all:1/2", "all"}; + DECLARE_BITMAP(bitmap, TEST_BIT_LEN); + unsigned long zero_bits = 0, bits_per_long = BITS_PER_LONG; + unsigned long val; + int i, pi; + + /* + * Reading/writing zero bits should not crash the kernel. + * READ_ONCE() prevents constant folding. + */ + bitmap_write(NULL, 0, 0, READ_ONCE(zero_bits)); + /* Return value of bitmap_read() is undefined here. */ + bitmap_read(NULL, 0, READ_ONCE(zero_bits)); + + /* + * Reading/writing more than BITS_PER_LONG bits should not crash the + * kernel. READ_ONCE() prevents constant folding. + */ + bitmap_write(NULL, 0, 0, READ_ONCE(bits_per_long) + 1); + /* Return value of bitmap_read() is undefined here. */ + bitmap_read(NULL, 0, READ_ONCE(bits_per_long) + 1); + + /* + * Ensure that bitmap_read() reads the same value that was previously + * written, and two consequent values are correctly merged. + * The resulting bit pattern is asymmetric to rule out possible issues + * with bit numeration order. + */ + for (i = 0; i < TEST_BIT_LEN - 7; i++) { + bitmap_zero(bitmap, TEST_BIT_LEN); + + bitmap_write(bitmap, 0b10101UL, i, 5); + val = bitmap_read(bitmap, i, 5); + expect_eq_ulong(0b10101UL, val); + + bitmap_write(bitmap, 0b101UL, i + 5, 3); + val = bitmap_read(bitmap, i + 5, 3); + expect_eq_ulong(0b101UL, val); + + val = bitmap_read(bitmap, i, 8); + expect_eq_ulong(0b10110101UL, val); + } + + for (pi = 0; pi < ARRAY_SIZE(pattern); pi++) + test_bitmap_write_helper(pattern[pi]); +} + +static void __init test_bitmap_read_perf(void) +{ + DECLARE_BITMAP(bitmap, TEST_BIT_LEN); + unsigned int cnt, nbits, i; + unsigned long val; + ktime_t time; + + bitmap_fill(bitmap, TEST_BIT_LEN); + time = ktime_get(); + for (cnt = 0; cnt < 5; cnt++) { + for (nbits = 1; nbits <= BITS_PER_LONG; nbits++) { + for (i = 0; i < TEST_BIT_LEN; i++) { + if (i + nbits > TEST_BIT_LEN) + break; + /* + * Prevent the compiler from optimizing away the + * bitmap_read() by using its value. + */ + WRITE_ONCE(val, bitmap_read(bitmap, i, nbits)); + } + } + } + time = ktime_get() - time; + pr_err("Time spent in %s:\t%llu\n", __func__, time); +} + +static void __init test_bitmap_write_perf(void) +{ + DECLARE_BITMAP(bitmap, TEST_BIT_LEN); + unsigned int cnt, nbits, i; + unsigned long val = 0xfeedface; + ktime_t time; + + bitmap_zero(bitmap, TEST_BIT_LEN); + time = ktime_get(); + for (cnt = 0; cnt < 5; cnt++) { + for (nbits = 1; nbits <= BITS_PER_LONG; nbits++) { + for (i = 0; i < TEST_BIT_LEN; i++) { + if (i + nbits > TEST_BIT_LEN) + break; + bitmap_write(bitmap, val, i, nbits); + } + } + } + time = ktime_get() - time; + pr_err("Time spent in %s:\t%llu\n", __func__, time); +} + +#undef TEST_BIT_LEN + static void __init selftest(void) { test_zero_clear(); @@ -1237,6 +1399,9 @@ static void __init selftest(void) test_bitmap_cut(); test_bitmap_print_buf(); test_bitmap_const_eval(); + test_bitmap_read_write(); + test_bitmap_read_perf(); + test_bitmap_write_perf(); test_find_nth_bit(); test_for_each_set_bit(); From patchwork Thu Nov 9 15:11:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 13451198 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1A10AC4332F for ; Thu, 9 Nov 2023 15:11:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=H0j1hw/31Fek1JM6lwEkp9LFk7EvXemgcN8gyWfRdOQ=; b=AjVFZxedD/IwTiYAzWy6dTpEhV f6C95/RTLrEbgrtlU+Mz3BXV9F23/KcHfa1lS8VAe8DDlfZh8x1J0+Lm4lOweHB3UaRyx99s07h+W 2bRWloZj18qd+2dd6h4GMijaDGaTY0g2hMQHAjfCzJahsW4h3NXAwGyOPx0WHZHaifVKZQoHANKgI d9PDAacmAy6XjhhPTKvffe4At3zdJaQvtsvJ7DCSvK2teZ0G7liCjydGVoFOnVHUN7UPyi9vm73eT 0+DfiTdWqCCdo8WjdAOWfa/M3tKgh19ghimffIsMbYwvpxz+I7Nmh2KZLEyUWBx2ewYW7iOC5knwk Bvl8fm8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r16gp-006YNS-03; Thu, 09 Nov 2023 15:11:27 +0000 Received: from mail-wm1-x34a.google.com ([2a00:1450:4864:20::34a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r16gm-006YMB-1G for linux-arm-kernel@lists.infradead.org; Thu, 09 Nov 2023 15:11:25 +0000 Received: by mail-wm1-x34a.google.com with SMTP id 5b1f17b1804b1-4083a670d25so6436625e9.0 for ; Thu, 09 Nov 2023 07:11:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699542681; x=1700147481; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=8pQ0K76qmBVGT/CgHVEv31iCSF419asbcRbCGaHbMy8=; b=v13NSzusmeIA1FffWC1AbNWllfQsM2QUiM7H6RX4F8YNpEcnNlkupBlwnw5pdFkBzB z9h0SSfZp0vD13YN9EpsyHStI+HRc3mQolsgYoieaEOondFcGdVZ4CUsKCQv2r/gUVBq agkfGMuFf9+zZr53S6rHxp1bpylhdQF0FGNB8kWSwtwSoRKu2+FKjP1DX+M7gswb4w8m G+VIIcwgJoyLxTgtcpXXjFlRx7LUa5inUEN+Wjct4R71x+awYS9Tx5zgljwzVJyaAekE gaP+2Q+qIlqrn8ibD46a3FJWEaDMBg8lN/QhTvDcfmZGiAudslkcuElM/6deqJ6r9Hzc nywg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699542681; x=1700147481; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8pQ0K76qmBVGT/CgHVEv31iCSF419asbcRbCGaHbMy8=; b=oqwza6F8gxq/NcEwgvDRIWF66aziGOW14ZBlsQdIuxddw7UsOyg51Z9gW+fTqAmghC CtviET+ueI5gCtkOgl3Niwy/yQlPfM7IDozbNEdIdAAZurhF/Jgba5hJOC2VT7GAJ+SV WuWRZn22kk3zw0EvBICq4kEpnX9u53yBcfL2JFx86ghxvRrL57Z5GxWRi+pKo4IX+P7C j2rg1B30SzunaPgjml0lJANAQ3uP4M0pzMxLD+mKtIVIfPMOZJWvRjzLRYODGLkUZN0k unmEwuwow0LYPMrzOPefyca7AMw/pHiMlGo+P9sYxCZGr8KRNbo2JUKWJgbp3zQeSmp8 9SgA== X-Gm-Message-State: AOJu0Ywrdrrcwd7HxjmXL7lhqYCo+iITFoRw48dNbiy1fNejBolQeR23 8r5Nfa/dD1/CVZK5ILRkc0FjtfO2Swg= X-Google-Smtp-Source: AGHT+IE8K3FQIBkboGewhZkWrxz8SIQsGOaosh3E49HNMM/NkSBEmWFer7MvcowtiXDigjNNU8T+eElQX2s= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:c5e3:4628:e996:9f03]) (user=glider job=sendgmr) by 2002:a5d:6990:0:b0:32f:7cfa:a4e5 with SMTP id g16-20020a5d6990000000b0032f7cfaa4e5mr83401wru.3.1699542681487; Thu, 09 Nov 2023 07:11:21 -0800 (PST) Date: Thu, 9 Nov 2023 16:11:06 +0100 In-Reply-To: <20231109151106.2385155-1-glider@google.com> Mime-Version: 1.0 References: <20231109151106.2385155-1-glider@google.com> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog Message-ID: <20231109151106.2385155-3-glider@google.com> Subject: [PATCH v12 3/3] lib/test_bitmap: use pr_info() for non-error messages From: Alexander Potapenko To: glider@google.com, catalin.marinas@arm.com, will@kernel.org, pcc@google.com, andreyknvl@gmail.com, andriy.shevchenko@linux.intel.com, aleksander.lobakin@intel.com, linux@rasmusvillemoes.dk, yury.norov@gmail.com, alexandru.elisei@arm.com Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, eugenis@google.com, syednwaris@gmail.com, william.gray@linaro.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231109_071124_426943_7727E017 X-CRM114-Status: GOOD ( 11.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org pr_err() messages may be treated as errors by some log readers, so let us only use them for test failures. For non-error messages, replace them with pr_info(). Suggested-by: Alexander Lobakin Signed-off-by: Alexander Potapenko --- lib/test_bitmap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c index 2761edbc83d73..8a8af5d28432e 100644 --- a/lib/test_bitmap.c +++ b/lib/test_bitmap.c @@ -484,7 +484,7 @@ static void __init test_bitmap_parselist(void) } if (ptest.flags & PARSE_TIME) - pr_err("parselist: %d: input is '%s' OK, Time: %llu\n", + pr_info("parselist: %d: input is '%s' OK, Time: %llu\n", i, ptest.in, time); #undef ptest @@ -523,7 +523,7 @@ static void __init test_bitmap_printlist(void) goto out; } - pr_err("bitmap_print_to_pagebuf: input is '%s', Time: %llu\n", buf, time); + pr_info("bitmap_print_to_pagebuf: input is '%s', Time: %llu\n", buf, time); out: kfree(buf); kfree(bmap); @@ -601,7 +601,7 @@ static void __init test_bitmap_parse(void) } if (test.flags & PARSE_TIME) - pr_err("parse: %d: input is '%s' OK, Time: %llu\n", + pr_info("parse: %d: input is '%s' OK, Time: %llu\n", i, test.in, time); } } @@ -1357,7 +1357,7 @@ static void __init test_bitmap_read_perf(void) } } time = ktime_get() - time; - pr_err("Time spent in %s:\t%llu\n", __func__, time); + pr_info("Time spent in %s:\t%llu\n", __func__, time); } static void __init test_bitmap_write_perf(void) @@ -1379,7 +1379,7 @@ static void __init test_bitmap_write_perf(void) } } time = ktime_get() - time; - pr_err("Time spent in %s:\t%llu\n", __func__, time); + pr_info("Time spent in %s:\t%llu\n", __func__, time); } #undef TEST_BIT_LEN