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: 163413 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp501121vqs; Thu, 9 Nov 2023 07:12:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IHmzZalVCCNIBR0fmePi3BzIVg36nWNAUbpIFmfmIIrd/gXIDoVO5J0aG2qdCxMEUgCecak X-Received: by 2002:a17:902:8488:b0:1cc:4eb0:64cf with SMTP id c8-20020a170902848800b001cc4eb064cfmr4383236plo.52.1699542721844; Thu, 09 Nov 2023 07:12:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699542721; cv=none; d=google.com; s=arc-20160816; b=NZrDEFWn7AHru7BjOlXDJsp2IBq+ggidOXhc2ntLeglfJ3boT36dCetDUCEIIGe7eD cPuSNQ0/laAofgKnB1VyQwfFX8I0igDkO/TFfO3AtxDaTXay7L9zitxQDZTULZKm48um G31zGaGaw282zSJhc7XnoMAiBgLbuij3UjF3h5kl12IJaqvqNluDNnOb0pAx4FSJsucD QTLu9+pKEoTFKzLHsgBnBupSeE+KJrNQuTLnGn/ivJdH4I/nxOUVnJ/mMUB35H7UBB2G D98coFzX9mNOxQbg1CONcGI7kOoy8ohzKJSzbPXxb1vfGESzvUKGbobnOrIrF11f5nt4 fcMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=ep1qJd3r3CicksEB8/VS0CthWKnz6BMcAhHrRuSJk70=; fh=GmoqtqK5o+3hw8duGAYBcfcrbmWz8zn7GJB0HJXGJL0=; b=E5lBpmjftmO6O3CBMcpPPiAf2n+WWPon3fjYy/dnISHaFYVZaV2lX6gbJUzAuPAiKu Hkq77opbT7EIVkKto4A3GILlcyPo6ciLaDHyzDJk8f1UoE1HCRt2WFv8S3EOmQiFyDli a4Zla4sJxxAQ7wAbtLUWIxv0ikCKlldk8pNrFwaNBqiEObbU+IIEdkWwkx0bFzNh5bty DS+5cMAF/njJ8JuEryfgi8MENe1LkZxvu388aANURnh8BLAgLKkCmdqW+M+tU7sxAkTI nXpDVbQyX5XsGZyXiqKCs0YsR3DWXRKinUV5GqsYucVcRCXngQAdItE8z2Rj3KLplp5O o++g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=QJ7XlpWa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id q13-20020a170902f34d00b001c9af5305dasi4700747ple.126.2023.11.09.07.12.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 07:12:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=QJ7XlpWa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 7249D83DB97B; Thu, 9 Nov 2023 07:11:27 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234482AbjKIPLU (ORCPT + 31 others); Thu, 9 Nov 2023 10:11:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234475AbjKIPLS (ORCPT ); Thu, 9 Nov 2023 10:11:18 -0500 Received: from mail-ej1-x649.google.com (mail-ej1-x649.google.com [IPv6:2a00:1450:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 120B035AB for ; Thu, 9 Nov 2023 07:11:16 -0800 (PST) Received: by mail-ej1-x649.google.com with SMTP id a640c23a62f3a-9bea60bd1adso245098066b.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=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=ep1qJd3r3CicksEB8/VS0CthWKnz6BMcAhHrRuSJk70=; b=QJ7XlpWaG7fCDWTud3QVeuIu3vJGVW1L6iIlIggxrlQb1bV4zkN6Z69j2keJiTbiRC kkXnVY1fX1CsAfT8W8WNjzHBEiBRdsSl9A3obcf3nYZ1uXUK+jrFmHfduR43iUIk+7Bo dti9C0tdAfBZGO6NkcS2JxFNHWvnmFAgZquFLVc4j4HpbqviFVW+a9WShGG+Njsx1SZs YmNF8Bfzi5fhCCl2o1hViHIP3lm11P+z/ONr5Eu6F7xxR/S5O8qPcdRbYRdpYZlYTcLd WK/pJJUuu/H1HjG9yGks/wl2Xne3Rf3xhg7ItFAOG3lClOh5hEQ6bbUeZqHr5qQhi/GR VfwQ== 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=bEXQ41Vy2dShDxiGy5FyPjOeJCEMOTyqZVTOBEoBnJ26K7NTXLTSDFKIcDGDOMVvsI 3fHsh9/ozmURp6nnpM27zpWmrojmpgr/E3LAgufoWEWuRqm8VNMpOkSNWB83i/LgDux6 qqkQDGiJj38vgxbKMvPcW6c+gjp3MGHfJgERNvrVkSXOXvBFlLzqaYHft0g70wDFv5OP BRdTbPG3qtLGjaeEHXb+pRZud9eg3bjIEVS4ginuldlM5aBme5uTPsxXHxxGgJwbEnKS tSBbW9SQiLKUIVdb6UEKCZcRlX0LsqqDPrjxOBBdNdPzv6PGbr7XWcnLrxXO5tviURl3 sSQg== X-Gm-Message-State: AOJu0YxlBO9WhVV31hizanCAOsut17K5NT3jdjY+dd6wxfksiT9OPHNW hGQkklDsdqNpl91fZ42wpcMh/yTcc1A= 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 09 Nov 2023 07:11:27 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782099709218247542 X-GMAIL-MSGID: 1782099709218247542 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: 163414 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp501161vqs; Thu, 9 Nov 2023 07:12:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFOsjyTmuGDREcgULvxVrR4lObuTF8mzrliqoKiZv2yhvrWO8WcC+vZc2LJ0j6aOmh91SAA X-Received: by 2002:a17:90a:194a:b0:280:19ba:7816 with SMTP id 10-20020a17090a194a00b0028019ba7816mr1792282pjh.10.1699542724596; Thu, 09 Nov 2023 07:12:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699542724; cv=none; d=google.com; s=arc-20160816; b=Bw1BG1ChJo+cVRpWcrGk3gpxadKOqOlcm1o7HD2zWPxkLQ5TXfHrioFbZ63K7zlqRU mg/ZTVVYlXXYETnU1VfM6gzVpT79C6LLjAy63bi9j0Qyw6mA2oEqNbUXU3ylG9NrH5EG 4t6uQcr/gEIyYob/xRiJxuIWd+apHXpmJb709jWxwbqbhYig3OEHRo9XW0G8BksGeh5T nLQufC1qFzer+1N6YIK0blzcMNkeApxLu2rJiGXcSLLO9VbrugsYzD09jTCtUW7J9+Ma 6VJb8ekFnp19Iu5tu5Jkpq0jGb41vBElApAMQ/T0GD93UPDfddeNthZUlqA2SxZERhK+ wSiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=rYtwHw5KxPlHY+qTyolEKNpKCDTbmBEbL/z50TnWG7A=; fh=bwsiIJU4ZySHCYgdbJrawkDYkx7XsqbTjYxIEnch01E=; b=yZLhHlwoyyftyj8y9W2tg/rW9j0OKoRl4+DEpeNUpuTf9eNRboRBSZJJ4WV0+Xt5t4 t+LCj6PIjzM9BK7jQO+S8Uv/qsPZzM0+LbbkQyWh8dVLhmo4+zIQ5eTrmIlcLNpCFsWx vKUF5dUT/JEhOo0nH3YO5ygefkTKcEhmGzRevod0sTN5BTZwMsk9QHhj8bdQxs1irTEq zvEDunkPNg5pjxpiMPUoDzhaZsRlIvwl1P1mQZmc7cR1IMgjnNJ96yTu5MY1XASb1ntq g/bja6oMGjFCW97zja3/DZMsG33bXdjmUJQxhUkKC9LJ9hc0OtZSu+0hYcmYMcY3IZAn w0Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="yp4WjF/Y"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id j7-20020a17090a7e8700b00268a8e0cab3si1715205pjl.178.2023.11.09.07.12.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 07:12:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="yp4WjF/Y"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 05E29803EC84; Thu, 9 Nov 2023 07:11:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234554AbjKIPLY (ORCPT + 31 others); Thu, 9 Nov 2023 10:11:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234536AbjKIPLV (ORCPT ); Thu, 9 Nov 2023 10:11:21 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA4A435A8 for ; Thu, 9 Nov 2023 07:11:18 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d9a541b720aso1220808276.0 for ; Thu, 09 Nov 2023 07:11:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699542678; x=1700147478; darn=vger.kernel.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=yp4WjF/Yo8jReunRANTjSQKCftyAJjjPLHB2i/DHMdo1/yZYweKXmUDey5mddb8MCS RQsbAjTtf9uX/MkEYABAsGL61xKI1xbA/KWNmtStbHzYXEXGLzit5uZlW9DeCXy9nosH EPcasm+RBlTVHS54kFoKn1KrRDj6t4rPX0rV0LTs7T/NqBauMLoDH4CF5Wfwe6qlArjx 3fF7yA6gEWTSPi9XNPOm4cirA7GtzqlYOfSnevnllJeEKo2lBvAublTsCN7dGv20ruKT C1u8RQW+ycIaYi92x5pypXzArK5xMmwEzq1l6TGYLpDwbU4LRfZeVbUDWci3A1KZ35WG qGsA== 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=kLDQLx+ArQie4I3k6ewxpdoR0ukwhGTrI/XuIJ3Di4EeOK7N3m7hr4g6Myf06ugLFP addtL0J0AGBH/SGNhjkk/AQN37wnCSLqFgGBGbA7OQT/+7ieLhdMbrsEvPvnonTsS38N xmK7NEF1+jTyx322A70ixVLYAGLj0pQ4CYkGl3HHdQmij/HFOAiZbnCuk/PCPmCz/FKo OW4GFKgSElpLv1cqHFnNOksbvw6CrUzzWuwP4MMsSIOmxhDnWq6ugTlGgcjESIE8kMqf Cd9TyhYWUGLftRt3znpq7d6yS81sPOjgPAV9ionC7S0ui5dzbFzUkCxrNptRhlGOlg1s Wp0Q== X-Gm-Message-State: AOJu0YwFw20QYD++Dv6UEyEeUOk3H/dSiCaV+yURNBZNp458mZ/g4MlC Uaor+rUcNF1l+sIj9ThqIGFDUMAZ17o= 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 09 Nov 2023 07:11:59 -0800 (PST) X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782099711519814374 X-GMAIL-MSGID: 1782099711519814374 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: 163415 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp501357vqs; Thu, 9 Nov 2023 07:12:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IGBQXvYQC25DIYZ7pzOpbPSfAYwR7LrnspDA3dbEHuZ9Lz/b3P4Dafzw2pyVUtd77UIyPZE X-Received: by 2002:a05:6808:309a:b0:3b2:f192:5a6b with SMTP id bl26-20020a056808309a00b003b2f1925a6bmr2272213oib.16.1699542739940; Thu, 09 Nov 2023 07:12:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699542739; cv=none; d=google.com; s=arc-20160816; b=LdNUcbVSJJl1xjjvI41Pj8ivdsXN23kMSz1wMXOtgWIlbtL66nC3h9RJZ37dbvFeJY sf/ffuaN/0SGirFrqsekfnEVKBKpEtvzuwnnzDSBvIrO5yeLBrwmupVs1HQYTeI8bUbt 9LYxAkvVjBbZGDwuZC20JYfkkJpGzelsxY2KS6vtgUWhM3Wa6HCXldP4kLG09kmdbDlW OZPbITS1BY2rWPRuzHvayX5hutQCAiMLkFV+DoDdy+tsuHUNZreteulpGPUN3elwc30H EjgvRCphlwurKn68M+GXd/lcxzC+ivOdEpFJhwa/lIGIPK7Xw/Bma6vlDjU3ukO/I7DB 6p4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=8pQ0K76qmBVGT/CgHVEv31iCSF419asbcRbCGaHbMy8=; fh=bwsiIJU4ZySHCYgdbJrawkDYkx7XsqbTjYxIEnch01E=; b=dHFSjL8epA28WbK79SmvV6FEigXZA7FXEEWXRjD/mkMKdBq5gQrKUW8S29YjSb2ZN6 2GhsIxmuaDfDtrZGDNbRZ47Mkjhz1Yl2cnclAeE7UO+RR5d76zF6lr5fwBSl5Q1xdlEp z2lWW6Q+CA6jE2Kt7q0hLGaH7OW/MUHgOudQWu4hvby8eTkdyugDLGF7A2oY5Ftzo/h9 XjNz8AJAAx9NmR8c1Fh1hegm4zPLHWQbdvG6Ewheit2PzE2tDpvCEiwdeP4SwY2Foe3p db/BrRIMP8kkGZM44aVOIKG9q3y1NNDEvQ+PiXToYxhEeY6PxZ6hNQjEN76zv0iGhP5L M7mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=HXmPIsyV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id eq22-20020a056808449600b003ae55ec2576si6569316oib.220.2023.11.09.07.12.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 07:12:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=HXmPIsyV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 7D4998249F63; Thu, 9 Nov 2023 07:12:13 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234571AbjKIPL1 (ORCPT + 31 others); Thu, 9 Nov 2023 10:11:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343540AbjKIPLZ (ORCPT ); Thu, 9 Nov 2023 10:11:25 -0500 Received: from mail-wm1-x349.google.com (mail-wm1-x349.google.com [IPv6:2a00:1450:4864:20::349]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F4D835B3 for ; Thu, 9 Nov 2023 07:11:23 -0800 (PST) Received: by mail-wm1-x349.google.com with SMTP id 5b1f17b1804b1-4084001846eso6370155e9.1 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=vger.kernel.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=HXmPIsyVZBhk7YQKAHvlH8qBF/pDdTeZNrusuKkTatH2PftRoNSSpbSpEQ0ijwxrTr /mg9CGrq6NOVwePi8gFMqBi7nmEXGE61ECDEbinCHIwW7NT3WIFV5LDNTxkmCd6t4aDx 4VV1ARGOXREYXjvHag8m/qjY1Uyruggi7NlOe/4kVPReAGmcwdAKBmfDML8GEQsJymQ1 2Oxxl7h5RAXOUvaat6HkAH7DqetYLAnYzH46NNcIke/tGgjwJmxMC5O3IzXn5hXs6sKo UOLNgjm1JxPUPJUwq0JmVgy0fbWMrRqWZygHanCHmkS8WkvZH5D6CpAYnup3J8TXJIUu pINw== 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=f1/0hRJDocHZ8YKciezKnHRtsLLAh6PaI4OWS+4MWiTtwkrgL4/SRcdFQqYW4iaEvd KBf++ChgtgBwsSkxHcofRAYZFIZuW/gRAJkzq0HgVhdx00znAAN2g/o0HRJZVWlOzHkE o56XMqpZl9/omfA7hxc5pZcmSSghEbO6BYkR1voGdSfZL6M3fv6fcGZDhtU5wLucd75c N88hlsz+LknKqSOwER2rrd2U2Do/p4b+/LERALmKFFZRM3UyfGAQBuOQApCjsS4ZP5tT KBw/ao4zCEO4ANBzXvmwO6v8VRk0ySsNjQx6qYqJ4PTSwRMJKBXdJufSfDXZMbB6Wbdo LB/w== X-Gm-Message-State: AOJu0YzWkXgrburXIe0LMEGMy6FoNOLMueMpYXUZJo3qH+mLjz8uY9qN Qg83djkFP4HbhVxbdmlcWrKY02ZeFOk= 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Thu, 09 Nov 2023 07:12:13 -0800 (PST) X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782099727638475709 X-GMAIL-MSGID: 1782099727638475709 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