From nobody Thu Dec 18 08:29:42 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 223161CAA2; Thu, 25 Jul 2024 05:48:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721886503; cv=none; b=JKm1nHQZ/6gDcpwC+QYpDs0Kw7AFCKqazItX2IME4bNANcBcpiTdBIqpaNRtsOqADt+SoqBNLgr7SYKFBUO5UbVslqNtncYhuyPBkvi1s3f6/bNk+XTaGxcHJDLNXvlR13nDnjx1Z0/+1y3I0Vx6jZJYaK8yjpWZa0YuMlNFnjA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721886503; c=relaxed/simple; bh=A2ty1Yaivv3pm5y7N06ALhLKd7L3sToHpr63zfgUPZ8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mmLmwYpQZwb0+U46KJtRHAo59S7d2WhpLTcENOiInqr5l3lKnYL7T6sg6HfL+fz3cfngbVXrIn18Trx77sHeO3tV19FlFIJyl/aXqxYQOinXrmC0UP/UG9YHYOVMiraGpEHJWtdkj4Y5tHhtL5nbd/+fxB7jozgtOn9xhAkguR8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B3DEE1476; Wed, 24 Jul 2024 22:48:45 -0700 (PDT) Received: from a077893.blr.arm.com (a077893.blr.arm.com [10.162.40.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8F8963F5A1; Wed, 24 Jul 2024 22:48:17 -0700 (PDT) From: Anshuman Khandual To: linux-kernel@vger.kernel.org Cc: anshuman.khandual@arm.com, Andrew Morton , Yury Norov , Rasmus Villemoes , Arnd Bergmann , linux-arch@vger.kernel.org Subject: [PATCH V2 1/2] uapi: Define GENMASK_U128 Date: Thu, 25 Jul 2024 11:18:07 +0530 Message-Id: <20240725054808.286708-2-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240725054808.286708-1-anshuman.khandual@arm.com> References: <20240725054808.286708-1-anshuman.khandual@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This adds GENMASK_U128() and __GENMASK_U128() macros using __BITS_PER_U128 and __int128 data types. These macros will be used in providing support for generating 128 bit masks. Cc: Yury Norov Cc: Rasmus Villemoes Cc: Arnd Bergmann > Cc: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org Signed-off-by: Anshuman Khandual Reviewed-by: Arnd Bergmann --- include/linux/bits.h | 2 ++ include/uapi/asm-generic/bitsperlong.h | 2 ++ include/uapi/linux/bits.h | 3 +++ include/uapi/linux/const.h | 1 + 4 files changed, 8 insertions(+) diff --git a/include/linux/bits.h b/include/linux/bits.h index 0eb24d21aac2..0a174cce09d2 100644 --- a/include/linux/bits.h +++ b/include/linux/bits.h @@ -35,5 +35,7 @@ (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l)) #define GENMASK_ULL(h, l) \ (GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l)) +#define GENMASK_U128(h, l) \ + (GENMASK_INPUT_CHECK(h, l) + __GENMASK_U128(h, l)) =20 #endif /* __LINUX_BITS_H */ diff --git a/include/uapi/asm-generic/bitsperlong.h b/include/uapi/asm-gene= ric/bitsperlong.h index fadb3f857f28..6275367b17bb 100644 --- a/include/uapi/asm-generic/bitsperlong.h +++ b/include/uapi/asm-generic/bitsperlong.h @@ -28,4 +28,6 @@ #define __BITS_PER_LONG_LONG 64 #endif =20 +#define __BITS_PER_U128 128 + #endif /* _UAPI__ASM_GENERIC_BITS_PER_LONG */ diff --git a/include/uapi/linux/bits.h b/include/uapi/linux/bits.h index 3c2a101986a3..4d4b7b08003c 100644 --- a/include/uapi/linux/bits.h +++ b/include/uapi/linux/bits.h @@ -12,4 +12,7 @@ (((~_ULL(0)) - (_ULL(1) << (l)) + 1) & \ (~_ULL(0) >> (__BITS_PER_LONG_LONG - 1 - (h)))) =20 +#define __GENMASK_U128(h, l) \ + ((_BIT128((h) + 1)) - (_BIT128(l))) + #endif /* _UAPI_LINUX_BITS_H */ diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h index a429381e7ca5..a0211136dfd8 100644 --- a/include/uapi/linux/const.h +++ b/include/uapi/linux/const.h @@ -27,6 +27,7 @@ =20 #define _BITUL(x) (_UL(1) << (x)) #define _BITULL(x) (_ULL(1) << (x)) +#define _BIT128(x) ((unsigned __int128)(1) << (x)) =20 #define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (__typeof__(x))(a) - = 1) #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) --=20 2.30.2 From nobody Thu Dec 18 08:29:42 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E20212557A; Thu, 25 Jul 2024 05:48:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721886505; cv=none; b=b/FMLLkSiCfJlrSjiUi53nz6MYKyTMEbf/5U0x3JlxkjAEIKQ2UTpTaueyAo5wBVppKpWWaaiRMK/r36IT2fGr2HTFCNvXIAB3gm7FuIJNEYFxkmM19hZbgatNGPhFUVtygzyn3yEDCurrlket4fTpHOb0Hgeoic+B7ZaLTgjHo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721886505; c=relaxed/simple; bh=XexxUpOX0NNJjpNdqVHTzG0Zr+lP5esRm5bDrWcXZ+E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ftMeSb3xzxjflVVvPJcUlGdQYxMd2EzRrFL1WoKypXFkeDDLiL+8O5XskBBJbT5u1tc68mVVxeg8nWjg3aD38EbzgTTJTqsLTVfIuzJyJMDSGyzTW/hzuu++ZUIyuOHqT28r0M3gP8ZYqeLNvjYIPgySu/wjt13K7Pwh2Q62bq4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 02FEB1007; Wed, 24 Jul 2024 22:48:49 -0700 (PDT) Received: from a077893.blr.arm.com (a077893.blr.arm.com [10.162.40.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D344D3F5A1; Wed, 24 Jul 2024 22:48:20 -0700 (PDT) From: Anshuman Khandual To: linux-kernel@vger.kernel.org Cc: anshuman.khandual@arm.com, Andrew Morton , Yury Norov , Rasmus Villemoes , Arnd Bergmann , linux-arch@vger.kernel.org Subject: [PATCH V2 2/2] lib/test_bits.c: Add tests for GENMASK_U128() Date: Thu, 25 Jul 2024 11:18:08 +0530 Message-Id: <20240725054808.286708-3-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240725054808.286708-1-anshuman.khandual@arm.com> References: <20240725054808.286708-1-anshuman.khandual@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This adds GENMASK_U128() tests although currently only 64 bit wide masks are being tested. Cc: Andrew Morton Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual Reviewed-by: Arnd Bergmann --- lib/test_bits.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/lib/test_bits.c b/lib/test_bits.c index 01313980f175..f0d1033cf3c9 100644 --- a/lib/test_bits.c +++ b/lib/test_bits.c @@ -39,6 +39,26 @@ static void genmask_ull_test(struct kunit *test) #endif } =20 +#ifdef CONFIG_ARCH_SUPPORTS_INT128 +static void genmask_u128_test(struct kunit *test) +{ + /* Tests mask generation only when the mask width is within 64 bits */ + KUNIT_EXPECT_EQ(test, 0x0000000000ff0000ULL, GENMASK_U128(87, 80) >> 64); + KUNIT_EXPECT_EQ(test, 0x0000000000ffffffULL, GENMASK_U128(87, 64) >> 64); + KUNIT_EXPECT_EQ(test, 0x0000000000000001ULL, GENMASK_U128(0, 0)); + KUNIT_EXPECT_EQ(test, 0xffffffffffffffffULL, GENMASK_U128(63, 0)); + KUNIT_EXPECT_EQ(test, 0xffffffffffffffffULL, GENMASK_U128(64, 0) >> 1); + KUNIT_EXPECT_EQ(test, 0x00000000ffffffffULL, GENMASK_U128(81, 50) >> 50); + +#ifdef TEST_GENMASK_FAILURES + /* these should fail compilation */ + GENMASK_U128(0, 1); + GENMASK_U128(0, 10); + GENMASK_U128(9, 10); +#endif +} +#endif + static void genmask_input_check_test(struct kunit *test) { unsigned int x, y; @@ -56,12 +76,17 @@ static void genmask_input_check_test(struct kunit *test) /* Valid input */ KUNIT_EXPECT_EQ(test, 0, GENMASK_INPUT_CHECK(1, 1)); KUNIT_EXPECT_EQ(test, 0, GENMASK_INPUT_CHECK(39, 21)); + KUNIT_EXPECT_EQ(test, 0, GENMASK_INPUT_CHECK(100, 80)); + KUNIT_EXPECT_EQ(test, 0, GENMASK_INPUT_CHECK(110, 65)); } =20 =20 static struct kunit_case bits_test_cases[] =3D { KUNIT_CASE(genmask_test), KUNIT_CASE(genmask_ull_test), +#ifdef CONFIG_ARCH_SUPPORTS_INT128 + KUNIT_CASE(genmask_u128_test), +#endif KUNIT_CASE(genmask_input_check_test), {} }; --=20 2.30.2