diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-05-22 21:45:29 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-25 22:36:08 +0100 |
commit | d7daabfbd794a84c1d36311b6ed99f54f24246ce (patch) | |
tree | 13b3d3fc206b2e4c9312bc98885ebeeb1f8fb2d4 /meta/recipes-core/glibc/glibc/0033-x86-Handle-_SC_LEVEL1_ICACHE_LINESIZE-BZ-27444.patch | |
parent | c23a25e60791b463639751b516ab63a0347a70df (diff) | |
download | poky-d7daabfbd794a84c1d36311b6ed99f54f24246ce.tar.gz |
glibc: Update to latest 2.33 branch
Drop backported patches
Add CVE-2021-27645 to CVE_CHECK_WHITELIST and drop the patch as its also
upstreamed
Changes in the version bump are
* 3f5080aedd nptl: Do not build nptl/tst-pthread-gdb-attach as PIE
* 36783141cf nptl: Check for compatible GDB in nptl/tst-pthread-gdb-attach
* ea299b62e8 nptl_db: Support different libpthread/ld.so load orders (bug 27744)
* 162df872f0 x86: tst-cpu-features-supports.c: Update AMX check
* 12ff80b312 Remove PR_TAGGED_ADDR_ENABLE from sys/prctl.h
* 1bf38e7260 Fix SXID_ERASE behavior in setuid programs (BZ #27471)
* a7b8e8ec9b Enhance setuid-tunables test
* ee16c81063 tst-env-setuid: Use support_capture_subprogram_self_sgid
* 267e174f19 support: Add capability to fork an sgid child
* 249c486ce8 support: Pass environ to child process
* 45b2c57d34 support: Typo and formatting fixes
* e07abf59b2 tunables: Fix comparison of tunable values
* 3e9ca60a58 linux: always update select timeout (BZ #27706)
* 8380ca5833 linux: Normalize and return timeout on select (BZ #27651)
* 85e4dc415a libsupport: Add support_select_normalizes_timeout
* b5b4aa62c1 libsupport: Add support_select_modifies_timeout
* 3d525dd639 misc: Fix tst-select timeout handling (BZ#27648)
* 830674605f tst: Provide test for select
* e78ea9bd26 Update Nios II libm-test-ulps.
* 98bb18f52a malloc: Fix a realloc crash with heap tagging [BZ 27468]
* fc4ecce85b S390: Also check vector support in memmove ifunc-selector [BZ #27511]
* db32fc27e7 test-container: Always copy test-specific support files [BZ #27537]
* 79c6be6a0a nptl: Remove private futex optimization [BZ #27304]
* f90d6b0484 pthread_once hangs when init routine throws an exception [BZ #18435]
* dd8023c2ac elf: ld.so --help calls _dl_init_paths without a main map [BZ #27577]
* ea5a537e87 elf: Always set l in _dl_init_paths (bug 23462)
* 64f6c287ad x86: Handle _SC_LEVEL1_ICACHE_LINESIZE [BZ #27444]
* 32b9280f1d io: Return EBAFD for negative file descriptor on fstat (BZ #27559)
* a151f2e05a nscd: Fix double free in netgroupcache [BZ #27462]
* ee9f98d9ca x86: Set minimum x86-64 level marker [BZ #27318]
* 3e880d7337 nss: Re-enable NSS module loading after chroot [BZ #27389]
* 71b2463f61 x86: Add CPU-specific diagnostics to ld.so --list-diagnostics
* a1eb3915e7 x86: Automate generation of PREFERRED_FEATURE_INDEX_1 bitfield
* 33dc1dd602 ld.so: Implement the --list-diagnostics option
* 8d4241b897 string: Work around GCC PR 98512 in rawmemchr
* 6efa2d44c8 S390: Add new hwcap values.
* c5e3545897 tunables: Disallow negative values for some tunables
* 905fdc7071 x86: Use SIZE_MAX instead of (long int)-1 for tunable range value
* 15afd6b8d8 tunables: Simplify TUNABLE_SET interface
* 17f0ff0978 nsswitch: return result when nss database is locked [BZ #27343]
(From OE-Core rev: c6fb9b80ecb0a4e7970157774ce9add12e9ef3ea)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0033-x86-Handle-_SC_LEVEL1_ICACHE_LINESIZE-BZ-27444.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0033-x86-Handle-_SC_LEVEL1_ICACHE_LINESIZE-BZ-27444.patch | 185 |
1 files changed, 0 insertions, 185 deletions
diff --git a/meta/recipes-core/glibc/glibc/0033-x86-Handle-_SC_LEVEL1_ICACHE_LINESIZE-BZ-27444.patch b/meta/recipes-core/glibc/glibc/0033-x86-Handle-_SC_LEVEL1_ICACHE_LINESIZE-BZ-27444.patch deleted file mode 100644 index 3a004e227f..0000000000 --- a/meta/recipes-core/glibc/glibc/0033-x86-Handle-_SC_LEVEL1_ICACHE_LINESIZE-BZ-27444.patch +++ /dev/null | |||
@@ -1,185 +0,0 @@ | |||
1 | From 750b00a1ddae220403fd892a6fd4e0791ffd154a Mon Sep 17 00:00:00 2001 | ||
2 | From: "H.J. Lu" <hjl.tools@gmail.com> | ||
3 | Date: Fri, 18 Sep 2020 07:55:14 -0700 | ||
4 | Subject: [PATCH] x86: Handle _SC_LEVEL1_ICACHE_LINESIZE [BZ #27444] | ||
5 | |||
6 | x86: Move x86 processor cache info to cpu_features | ||
7 | |||
8 | missed _SC_LEVEL1_ICACHE_LINESIZE. | ||
9 | |||
10 | 1. Add level1_icache_linesize to struct cpu_features. | ||
11 | 2. Initialize level1_icache_linesize by calling handle_intel, | ||
12 | handle_zhaoxin and handle_amd with _SC_LEVEL1_ICACHE_LINESIZE. | ||
13 | 3. Return level1_icache_linesize for _SC_LEVEL1_ICACHE_LINESIZE. | ||
14 | |||
15 | Upstream-Status: Backport [https://sourceware.org/bugzilla/show_bug.cgi?id=27444] | ||
16 | Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> | ||
17 | --- | ||
18 | sysdeps/x86/Makefile | 8 +++ | ||
19 | sysdeps/x86/cacheinfo.c | 3 + | ||
20 | sysdeps/x86/dl-cacheinfo.h | 6 ++ | ||
21 | sysdeps/x86/include/cpu-features.h | 2 + | ||
22 | .../x86/tst-sysconf-cache-linesize-static.c | 1 + | ||
23 | sysdeps/x86/tst-sysconf-cache-linesize.c | 57 +++++++++++++++++++ | ||
24 | 6 files changed, 77 insertions(+) | ||
25 | create mode 100644 sysdeps/x86/tst-sysconf-cache-linesize-static.c | ||
26 | create mode 100644 sysdeps/x86/tst-sysconf-cache-linesize.c | ||
27 | |||
28 | diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile | ||
29 | index dd82674342..d231263051 100644 | ||
30 | --- a/sysdeps/x86/Makefile | ||
31 | +++ b/sysdeps/x86/Makefile | ||
32 | @@ -208,3 +208,11 @@ $(objpfx)check-cet.out: $(..)sysdeps/x86/check-cet.awk \ | ||
33 | generated += check-cet.out | ||
34 | endif | ||
35 | endif | ||
36 | + | ||
37 | +ifeq ($(subdir),posix) | ||
38 | +tests += \ | ||
39 | + tst-sysconf-cache-linesize \ | ||
40 | + tst-sysconf-cache-linesize-static | ||
41 | +tests-static += \ | ||
42 | + tst-sysconf-cache-linesize-static | ||
43 | +endif | ||
44 | diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c | ||
45 | index 7b8df45e3b..5ea4723ca6 100644 | ||
46 | --- a/sysdeps/x86/cacheinfo.c | ||
47 | +++ b/sysdeps/x86/cacheinfo.c | ||
48 | @@ -32,6 +32,9 @@ __cache_sysconf (int name) | ||
49 | case _SC_LEVEL1_ICACHE_SIZE: | ||
50 | return cpu_features->level1_icache_size; | ||
51 | |||
52 | + case _SC_LEVEL1_ICACHE_LINESIZE: | ||
53 | + return cpu_features->level1_icache_linesize; | ||
54 | + | ||
55 | case _SC_LEVEL1_DCACHE_SIZE: | ||
56 | return cpu_features->level1_dcache_size; | ||
57 | |||
58 | diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h | ||
59 | index a31fa0783a..7cd00b92f1 100644 | ||
60 | --- a/sysdeps/x86/dl-cacheinfo.h | ||
61 | +++ b/sysdeps/x86/dl-cacheinfo.h | ||
62 | @@ -707,6 +707,7 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) | ||
63 | long int core; | ||
64 | unsigned int threads = 0; | ||
65 | unsigned long int level1_icache_size = -1; | ||
66 | + unsigned long int level1_icache_linesize = -1; | ||
67 | unsigned long int level1_dcache_size = -1; | ||
68 | unsigned long int level1_dcache_assoc = -1; | ||
69 | unsigned long int level1_dcache_linesize = -1; | ||
70 | @@ -726,6 +727,8 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) | ||
71 | |||
72 | level1_icache_size | ||
73 | = handle_intel (_SC_LEVEL1_ICACHE_SIZE, cpu_features); | ||
74 | + level1_icache_linesize | ||
75 | + = handle_intel (_SC_LEVEL1_ICACHE_LINESIZE, cpu_features); | ||
76 | level1_dcache_size = data; | ||
77 | level1_dcache_assoc | ||
78 | = handle_intel (_SC_LEVEL1_DCACHE_ASSOC, cpu_features); | ||
79 | @@ -753,6 +756,7 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) | ||
80 | shared = handle_zhaoxin (_SC_LEVEL3_CACHE_SIZE); | ||
81 | |||
82 | level1_icache_size = handle_zhaoxin (_SC_LEVEL1_ICACHE_SIZE); | ||
83 | + level1_icache_linesize = handle_zhaoxin (_SC_LEVEL1_ICACHE_LINESIZE); | ||
84 | level1_dcache_size = data; | ||
85 | level1_dcache_assoc = handle_zhaoxin (_SC_LEVEL1_DCACHE_ASSOC); | ||
86 | level1_dcache_linesize = handle_zhaoxin (_SC_LEVEL1_DCACHE_LINESIZE); | ||
87 | @@ -772,6 +776,7 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) | ||
88 | shared = handle_amd (_SC_LEVEL3_CACHE_SIZE); | ||
89 | |||
90 | level1_icache_size = handle_amd (_SC_LEVEL1_ICACHE_SIZE); | ||
91 | + level1_icache_linesize = handle_amd (_SC_LEVEL1_ICACHE_LINESIZE); | ||
92 | level1_dcache_size = data; | ||
93 | level1_dcache_assoc = handle_amd (_SC_LEVEL1_DCACHE_ASSOC); | ||
94 | level1_dcache_linesize = handle_amd (_SC_LEVEL1_DCACHE_LINESIZE); | ||
95 | @@ -833,6 +838,7 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) | ||
96 | } | ||
97 | |||
98 | cpu_features->level1_icache_size = level1_icache_size; | ||
99 | + cpu_features->level1_icache_linesize = level1_icache_linesize; | ||
100 | cpu_features->level1_dcache_size = level1_dcache_size; | ||
101 | cpu_features->level1_dcache_assoc = level1_dcache_assoc; | ||
102 | cpu_features->level1_dcache_linesize = level1_dcache_linesize; | ||
103 | diff --git a/sysdeps/x86/include/cpu-features.h b/sysdeps/x86/include/cpu-features.h | ||
104 | index 624736b40e..39a3f4f311 100644 | ||
105 | --- a/sysdeps/x86/include/cpu-features.h | ||
106 | +++ b/sysdeps/x86/include/cpu-features.h | ||
107 | @@ -874,6 +874,8 @@ struct cpu_features | ||
108 | unsigned long int rep_stosb_threshold; | ||
109 | /* _SC_LEVEL1_ICACHE_SIZE. */ | ||
110 | unsigned long int level1_icache_size; | ||
111 | + /* _SC_LEVEL1_ICACHE_LINESIZE. */ | ||
112 | + unsigned long int level1_icache_linesize; | ||
113 | /* _SC_LEVEL1_DCACHE_SIZE. */ | ||
114 | unsigned long int level1_dcache_size; | ||
115 | /* _SC_LEVEL1_DCACHE_ASSOC. */ | ||
116 | diff --git a/sysdeps/x86/tst-sysconf-cache-linesize-static.c b/sysdeps/x86/tst-sysconf-cache-linesize-static.c | ||
117 | new file mode 100644 | ||
118 | index 0000000000..152ae68821 | ||
119 | --- /dev/null | ||
120 | +++ b/sysdeps/x86/tst-sysconf-cache-linesize-static.c | ||
121 | @@ -0,0 +1 @@ | ||
122 | +#include "tst-sysconf-cache-linesize.c" | ||
123 | diff --git a/sysdeps/x86/tst-sysconf-cache-linesize.c b/sysdeps/x86/tst-sysconf-cache-linesize.c | ||
124 | new file mode 100644 | ||
125 | index 0000000000..642dbde5d2 | ||
126 | --- /dev/null | ||
127 | +++ b/sysdeps/x86/tst-sysconf-cache-linesize.c | ||
128 | @@ -0,0 +1,57 @@ | ||
129 | +/* Test system cache line sizes. | ||
130 | + Copyright (C) 2021 Free Software Foundation, Inc. | ||
131 | + This file is part of the GNU C Library. | ||
132 | + | ||
133 | + The GNU C Library is free software; you can redistribute it and/or | ||
134 | + modify it under the terms of the GNU Lesser General Public | ||
135 | + License as published by the Free Software Foundation; either | ||
136 | + version 2.1 of the License, or (at your option) any later version. | ||
137 | + | ||
138 | + The GNU C Library is distributed in the hope that it will be useful, | ||
139 | + but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
140 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
141 | + Lesser General Public License for more details. | ||
142 | + | ||
143 | + You should have received a copy of the GNU Lesser General Public | ||
144 | + License along with the GNU C Library; if not, see | ||
145 | + <https://www.gnu.org/licenses/>. */ | ||
146 | + | ||
147 | +#include <stdio.h> | ||
148 | +#include <stdlib.h> | ||
149 | +#include <unistd.h> | ||
150 | +#include <array_length.h> | ||
151 | + | ||
152 | +static struct | ||
153 | +{ | ||
154 | + const char *name; | ||
155 | + int _SC_val; | ||
156 | +} sc_options[] = | ||
157 | + { | ||
158 | +#define N(name) { "_SC_"#name, _SC_##name } | ||
159 | + N (LEVEL1_ICACHE_LINESIZE), | ||
160 | + N (LEVEL1_DCACHE_LINESIZE), | ||
161 | + N (LEVEL2_CACHE_LINESIZE) | ||
162 | + }; | ||
163 | + | ||
164 | +static int | ||
165 | +do_test (void) | ||
166 | +{ | ||
167 | + int result = EXIT_SUCCESS; | ||
168 | + | ||
169 | + for (int i = 0; i < array_length (sc_options); ++i) | ||
170 | + { | ||
171 | + long int scret = sysconf (sc_options[i]._SC_val); | ||
172 | + if (scret < 0) | ||
173 | + { | ||
174 | + printf ("sysconf (%s) returned < 0 (%ld)\n", | ||
175 | + sc_options[i].name, scret); | ||
176 | + result = EXIT_FAILURE; | ||
177 | + } | ||
178 | + else | ||
179 | + printf ("sysconf (%s): %ld\n", sc_options[i].name, scret); | ||
180 | + } | ||
181 | + | ||
182 | + return result; | ||
183 | +} | ||
184 | + | ||
185 | +#include <support/test-driver.c> | ||