kernel June 2021

kernel@lists.fedoraproject.org

6 participants
68 discussions

[OS-BUILD PATCH 0/0] Fedora: upstream fixes and enable rk3399 pcie drivers
by pbrobinson (via Email Bridge) 29 Jun '21

29 Jun '21

From: pbrobinson on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1176 NOTE: Truncated patchset due to missing public @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. Add upstream patches destined for 5.14 for Fedora's 5.13 kernel and enable the PCIE driver to resolve the long standing issue of not having PCIE enabled for Rockchip rk3399 SoCs such as the Pinebook Pro. Fixes: RHBZ #1704945 Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com> --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- drivers/pci/controller/pcie-rockchip-host.c | 12 ++++---- drivers/pci/of.c | 17 +++++++++--- redhat/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP_HOST | 2 +- redhat/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_PCIE | 2 +- 5 files changed, 21 insertions(+), 14 deletions(-)

5 5

[OS-BUILD PATCH 0/0] [redhat] New configs in arch/arm64
by CKI Gitlab (via Email Bridge) 29 Jun '21

29 Jun '21

From: CKI Gitlab on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1190 NOTE: Truncated patchset due to missing public @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. Hi, As part of the ongoing rebase effort, the following configuration options need to be reviewed. As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy. If the value for a file that is added should be changed, please reply with a better option. CONFIG_ARM64_PTR_AUTH_KERNEL: If the compiler supports the -mbranch-protection or -msign-return-address flag (e.g. GCC 7 or later), then this option will cause the kernel itself to be compiled with return address protection. In this case, and if the target hardware is known to support pointer authentication, then CONFIG_STACKPROTECTOR can be disabled with minimal loss of protection. This feature works with FUNCTION_GRAPH_TRACER option only if DYNAMIC_FTRACE_WITH_REGS is enabled. Symbol: ARM64_PTR_AUTH_KERNEL [=y] Type : bool Defined at arch/arm64/Kconfig:1506 Prompt: Use pointer authentication for kernel Depends on: ARM64_PTR_AUTH [=y] && (CC_HAS_SIGN_RETURN_ADDRESS [=y] || CC_HAS_BRANCH_PROT_PAC_RET [=y]) && AS_HAS_PAC [=y] && (LD_IS_LLD [=n] || LD_VERSION [=25000]>=23301 || CC_IS_GCC [=y] && GCC_VERSION [=200000]<90100) && (!CC_IS_CLANG [=n] || AS_HAS_CFI_NEGATE_RA_STATE [=y]) && (!FUNCTION_GRAPH_TRACER [=y] || DYNAMIC_FTRACE_WITH_REGS [=y]) Location: -> Kernel Features -> ARMv8.3 architectural features -> Enable support for pointer authentication (ARM64_PTR_AUTH [=y]) --- Cc: Mark Salter <msalter(a)redhat.com> Cc: Mark Langsdorf <mlangsdo(a)redhat.com> Cc: Jeremy Linton <jlinton(a)redhat.com> Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org> --- redhat/configs/common/generic/arm/aarch64/CONFIG_ARM64_PTR_AUTH_KERNEL | 1 + redhat/configs/pending-common/generic/CONFIG_ARM64_PTR_AUTH_KERNEL | 25 ---------- 2 files changed, 1 insertions(+), 25 deletions(-)

2 1

Kernel-ark os-build branch has been rebased
by Justin Forbes 29 Jun '21

29 Jun '21

If you have a pending merge request, you will need to rebase your source tree and force push so that things will cleanly merge. While this is the first time we have done this for os-build, we expect to keep it up as a cadence with every upstream release. This means we will do it again when 5.14 releases, and again with 5.15... It is difficult to manage a regularly rebased tree, because any outstanding MR is invalidated and has to also be rebased. But not doing somewhat regular rebases can also be difficult in the spirit of the openness that Fedora is based upon. While there are plenty of ways to see which patches we carry compared to upstream, some of those patches are fairly old, and would not apply cleanly at all to a modern tree after several releases were merged in with them. As we have gotten into a flow of things with merge requests, we can get to the point of very few outstanding MRs towards the end of a release cycle, and that makes it an opportune time to rebase the tree. This also means that the patches we carry should be no more than 1 release out of date, making them easier to apply to various other trees. I do realize that this is a minor inconvenience every 2-3 months, but I believe the results are worth it. Thanks, Justin

