Bug#1018214: bullseye-pu: package rocksdb/6.11.4-3+deb11u1

2022-09-03 Thread Adam D. Barratt
Control: tags -1 + confirmed

On Sat, 2022-08-27 at 09:15 +0200, László Böszörményi wrote:
> Another DD reported and patched [1] a SIGILL in RocksDB on specific
> arm64 platforms. The patch is official and quite straight forward,
> attached.
> As the bug is in a common, low level function (CRC calculation) it
> prevents him from using this package on his computer.
> 
> Thanks for consideration,
> Laszlo/GCS
> [1] https://bugs.debian.org/1015224

Please go ahead.

Regards,

Adam



Bug#1018214: bullseye-pu: package rocksdb/6.11.4-3+deb11u1

2022-08-27 Thread GCS
Package: release.debian.org
User: release.debian@packages.debian.org
Tags: bullseye
Severity: normal

Hi RMs,

Another DD reported and patched [1] a SIGILL in RocksDB on specific
arm64 platforms. The patch is official and quite straight forward,
attached.
As the bug is in a common, low level function (CRC calculation) it
prevents him from using this package on his computer.

Thanks for consideration,
Laszlo/GCS
[1] https://bugs.debian.org/1015224
diff -Nru rocksdb-6.11.4/debian/changelog rocksdb-6.11.4/debian/changelog
--- rocksdb-6.11.4/debian/changelog	2020-12-10 18:13:16.0 +0100
+++ rocksdb-6.11.4/debian/changelog	2022-08-27 08:59:02.0 +0200
@@ -1,3 +1,10 @@
+rocksdb (6.11.4-3+deb11u1) bullseye; urgency=medium
+
+  [ Daniel Leidert  ]
+  * Fix illegal instruction on arm64 (closes: #1015224).
+
+ -- Laszlo Boszormenyi (GCS)   Sat, 27 Aug 2022 08:59:02 +0200
+
 rocksdb (6.11.4-3) unstable; urgency=medium
 
   * Explicitly link shared library with dynamic linking library
diff -Nru rocksdb-6.11.4/debian/patches/fix_illegal_instruction.patch rocksdb-6.11.4/debian/patches/fix_illegal_instruction.patch
--- rocksdb-6.11.4/debian/patches/fix_illegal_instruction.patch	1970-01-01 01:00:00.0 +0100
+++ rocksdb-6.11.4/debian/patches/fix_illegal_instruction.patch	2022-08-27 08:55:55.0 +0200
@@ -0,0 +1,225 @@
+From 29f7bbef995bdf83098963799c66af742e95373f Mon Sep 17 00:00:00 2001
+From: Yuqi Gu 
+Date: Tue, 22 Sep 2020 10:39:54 -0700
+Subject: [PATCH] Fix RocksDB SIGILL error on Raspberry PI 4 (#7233)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Summary:
+Issue:https://github.com/facebook/rocksdb/issues/7042
+
+No PMULL runtime check will lead to SIGILL on a Raspberry pi 4.
+
+Leverage 'getauxval' to get Hardware-Cap to detect whether target
+platform does support PMULL or not in runtime.
+
+Consider the condition that the target platform does support crc32 but not support PMULL.
+In this condition, the code should leverage the crc32 instruction
+rather than skip all hardware crc32 instruction.
+
+Pull Request resolved: https://github.com/facebook/rocksdb/pull/7233
+
+Reviewed By: jay-zhuang
+
+Differential Revision: D23790116
+
+fbshipit-source-id: a3ebd821fbd4a38dd2f59064adbb7c3013ee8140
+---
+ util/crc32c.cc   |   6 +++
+ util/crc32c_arm64.cc | 111 ++-
+ util/crc32c_arm64.h  |   1 +
+ 3 files changed, 74 insertions(+), 44 deletions(-)
+
+Index: rocksdb-6.11.4/util/crc32c.cc
+===
+--- rocksdb-6.11.4.orig/util/crc32c.cc
 rocksdb-6.11.4/util/crc32c.cc
+@@ -41,6 +41,10 @@
+ 
+ #endif
+ 
++#if defined(__linux__) && defined(HAVE_ARM64_CRC)
++bool pmull_runtime_flag = false;
++#endif
++
+ namespace ROCKSDB_NAMESPACE {
+ namespace crc32c {
+ 
+@@ -494,6 +498,7 @@ std::string IsFastCrc32Supported() {
+   if (crc32c_runtime_check()) {
+ has_fast_crc = true;
+ arch = "Arm64";
++pmull_runtime_flag = crc32c_pmull_runtime_check();
+   } else {
+ has_fast_crc = false;
+ arch = "Arm64";
+@@ -1224,6 +1229,7 @@ static inline Function Choose_Extend() {
+   return isAltiVec() ? ExtendPPCImpl : ExtendImpl;
+ #elif defined(__linux__) && defined(HAVE_ARM64_CRC)
+   if(crc32c_runtime_check()) {
++pmull_runtime_flag = crc32c_pmull_runtime_check();
+ return ExtendARMImpl;
+   } else {
+ return ExtendImpl;
+Index: rocksdb-6.11.4/util/crc32c_arm64.cc
+===
+--- rocksdb-6.11.4.orig/util/crc32c_arm64.cc
 rocksdb-6.11.4/util/crc32c_arm64.cc
+@@ -14,6 +14,9 @@
+ #ifndef HWCAP_CRC32
+ #define HWCAP_CRC32 (1 << 7)
+ #endif
++#ifndef HWCAP_PMULL
++#define HWCAP_PMULL (1 << 4)
++#endif
+ 
+ #ifdef HAVE_ARM64_CRYPTO
+ /* unfolding to compute 8 * 3 = 24 bytes parallelly */
+@@ -35,6 +38,8 @@
+   } while (0)
+ #endif
+ 
++extern bool pmull_runtime_flag;
++
+ uint32_t crc32c_runtime_check(void) {
+ #ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT
+   uint64_t auxv = getauxval(AT_HWCAP);
+@@ -44,6 +49,15 @@ uint32_t crc32c_runtime_check(void) {
+ #endif
+ }
+ 
++bool crc32c_pmull_runtime_check(void) {
++#ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT
++  uint64_t auxv = getauxval(AT_HWCAP);
++  return (auxv & HWCAP_PMULL) != 0;
++#else
++  return false;
++#endif
++}
++
+ #ifdef ROCKSDB_UBSAN_RUN
+ #if defined(__clang__)
+ __attribute__((__no_sanitize__("alignment")))
+@@ -58,6 +72,13 @@ uint32_t crc32c_arm64(uint32_t crc, unsi
+   int length = (int)len;
+   crc ^= 0x;
+ 
++  /*
++   * Pmull runtime check here.
++   * Raspberry Pi supports crc32 but doesn't support pmull.
++   * Skip Crc32c Parallel computation if no crypto extension available.
++   */
++  if (pmull_runtime_flag) {
++/* Macro (HAVE_ARM64_CRYPTO) is used for compiling check  */
+ #ifdef HAVE_ARM64_CRYPTO
+ /* Crc32c Parallel computation
+  *   Algorithm comes from Intel whitepaper:
+@@ -68,51 +89,53 @@ uint32_t