From 13b18b018494d92b84bd70c8374589cc2641278e29d048f5d08d9303e6145154 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 2 Sep 2020 09:26:00 +0000
Subject: [PATCH] Accepting request 831403 from
 home:jirislaby:branches:devel:tools

- add libbpf-Fix-libbpf-hashmap-on-I-LP32-architectures.patch

OBS-URL: https://build.opensuse.org/request/show/831403
OBS-URL: https://build.opensuse.org/package/show/devel:tools/dwarves?expand=0&rev=41
---
 dwarves.changes                               |  5 +++
 dwarves.spec                                  |  1 +
 ...bbpf-hashmap-on-I-LP32-architectures.patch | 45 +++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 libbpf-Fix-libbpf-hashmap-on-I-LP32-architectures.patch

diff --git a/dwarves.changes b/dwarves.changes
index d8d32e3..379b022 100644
--- a/dwarves.changes
+++ b/dwarves.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep  2 08:39:24 UTC 2020 - Jiri Slaby <jslaby@suse.com>
+
+- add libbpf-Fix-libbpf-hashmap-on-I-LP32-architectures.patch
+
 -------------------------------------------------------------------
 Tue May 19 11:44:37 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
 
diff --git a/dwarves.spec b/dwarves.spec
index c8d7116..1b222a5 100644
--- a/dwarves.spec
+++ b/dwarves.spec
@@ -28,6 +28,7 @@ URL:            http://acmel.wordpress.com/
 Source:         https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.xz
 Source2:        https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.sign
 Source9:        baselibs.conf
+Patch0:         libbpf-Fix-libbpf-hashmap-on-I-LP32-architectures.patch
 BuildRequires:  cmake
 BuildRequires:  libdw-devel >= 0.170
 %if 0%{?suse_version} < 1550
diff --git a/libbpf-Fix-libbpf-hashmap-on-I-LP32-architectures.patch b/libbpf-Fix-libbpf-hashmap-on-I-LP32-architectures.patch
new file mode 100644
index 0000000..9aae170
--- /dev/null
+++ b/libbpf-Fix-libbpf-hashmap-on-I-LP32-architectures.patch
@@ -0,0 +1,45 @@
+From: Jakub Bogusz <qboosh@pld-linux.org>
+Date: Thu, 9 Jul 2020 15:57:23 -0700
+Subject: libbpf: Fix libbpf hashmap on (I)LP32 architectures
+Git-commit: b2f9f1535bb93ee5fa2ea30ac1c26fa0d676154c
+Patch-mainline: 5.8-rc5
+References: x86_32 crashes fix
+
+On ILP32, 64-bit result was shifted by value calculated for 32-bit long type
+and returned value was much outside hashmap capacity.
+As advised by Andrii Nakryiko, this patch uses different hashing variant for
+architectures with size_t shorter than long long.
+
+Fixes: e3b924224028 ("libbpf: add resizable non-thread safe internal hashmap")
+Signed-off-by: Jakub Bogusz <qboosh@pld-linux.org>
+Signed-off-by: Andrii Nakryiko <andriin@fb.com>
+Signed-off-by: Alexei Starovoitov <ast@kernel.org>
+Link: https://lore.kernel.org/bpf/20200709225723.1069937-1-andriin@fb.com
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ lib/bpf/src/hashmap.h |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- a/lib/bpf/src/hashmap.h
++++ b/lib/bpf/src/hashmap.h
+@@ -16,11 +16,19 @@
+ #include <bits/reg.h>
+ #endif
+ #include "libbpf_internal.h"
++#include <limits.h>
+ 
+ static inline size_t hash_bits(size_t h, int bits)
+ {
+ 	/* shuffle bits and return requested number of upper bits */
+-	return (h * 11400714819323198485llu) >> (__WORDSIZE - bits);
++#if (__SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__)
++	/* LP64 case */
++	return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits);
++#elif (__SIZEOF_SIZE_T__ <= __SIZEOF_LONG__)
++	return (h * 2654435769lu) >> (__SIZEOF_LONG__ * 8 - bits);
++#else
++#	error "Unsupported size_t size"
++#endif
+ }
+ 
+ typedef size_t (*hashmap_hash_fn)(const void *key, void *ctx);