From c37ec14ec00ab6e683dd8b143dee58d9570811b0 Mon Sep 17 00:00:00 2001 From: laokz Date: Fri, 31 May 2024 19:27:40 +0800 Subject: [PATCH] riscv64: fix 'rdcycle' illegal instructor error (cherry picked from commit be99fe2c2ec239dc41e85eedc5a112318347459f) --- ...aledcycleclock-remove-RISC-V-support.patch | 81 +++++++++++++++++++ abseil-cpp.spec | 9 ++- 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 0002-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch diff --git a/0002-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch b/0002-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch new file mode 100644 index 0000000..f9adc5d --- /dev/null +++ b/0002-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch @@ -0,0 +1,81 @@ +From 7335a36d0b5c1c597566f9aa3f458a5b6817c3b4 Mon Sep 17 00:00:00 2001 +From: aurel32 +Date: Fri, 22 Mar 2024 14:21:13 -0700 +Subject: [PATCH] PR #1644: unscaledcycleclock: remove RISC-V support + +Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1644 + +Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on RISC-V and can't be used directly from userland. There is a sysctl option to change that as a transition period, but it will eventually disappear. + +The RDTIME instruction is another less accurate alternative, however its frequency varies from board to board, and there is currently now way to get its frequency from userland [2]. + +Therefore this patch just removes the code for unscaledcycleclock on RISC-V. Without processor specific implementation, abseil relies on std::chrono::steady_clock::now().time_since_epoch() which is basically a wrapper around clock_gettime (CLOCK_MONOTONIC), which in turns use __vdso_clock_gettime(). On RISC-V this VDSO is just a wrapper around RDTIME correctly scaled to use nanoseconds units. + +This fixes the testsuite on riscv64, tested on a VisionFive 2 board. + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3 +[2] https://github.com/abseil/abseil-cpp/pull/1631 +Merge 43356a2548cfde76e164d446cb69004b488c6a71 into 76f8011beabdaee872b5fde7546e02407b220cb1 + +Merging this change closes #1644 + +COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1644 from aurel32:rv64-no-unscaledcycleclock 43356a2548cfde76e164d446cb69004b488c6a71 +PiperOrigin-RevId: 618286262 +Change-Id: Ie4120a727e7d0bb185df6e06ea145c780ebe6652 +--- + absl/base/internal/unscaledcycleclock.cc | 12 ------------ + absl/base/internal/unscaledcycleclock_config.h | 8 ++++---- + 2 files changed, 4 insertions(+), 16 deletions(-) + +diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc +index 05e0e7ba..a0bf3a65 100644 +--- a/absl/base/internal/unscaledcycleclock.cc ++++ b/absl/base/internal/unscaledcycleclock.cc +@@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() { + return aarch64_timer_frequency; + } + +-#elif defined(__riscv) +- +-int64_t UnscaledCycleClock::Now() { +- int64_t virtual_timer_value; +- asm volatile("rdcycle %0" : "=r"(virtual_timer_value)); +- return virtual_timer_value; +-} +- +-double UnscaledCycleClock::Frequency() { +- return base_internal::NominalCPUFrequency(); +-} +- + #elif defined(_M_IX86) || defined(_M_X64) + + #pragma intrinsic(__rdtsc) +diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h +index 24b324ac..43a3dabe 100644 +--- a/absl/base/internal/unscaledcycleclock_config.h ++++ b/absl/base/internal/unscaledcycleclock_config.h +@@ -21,8 +21,8 @@ + + // The following platforms have an implementation of a hardware counter. + #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ +- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ +- defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) ++ defined(__powerpc__) || defined(__ppc__) || defined(_M_IX86) || \ ++ (defined(_M_X64) && !defined(_M_ARM64EC)) + #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 + #else + #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 0 +@@ -53,8 +53,8 @@ + #if ABSL_USE_UNSCALED_CYCLECLOCK + // This macro can be used to test if UnscaledCycleClock::Frequency() + // is NominalCPUFrequency() on a particular platform. +-#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \ +- defined(_M_IX86) || defined(_M_X64)) ++#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \ ++ defined(_M_X64)) + #define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY + #endif + #endif +-- +2.39.2 + diff --git a/abseil-cpp.spec b/abseil-cpp.spec index bd32503..0faa171 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -6,7 +6,7 @@ Name: abseil-cpp Version: 20230802.1 -Release: 3 +Release: 4 Summary: C++ Common Libraries License: Apache-2.0 AND LicenseRef-Fedora-Public-Domain @@ -15,6 +15,7 @@ Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}- Patch1: abseil-cpp-20210324.2-sw.patch Patch100: 0001-add-loongarch-suopport-for-abseil-cpp.patch +Patch101: 0002-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch BuildRequires: cmake ninja-build BuildRequires: gcc-c++ @@ -156,6 +157,12 @@ DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}" %{_libdir}/pkgconfig/*.pc %changelog +* Fri May 31 2024 laokz - 20230802.1-4 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:Fix riscv64 'rdcycle' illegal instructor error + * Wed Mar 6 2024 Wenlong Zhang - 20230802.1-3 - Type:bugfix - CVE:NA -- Gitee