3 2

[OS-BUILD PATCH 0/7] redhat/configs: Update RHEL9/ARK/Fedora s390x kernel config switches
by Thomas Huth (via Email Bridge) 29 Jun '21

29 Jun '21

From: Thomas Huth on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1976270 While comparing the s390x config switches between RHEL8 and RHEL9, we found some settings that need to be changed, and the location of some other switches could be improved (e.g. by consolidating the settings between Fedora and ARK) Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- redhat/configs/ark/generic/CONFIG_HW_RANDOM_S390 => redhat/configs/ark/generic/s390x/CONFIG_HW_RANDOM_S390 | 0 redhat/configs/ark/generic/s390x/CONFIG_NO_BOOTMEM | 1 - redhat/configs/ark/generic/s390x/CONFIG_S390_CCW_IOMMU | 1 - redhat/configs/ark/generic/s390x/CONFIG_EXPOLINE_OFF => redhat/configs/common/generic/s390x/CONFIG_EXPOLINE_OFF | 0 redhat/configs/ark/generic/s390x/CONFIG_HMC_DRV => redhat/configs/common/generic/s390x/CONFIG_HMC_DRV | 0 redhat/configs/fedora/generic/s390x/CONFIG_S390_CCW_IOMMU => redhat/configs/common/generic/s390x/CONFIG_S390_CCW_IOMMU | 0 redhat/configs/fedora/generic/s390x/CONFIG_VFIO_CCW => redhat/configs/common/generic/s390x/CONFIG_VFIO_CCW | 0 redhat/configs/common/generic/s390x/CONFIG_VIRTIO_CONSOLE | 1 - redhat/configs/fedora/generic/s390x/CONFIG_HMC_DRV | 1 - redhat/configs/fedora/generic/s390x/CONFIG_HOTPLUG_PCI_SHPC | 1 - redhat/configs/fedora/generic/CONFIG_EXPOLINE_OFF | 1 - redhat/configs/fedora/generic/CONFIG_HMC_DRV | 1 - 12 files changed, 0 insertions(+), 7 deletions(-)

4 12

The 5.13 kernel and Fedora
by Justin Forbes 28 Jun '21

28 Jun '21

With 5.13 having been officially released, we will work towards the typical path of stabilizing 5.13 for rebases. This means a test week in about 2 weeks, and Fedora 33 and 34 will rebase to a 5.13 kernel shortly after the test week, depending on the feedback we get. I have created a branch in the kernel-ark repository where 5.13 will be maintained. I am accepting merge requests into the fedora-5.13 branch right now. Unfortunately, that branch is not properly buildable until 5.13.1 is released. At some point I should update our scripts to be a bit more flexible. Also of note, the os-build branch has been fully rebased on top of 5.13 so that our patches are not so out of date. More information on that will follow shortly, but do not be surprised when a simple git pull will not work. Thanks, Justin

1 0

[OS-BUILD PATCH 0/2] Revert PCI rockchip changes that weren't merged upstream
by Herton R. Krzesinski (via Email Bridge) 28 Jun '21

28 Jun '21

From: Herton R. Krzesinski on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1187 Some PCI rockchip changes from a previous merged changed were dropped/not included upstream in v5.13. This is explained on this post: https://lore.kernel.org/linux- pci/20210614230457.752811-1-punitagrawal(a)gmail.com/ This MR reverts those changes. A diff between drivers/pci/of.c of upstream and ARK is clean now. Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> --- drivers/pci/of.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)

5 7

[OS-BUILD PATCH] Revert "powerpc: Switch to relative jump labels"
by Don Zickus (via Email Bridge) 28 Jun '21

28 Jun '21

