From 326d391a85761bcfcbea54e6460a247e33c43f4a Mon Sep 17 00:00:00 2001 From: fandehui Date: Thu, 28 Dec 2023 10:17:44 +0800 Subject: [PATCH] Fix an incorrect assertion. When configured with --with-lg-page, it's possible for the configured page size to be greater than the system page size, in which case the page address may only be aligned with the system page size. Signed-off-by: fandehui (cherry picked from commit 9d3aff3ec1909742ad3259a3b5ff2e50890cb844) --- Fix-an-incorrect-assertion.patch | 28 ++++++++++++++++++++++++++++ jemalloc.spec | 6 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 Fix-an-incorrect-assertion.patch diff --git a/Fix-an-incorrect-assertion.patch b/Fix-an-incorrect-assertion.patch new file mode 100644 index 0000000..7b2de84 --- /dev/null +++ b/Fix-an-incorrect-assertion.patch @@ -0,0 +1,28 @@ +From e8a63b87c36ac814272d73b503658431d2000055 Mon Sep 17 00:00:00 2001 +From: Qi Wang +Date: Wed, 9 May 2018 15:03:38 -0700 +Subject: [PATCH] Fix an incorrect assertion. + +When configured with --with-lg-page, it's possible for the configured page size +to be greater than the system page size, in which case the page address may only +be aligned with the system page size. +--- + src/pages.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pages.c b/src/pages.c +index 26002692..cc967fcf 100644 +--- a/src/pages.c ++++ b/src/pages.c +@@ -261,7 +261,7 @@ pages_decommit(void *addr, size_t size) { + + bool + pages_purge_lazy(void *addr, size_t size) { +- assert(PAGE_ADDR2BASE(addr) == addr); ++ assert(ALIGNMENT_ADDR2BASE(addr, os_page) == addr); + assert(PAGE_CEILING(size) == size); + + if (!pages_can_purge_lazy) { +-- +2.27.0 + diff --git a/jemalloc.spec b/jemalloc.spec index 7d39d71..e0b82b2 100644 --- a/jemalloc.spec +++ b/jemalloc.spec @@ -12,11 +12,12 @@ Name: jemalloc Version: 5.1.0 -Release: 4 +Release: 5 Summary: General-purpose scalable concurrent malloc implementation License: BSD URL: http://www.canonware.com/jemalloc/ Source0: https://github.com/jemalloc/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2 +Patch0: Fix-an-incorrect-assertion.patch BuildRequires: libxslt perl-generators Requires: %{name}-help = %{version}-%{release} @@ -82,6 +83,9 @@ make check %{_mandir}/man3/jemalloc.3* %changelog +* Thu Dec 28 2023 fandehui - 5.1.0-5 +- Fix an incorrect assertion. + * Fri Nov 06 2020 leiju - 5.1.0-4 - Add Requires jemalloc-help into jemalloc -- Gitee