May 2022 - kernel - Fedora Mailing-Lists

[OS-BUILD PATCH] Turn on KASAN_OUTLINE for ppc debug

by Justin M. Forbes (via Email Bridge)

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Turn on KASAN_OUTLINE for ppc debug Upstream commit 41b7a347bf14 forces outline-only KASAN support for Book3S. As a result we need to move PPC to outline mode in the configs or we have a mismatch. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/redhat/configs/pending-ark/debug/powerpc/CONFIG_KASAN_OUTLINE b/redhat/configs/ark/debug/powerpc/CONFIG_KASAN_OUTLINE rename from redhat/configs/pending-ark/debug/powerpc/CONFIG_KASAN_OUTLINE rename to redhat/configs/ark/debug/powerpc/CONFIG_KASAN_OUTLINE index blahblah..blahblah 100644 --- a/redhat/configs/pending-ark/debug/powerpc/CONFIG_KASAN_OUTLINE +++ b/redhat/configs/ark/debug/powerpc/CONFIG_KASAN_OUTLINE -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1836

1 year, 11 months

1
0
0 / 0

[OS-BUILD PATCH] Fix up ZSMALLOC config for s390

by Justin M. Forbes (via Email Bridge)

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Fix up ZSMALLOC config for s390 Due to some dependency changes upstream, ZSMALLOC was causing a config mismatch on s390. It is set to =y in common for all arches, but the only listed consumer used to be ZSWAP, which was disabled on s390. Now, it is selected by ZRAM which is built as a module everywhere except for s390 zfcpdump, where modules are not supported, so it is built in. As ZSWAP is not enabled on s390 at all, it seemed the best course to fix the mismatch was to make ZSMALLOC match the config for ZRAM on s390. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/redhat/configs/pending-ark/generic/s390x/CONFIG_ZSMALLOC b/redhat/configs/ark/generic/s390x/CONFIG_ZSMALLOC rename from redhat/configs/pending-ark/generic/s390x/CONFIG_ZSMALLOC rename to redhat/configs/ark/generic/s390x/CONFIG_ZSMALLOC index blahblah..blahblah 100644 --- a/redhat/configs/pending-ark/generic/s390x/CONFIG_ZSMALLOC +++ b/redhat/configs/ark/generic/s390x/CONFIG_ZSMALLOC diff --git a/redhat/configs/pending-ark/generic/s390x/zfcpdump/CONFIG_ZSMALLOC b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_ZSMALLOC rename from redhat/configs/pending-ark/generic/s390x/zfcpdump/CONFIG_ZSMALLOC rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_ZSMALLOC index blahblah..blahblah 100644 --- a/redhat/configs/pending-ark/generic/s390x/zfcpdump/CONFIG_ZSMALLOC +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_ZSMALLOC -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1830

1 year, 11 months

1
0
0 / 0

[OS-BUILD PATCH] Fix versioning on stable Fedora

by Justin M. Forbes (via Email Bridge)

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Fix versioning on stable Fedora MR 1735 indicate HEAD state in tarball/rpm name added a git tag to builds when VERSION_ON_UPSTREAM=0. While this will never impact Fedora rawhide because the os-build tree here always has VERSION_ON_UPSTREAM=1, it does impact stable Fedora branches where this is set to 0. Until I can think of a more clever way to handle this, let's just restrict it to ifneq ("$(DISTRO)", "fedora"). Tested in the fedora-5.18 branch. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -219,13 +219,15 @@ ifeq ($(VERSION_ON_UPSTREAM),1) UPSTREAM_TARBALL_NAME:=$(patsubst v%,%,$(_TAG)) endif else - SNAPSHOT:=0 - _EXACT_TAG:=$(shell $(GIT) describe --exact-match 2>/dev/null) - ifeq ($(_EXACT_TAG),) - _TAG:=$(shell $(GIT) describe 2>/dev/null) - ifneq ($(_TAG),) - _BUILDCOMMIT:=$(shell echo $(_TAG) | awk -F- '{ printf(".%s", $$(NF)) }' | cut -c 1-6) - BUILD:=$(BUILD)$(_BUILDCOMMIT) + ifneq ("$(DISTRO)", "fedora") + SNAPSHOT:=0 + _EXACT_TAG:=$(shell $(GIT) describe --exact-match 2>/dev/null) + ifeq ($(_EXACT_TAG),) + _TAG:=$(shell $(GIT) describe 2>/dev/null) + ifneq ($(_TAG),) + _BUILDCOMMIT:=$(shell echo $(_TAG) | awk -F- '{ printf(".%s", $$(NF)) }' | cut -c 1-6) + BUILD:=$(BUILD)$(_BUILDCOMMIT) + endif endif endif endif -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1823

1 year, 11 months

1
0
0 / 0