From: Don Zickus <dzickus(a)redhat.com> Revert "powerpc: Switch to relative jump labels" This reverts commit b0b3b2c78ec075cec4721986a95abbbac8c3da4f. diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index blahblah..blahblah 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -189,7 +189,6 @@ config PPC select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP select HAVE_ARCH_HUGE_VMAP if PPC_BOOK3S_64 && PPC_RADIX_MMU select HAVE_ARCH_JUMP_LABEL - select HAVE_ARCH_JUMP_LABEL_RELATIVE select HAVE_ARCH_KASAN if PPC32 && PPC_PAGE_SHIFT <= 14 select HAVE_ARCH_KASAN_VMALLOC if PPC32 && PPC_PAGE_SHIFT <= 14 select HAVE_ARCH_KFENCE if PPC32 diff --git a/arch/powerpc/include/asm/jump_label.h b/arch/powerpc/include/asm/jump_label.h index blahblah..blahblah 100644 --- a/arch/powerpc/include/asm/jump_label.h +++ b/arch/powerpc/include/asm/jump_label.h @@ -20,8 +20,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran asm_volatile_goto("1:\n\t" "nop # arch_static_branch\n\t" ".pushsection __jump_table, \"aw\"\n\t" - ".long 1b - ., %l[l_yes] - .\n\t" - JUMP_ENTRY_TYPE "%c0 - .\n\t" + JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t" ".popsection \n\t" : : "i" (&((char *)key)[branch]) : : l_yes); @@ -35,8 +34,7 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool asm_volatile_goto("1:\n\t" "b %l[l_yes] # arch_static_branch_jump\n\t" ".pushsection __jump_table, \"aw\"\n\t" - ".long 1b - ., %l[l_yes] - .\n\t" - JUMP_ENTRY_TYPE "%c0 - .\n\t" + JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t" ".popsection \n\t" : : "i" (&((char *)key)[branch]) : : l_yes); @@ -45,12 +43,23 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool return true; } +#ifdef CONFIG_PPC64 +typedef u64 jump_label_t; +#else +typedef u32 jump_label_t; +#endif + +struct jump_entry { + jump_label_t code; + jump_label_t target; + jump_label_t key; +}; + #else #define ARCH_STATIC_BRANCH(LABEL, KEY) \ 1098: nop; \ .pushsection __jump_table, "aw"; \ - .long 1098b - ., LABEL - .; \ - FTR_ENTRY_LONG KEY; \ + FTR_ENTRY_LONG 1098b, LABEL, KEY; \ .popsection #endif diff --git a/arch/powerpc/kernel/jump_label.c b/arch/powerpc/kernel/jump_label.c index blahblah..blahblah 100644 --- a/arch/powerpc/kernel/jump_label.c +++ b/arch/powerpc/kernel/jump_label.c @@ -11,10 +11,10 @@ void arch_jump_label_transform(struct jump_entry *entry, enum jump_label_type type) { - struct ppc_inst *addr = (struct ppc_inst *)jump_entry_code(entry); + struct ppc_inst *addr = (struct ppc_inst *)(unsigned long)entry->code; if (type == JUMP_LABEL_JMP) - patch_branch(addr, jump_entry_target(entry), 0); + patch_branch(addr, entry->target, 0); else patch_instruction(addr, ppc_inst(PPC_INST_NOP)); } -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1173

3 4

[OS-BUILD PATCH 0/0] fedora: minor cleanups
by pbrobinson (via Email Bridge) 28 Jun '21

28 Jun '21

From: pbrobinson on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1186 NOTE: Truncated patchset due to missing public @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. Just a couple of minor cleanups for 5.13. Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com> --- redhat/configs/fedora/generic/CONFIG_MODULE_COMPRESS_GZIP | 17 ------------ redhat/configs/fedora/generic/CONFIG_MODULE_COMPRESS_NONE | 17 ------------ redhat/configs/fedora/generic/CONFIG_MODULE_COMPRESS_XZ | 17 ------------ redhat/configs/fedora/generic/CONFIG_MODULE_COMPRESS_ZSTD | 17 ------------ redhat/configs/fedora/generic/CONFIG_TCG_TIS_I2C_CR50 | 20 --------------- 5 files changed, 0 insertions(+), 88 deletions(-)

2 1

[OS-BUILD PATCH] mod-denylist.sh: Change to denylist
by Prarit Bhargava (via Email Bridge) 26 Jun '21

26 Jun '21

From: Prarit Bhargava <prarit(a)redhat.com> mod-denylist.sh: Change to denylist Change blacklist references to denylist. Suggested-by: Brian Masney <bmasney(a)redhat.com> Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/mod-denylist.sh b/redhat/mod-denylist.sh index blahblah..blahblah 100755 --- a/redhat/mod-denylist.sh +++ b/redhat/mod-denylist.sh @@ -10,20 +10,20 @@ Dir="$1/$2" List=$3 Dest="$4" -blacklist() +denylist() { - cat > "$RpmDir/etc/modprobe.d/$1-blacklist.conf" <<-__EOF__ + cat > "$RpmDir/etc/modprobe.d/$1-denylist.conf" <<-__EOF__ # This kernel module can be automatically loaded by non-root users. To - # enhance system security, the module is blacklisted by default to ensure + # enhance system security, the module is denylisted by default to ensure # system administrators make the module available for use as needed. # See https://access.redhat.com/articles/3760101 for more details. # - # Remove the blacklist by adding a comment # at the start of the line. - blacklist $1 + # Remove the denylist by adding a comment # at the start of the line. + denylist $1 __EOF__ } -check_blacklist() +check_denylist() { mod=$(find "$RpmDir/$ModDir" -name "$1") [ ! "$mod" ] && return 0 @@ -31,7 +31,7 @@ check_blacklist() mod="${1##*/}" mod="${mod%.ko*}" echo "$mod has an alias that allows auto-loading. Blacklisting." - blacklist "$mod" + denylist "$mod" fi } @@ -142,7 +142,7 @@ if [ -z "$Dest" ]; then sed -e "s|^.|${ModDir}|g" "$Dir"/dep2.list > "$RpmDir/$ListName" echo "./$RpmDir/$ListName created." [ -d "$RpmDir/etc/modprobe.d/" ] || mkdir -p "$RpmDir/etc/modprobe.d/" - foreachp check_blacklist < "$List" + foreachp check_denylist < "$List" fi # Many BIOS-es export a PNP-id which causes the floppy driver to autoload @@ -152,7 +152,7 @@ fi floppylist=("$RpmDir"/"$ModDir"/kernel/drivers/block/floppy.ko*) if [[ -n ${floppylist[0]} && -f ${floppylist[0]} ]]; then - blacklist "floppy" + denylist "floppy" fi # avoid an empty kernel-extra package -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1185

3 2

[OS-BUILD PATCHv3] redhat/configs: enable CONFIG_BLK_DEV_ZONED
by Ming Lei (via Email Bridge) 25 Jun '21

25 Jun '21

From: Ming Lei <ming.lei(a)redhat.com> redhat/configs: enable CONFIG_BLK_DEV_ZONED Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1638087 This option has been enabled in Fedora already. Also it is mentioned in this BZ that 'our current plan is to enable this in RHEL 9 first', so enable this option in redhat/configs/common so that people can use ZNS via userspace or play it via nvme-cli. Signed-off-by: Ming Lei <ming.lei(a)redhat.com> diff --git a/redhat/configs/ark/generic/CONFIG_BLK_DEV_ZONED b/redhat/configs/ark/generic/CONFIG_BLK_DEV_ZONED deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_BLK_DEV_ZONED +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_BLK_DEV_ZONED is not set diff --git a/redhat/configs/fedora/generic/CONFIG_BLK_DEV_ZONED b/redhat/configs/common/generic/CONFIG_BLK_DEV_ZONED rename from redhat/configs/fedora/generic/CONFIG_BLK_DEV_ZONED rename to redhat/configs/common/generic/CONFIG_BLK_DEV_ZONED index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_BLK_DEV_ZONED +++ b/redhat/configs/common/generic/CONFIG_BLK_DEV_ZONED -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1182

2 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel June 2021