[OS-BUILD PATCHv6] redhat: indicate HEAD state in tarball/rpm name

by Jarod Wilson (via Email Bridge)

From: Jarod Wilson <jarod(a)redhat.com> redhat: indicate HEAD state in tarball/rpm name For the non-Fedora (RHEL) case, we are looking to move to a setup where we include Merge Requests as soon as they are ready, and thus the head of main may not always be a tagged build. This gives some indication to someone basing a build on main that they're basing their work on the tree at a state between tagged builds. If HEAD is a tagged build, as usual, you should see: linux-5.18.0-0.rc3.30.test.tar.xz kernel-5.18.0-0.rc3.30.test.src.rpm If HEAD has additional commits, with this change, you should see: linux-5.18.0-0.rc3.30.g0f62.test.tar.xz kernel-5.18.0-0.rc3.30.g0f62.test.src.rpm The .gSHA field is the first four chars of the HEAD sha of the branch after adding your local changes. This is directly related to: https://gitlab.com/redhat/rhel/src/kernel/rhel-8/-/merge_requests/2405 Signed-off-by: Jarod Wilson <jarod(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -217,6 +217,14 @@ ifeq ($(VERSION_ON_UPSTREAM),1) endif else SNAPSHOT:=0 + _EXACT_TAG:=$(shell $(GIT) describe --exact-match 2>/dev/null) + ifeq ($(_EXACT_TAG),) + _TAG:=$(shell $(GIT) describe 2>/dev/null) + ifneq ($(_TAG),) + _BUILDCOMMIT:=$(shell echo $(_TAG) | awk -F- '{ printf(".%s", $$(NF)) }' | cut -c 1-6) + BUILD:=$(BUILD)$(_BUILDCOMMIT) + endif + endif endif SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL) -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1735

1 year, 11 months

2
2
0 / 0

[OS-BUILD PATCHv2] fedora: enable CONFIG_PAGE_POOL_STATS

by Patrick Talbert (via Email Bridge)

From: Patrick Talbert <ptalbert(a)redhat.com> fedora: enable CONFIG_PAGE_POOL_STATS CONFIG_MVNETA selects CONFIG_PAGE_POOL_STATS so we need to turn it on. Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com> diff --git a/redhat/configs/fedora/generic/CONFIG_PAGE_POOL_STATS b/redhat/configs/fedora/generic/CONFIG_PAGE_POOL_STATS index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_PAGE_POOL_STATS +++ b/redhat/configs/fedora/generic/CONFIG_PAGE_POOL_STATS @@ -1 +1 @@ -# CONFIG_PAGE_POOL_STATS is not set +CONFIG_PAGE_POOL_STATS=y diff --git a/redhat/configs/pending-fedora/generic/CONFIG_PAGE_POOL_STATS b/redhat/configs/pending-fedora/generic/CONFIG_PAGE_POOL_STATS deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-fedora/generic/CONFIG_PAGE_POOL_STATS +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PAGE_POOL_STATS=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1821

1 year, 11 months

2
1
0 / 0

[OS-BUILD PATCHv2] redhat: Set SND_SOC_SOF_HDA_PROBES to =m

by Patrick Talbert (via Email Bridge)

From: Patrick Talbert <ptalbert(a)redhat.com> redhat: Set SND_SOC_SOF_HDA_PROBES to =m This config option changed from bool to tristate and it is selected by a module so needs to be =m. Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com> diff --git a/redhat/configs/common/debug/CONFIG_SND_SOC_SOF_HDA_PROBES b/redhat/configs/common/debug/CONFIG_SND_SOC_SOF_HDA_PROBES index blahblah..blahblah 100644 --- a/redhat/configs/common/debug/CONFIG_SND_SOC_SOF_HDA_PROBES +++ b/redhat/configs/common/debug/CONFIG_SND_SOC_SOF_HDA_PROBES @@ -1 +1 @@ -CONFIG_SND_SOC_SOF_HDA_PROBES=y +CONFIG_SND_SOC_SOF_HDA_PROBES=m diff --git a/redhat/configs/pending-ark/debug/CONFIG_SND_SOC_SOF_HDA_PROBES b/redhat/configs/pending-ark/debug/CONFIG_SND_SOC_SOF_HDA_PROBES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/debug/CONFIG_SND_SOC_SOF_HDA_PROBES +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_SOC_SOF_HDA_PROBES=m diff --git a/redhat/configs/pending-fedora/debug/CONFIG_SND_SOC_SOF_HDA_PROBES b/redhat/configs/pending-fedora/debug/CONFIG_SND_SOC_SOF_HDA_PROBES deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-fedora/debug/CONFIG_SND_SOC_SOF_HDA_PROBES +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_SOC_SOF_HDA_PROBES=m -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1822

1 year, 11 months

1
0
0 / 0

[OS-BUILD PATCH] redhat: Set SND_SOC_SOF_HDA_PROBES to =m

by Patrick Talbert (via Email Bridge)

From: Patrick Talbert <ptalbert(a)redhat.com> redhat: Set SND_SOC_SOF_HDA_PROBES to =m This config option changed from bool to tristate and it is selected by a module so needs to be =m Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com> diff --git a/redhat/configs/common/debug/CONFIG_SND_SOC_SOF_HDA_PROBES b/redhat/configs/common/debug/CONFIG_SND_SOC_SOF_HDA_PROBES index blahblah..blahblah 100644 --- a/redhat/configs/common/debug/CONFIG_SND_SOC_SOF_HDA_PROBES +++ b/redhat/configs/common/debug/CONFIG_SND_SOC_SOF_HDA_PROBES @@ -1 +1 @@ -CONFIG_SND_SOC_SOF_HDA_PROBES=y +CONFIG_SND_SOC_SOF_HDA_PROBES=m -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1822

1 year, 11 months

1
0
0 / 0

[OS-BUILD PATCH] fedora: enable CONFIG_PAGE_POOL_STATS

by Patrick Talbert (via Email Bridge)

From: Patrick Talbert <ptalbert(a)redhat.com> fedora: enable CONFIG_PAGE_POOL_STATS CONFIG_MVNETA selects CONFIG_PAGE_POOL_STATS so we need to turn it on. Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com> diff --git a/redhat/configs/fedora/generic/CONFIG_PAGE_POOL_STATS b/redhat/configs/fedora/generic/CONFIG_PAGE_POOL_STATS index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_PAGE_POOL_STATS +++ b/redhat/configs/fedora/generic/CONFIG_PAGE_POOL_STATS @@ -1 +1 @@ -# CONFIG_PAGE_POOL_STATS is not set +CONFIG_PAGE_POOL_STATS=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1821

1 year, 11 months

1
0
0 / 0

[OS-BUILD PATCHv2 0/2] Revert random: Add hook to override device reads and getrandom(2)

by Justin M. Forbes (via Email Bridge)

From: Justin M. Forbes on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1809 The random system upstream is in a period of major rewrite. In the 5.18 merge window, it took a considerable amount of time to message this into the random.c rewrites. In the 5.19 merge window, rng->extrng_read(buf, count); does not even compile, with buf and count undefined. As I do not see the subsequent patch that allows the override with a FIPS rng, I am just reverting the whole thing, and it can be added back when Herbert has time or motivation to do so. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> --- crypto/rng.c | 73 +------------------------------- drivers/char/random.c | 113 ------------------------------------------------- include/linux/random.h | 8 --- 3 files changed, 1 insertions(+), 193 deletions(-)

1 year, 11 months

1
3
0 / 0

[OS-BUILD PATCH] Revert random: Add hook to override device reads and getrandom(2)

by Justin M. Forbes (via Email Bridge)

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Revert random: Add hook to override device reads and getrandom(2) The random system upstream is in a period of major rewrite. In the 5.18 merge window, it took a considerable amount of time to message this into the random.c rewrites. In the 5.19 merge window, rng->extrng_read(buf, count); does not even compile, with buf and count undefined. As I do not see the subsequent patch that allows the override with a FIPS rng, I am just reverting the whole thing, and it can be added back when Herbert has time or motivation to do so. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/drivers/char/random.c b/drivers/char/random.c index blahblah..blahblah 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -53,7 +53,6 @@ #include <linux/uaccess.h> #include <linux/suspend.h> #include <linux/siphash.h> -#include <linux/rcupdate.h> #include <crypto/chacha.h> #include <crypto/blake2s.h> #include <asm/processor.h> @@ -282,11 +281,6 @@ static bool crng_has_old_seed(void) return time_is_before_jiffies(READ_ONCE(base_crng.birth) + interval); } -/* - * Hook for external RNG. - */ -static const struct random_extrng __rcu *extrng; - /* * This function returns a ChaCha state that you may use for generating * random data. It also returns up to 32 bytes on its own of random data @@ -675,9 +669,6 @@ static void __cold _credit_init_bits(size_t bits) } -static const struct file_operations extrng_random_fops; -static const struct file_operations extrng_urandom_fops; - /********************************************************************** * * Entropy collection routines. @@ -882,19 +873,6 @@ void __cold add_bootloader_randomness(const void *buf, size_t len) } EXPORT_SYMBOL_GPL(add_bootloader_randomness); -void random_register_extrng(const struct random_extrng *rng) -{ - rcu_assign_pointer(extrng, rng); -} -EXPORT_SYMBOL_GPL(random_register_extrng); - -void random_unregister_extrng(void) -{ - RCU_INIT_POINTER(extrng, NULL); - synchronize_rcu(); -} -EXPORT_SYMBOL_GPL(random_unregister_extrng); - #if IS_ENABLED(CONFIG_VMGENID) static BLOCKING_NOTIFIER_HEAD(vmfork_chain); @@ -1265,7 +1243,6 @@ SYSCALL_DEFINE3(getrandom, char __user *, ubuf, size_t, len, unsigned int, flags struct iov_iter iter; struct iovec iov; int ret; - const struct random_extrng *rng; if (flags & ~(GRND_NONBLOCK | GRND_RANDOM | GRND_INSECURE)) return -EINVAL; @@ -1277,18 +1254,6 @@ SYSCALL_DEFINE3(getrandom, char __user *, ubuf, size_t, len, unsigned int, flags if ((flags & (GRND_INSECURE | GRND_RANDOM)) == (GRND_INSECURE | GRND_RANDOM)) return -EINVAL; - rcu_read_lock(); - rng = rcu_dereference(extrng); - if (rng && !try_module_get(rng->owner)) - rng = NULL; - rcu_read_unlock(); - - if (rng) { - ret = rng->extrng_read(buf, count); - module_put(rng->owner); - return ret; - } - if (!crng_ready() && !(flags & GRND_INSECURE)) { if (flags & GRND_NONBLOCK) return -EAGAIN; @@ -1309,12 +1274,6 @@ static __poll_t random_poll(struct file *file, poll_table *wait) return crng_ready() ? EPOLLIN | EPOLLRDNORM : EPOLLOUT | EPOLLWRNORM; } -static __poll_t extrng_poll(struct file *file, poll_table * wait) -{ - /* extrng pool is always full, always read, no writes */ - return EPOLLIN | EPOLLRDNORM; -} - static ssize_t write_pool_user(struct iov_iter *iter) { u8 block[BLAKE2S_BLOCK_SIZE]; @@ -1451,58 +1410,7 @@ static int random_fasync(int fd, struct file *filp, int on) return fasync_helper(fd, filp, on, &fasync); } -static int random_open(struct inode *inode, struct file *filp) -{ - const struct random_extrng *rng; - - rcu_read_lock(); - rng = rcu_dereference(extrng); - if (rng && !try_module_get(rng->owner)) - rng = NULL; - rcu_read_unlock(); - - if (!rng) - return 0; - - filp->f_op = &extrng_random_fops; - filp->private_data = rng->owner; - - return 0; -} - -static int urandom_open(struct inode *inode, struct file *filp) -{ - const struct random_extrng *rng; - - rcu_read_lock(); - rng = rcu_dereference(extrng); - if (rng && !try_module_get(rng->owner)) - rng = NULL; - rcu_read_unlock(); - - if (!rng) - return 0; - - filp->f_op = &extrng_urandom_fops; - filp->private_data = rng->owner; - - return 0; -} - -static int extrng_release(struct inode *inode, struct file *filp) -{ - module_put(filp->private_data); - return 0; -} - -static ssize_t -extrng_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) -{ - return rcu_dereference_raw(extrng)->extrng_read(buf, nbytes); -} - const struct file_operations random_fops = { - .open = random_open, .read_iter = random_read_iter, .write_iter = random_write_iter, .poll = random_poll, @@ -1515,7 +1423,6 @@ const struct file_operations random_fops = { }; const struct file_operations urandom_fops = { - .open = urandom_open, .read_iter = urandom_read_iter, .write_iter = random_write_iter, .unlocked_ioctl = random_ioctl, @@ -1526,26 +1433,6 @@ const struct file_operations urandom_fops = { .splice_write = iter_file_splice_write, }; -static const struct file_operations extrng_random_fops = { - .open = random_open, - .read = extrng_read, - .write = random_write, - .poll = extrng_poll, - .unlocked_ioctl = random_ioctl, - .fasync = random_fasync, - .llseek = noop_llseek, - .release = extrng_release, -}; - -static const struct file_operations extrng_urandom_fops = { - .open = urandom_open, - .read = extrng_read, - .write = random_write, - .unlocked_ioctl = random_ioctl, - .fasync = random_fasync, - .llseek = noop_llseek, - .release = extrng_release, -}; /******************************************************************** * diff --git a/include/linux/random.h b/include/linux/random.h index blahblah..blahblah 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -10,11 +10,6 @@ #include <uapi/linux/random.h> -struct random_extrng { - ssize_t (*extrng_read)(void __user *buf, size_t buflen); - struct module *owner; -}; - struct notifier_block; void add_device_randomness(const void *buf, size_t len); @@ -146,9 +141,6 @@ int random_prepare_cpu(unsigned int cpu); int random_online_cpu(unsigned int cpu); #endif -void random_register_extrng(const struct random_extrng *rng); -void random_unregister_extrng(void); - #ifndef MODULE extern const struct file_operations random_fops, urandom_fops; #endif -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1809

1 year, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel May 2022