Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2022-09-06 13:00:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Tue Sep 6 13:00:39 2022 rev:655 rq:1001256 version:5.19.7 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2022-08-20 20:28:22.785305519 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new.2083/dtb-aarch64.changes 2022-09-06 13:00:41.238914594 +0200 @@ -1,0 +2,1192 @@ +Mon Sep 5 12:31:36 CEST 2022 - jsl...@suse.cz + +- Revert "btrfs: check if root is readonly while setting security + xattr" (bsc#1203114). +- commit 2b3da49 + +------------------------------------------------------------------- +Mon Sep 5 12:14:43 CEST 2022 - jsl...@suse.cz + +- Linux 5.19.7 (bsc#1012628). +- arm64: cacheinfo: Fix incorrect assignment of signed error + value to unsigned fw_level (bsc#1012628). +- net: neigh: don't call kfree_skb() under spin_lock_irqsave() + (bsc#1012628). +- net/af_packet: check len when min_header_len equals to 0 + (bsc#1012628). +- android: binder: fix lockdep check on clearing vma + (bsc#1012628). +- btrfs: tree-checker: check for overlapping extent items + (bsc#1012628). +- btrfs: fix lockdep splat with reloc root extent buffers + (bsc#1012628). +- btrfs: move lockdep class helpers to locking.c (bsc#1012628). +- ALSA: hda/cs8409: Support new Dolphin Variants (bsc#1012628). +- platform/x86: serial-multi-instantiate: Add CLSA0101 Laptop + (bsc#1012628). +- testing: selftests: nft_flowtable.sh: use random netns names + (bsc#1012628). +- netfilter: conntrack: NF_CONNTRACK_PROCFS should no longer + default to y (bsc#1012628). +- drm/amdgpu: Fix interrupt handling on ih_soft ring + (bsc#1012628). +- drm/amdgpu: Add secure display TA load for Renoir (bsc#1012628). +- drm/amdgpu: Add decode_iv_ts helper for ih_v6 block + (bsc#1012628). +- drm/amd/display: avoid doing vm_init multiple time + (bsc#1012628). +- drm/amd/display: Fix plug/unplug external monitor will hang + while playback MPO video (bsc#1012628). +- drm/amdgpu: Increase tlb flush timeout for sriov (bsc#1012628). +- drm/amd/display: Fix pixel clock programming (bsc#1012628). +- drm/amd/pm: add missing ->fini_xxxx interfaces for some SMU13 + asics (bsc#1012628). +- drm/amd/pm: add missing ->fini_microcode interface for Sienna + Cichlid (bsc#1012628). +- drm/amdgpu: disable 3DCGCG/CGLS temporarily due to stability + issue (bsc#1012628). +- ksmbd: don't remove dos attribute xattr on O_TRUNC open + (bsc#1012628). +- s390/hypfs: avoid error message under KVM (bsc#1012628). +- ALSA: hda/realtek: Add quirks for ASUS Zenbooks using CS35L41 + (bsc#1012628). +- neigh: fix possible DoS due to net iface start/stop loop + (bsc#1012628). +- net: lan966x: fix checking for return value of + platform_get_irq_byname() (bsc#1012628). +- ksmbd: return STATUS_BAD_NETWORK_NAME error status if share + is not configured (bsc#1012628). +- drm/amd/pm: Fix a potential gpu_metrics_table memory leak + (bsc#1012628). +- drm/amdkfd: Handle restart of kfd_ioctl_wait_events + (bsc#1012628). +- drm/amd/pm: skip pptable override for smu_v13_0_7 (bsc#1012628). +- drm/amd/display: Fix TDR eDP and USB4 display light up issue + (bsc#1012628). +- drm/amd/display: clear optc underflow before turn off odm clock + (bsc#1012628). +- drm/amd/display: For stereo keep "FLIP_ANY_FRAME" (bsc#1012628). +- drm/amd/display: Fix HDMI VSIF V3 incorrect issue (bsc#1012628). +- drm/amd/display: Avoid MPC infinite loop (bsc#1012628). +- drm/amd/display: Device flash garbage before get in OS + (bsc#1012628). +- drm/amd/display: Add a missing register field for HPO DP stream + encoder (bsc#1012628). +- rtla: Fix tracer name (bsc#1012628). +- ASoC: rt5640: Fix the JD voltage dropping issue (bsc#1012628). +- ASoC: sh: rz-ssi: Improve error handling in rz_ssi_probe() + error path (bsc#1012628). +- fs/ntfs3: Fix work with fragmented xattr (bsc#1012628). +- mmc: sdhci-of-dwcmshc: Re-enable support for the BlueField-3 + SoC (bsc#1012628). +- mmc: sdhci-of-dwcmshc: rename rk3568 to rk35xx (bsc#1012628). +- mmc: sdhci-of-dwcmshc: add reset call back for rockchip Socs + (bsc#1012628). +- mmc: mtk-sd: Clear interrupts when cqe off/disable + (bsc#1012628). +- HID: intel-ish-hid: ipc: Add Meteor Lake PCI device ID + (bsc#1012628). +- HID: thrustmaster: Add sparco wheel and fix array length + (bsc#1012628). +- HID: nintendo: fix rumble worker null pointer deref + (bsc#1012628). +- HID: asus: ROG NKey: Ignore portion of 0x5a report + (bsc#1012628). +- HID: Add Apple Touchbar on T2 Macs in hid_have_special_driver + list (bsc#1012628). +- HID: AMD_SFH: Add a DMI quirk entry for Chromebooks + (bsc#1012628). +- HID: add Lenovo Yoga C630 battery quirk (bsc#1012628). +- HID: input: fix uclogic tablets (bsc#1012628). +- ALSA: usb-audio: Add quirk for LH Labs Geek Out HD Audio 1V5 + (bsc#1012628). +- mm/rmap: Fix anon_vma->degree ambiguity leading to double-reuse + (bsc#1012628). +- bpf: Don't redirect packets with invalid pkt_len (bsc#1012628). +- ftrace: Fix NULL pointer dereference in is_ftrace_trampoline + when ftrace is dead (bsc#1012628). +- fbdev: fb_pm2fb: Avoid potential divide by zero error + (bsc#1012628). +- net: fix refcount bug in sk_psock_get (2) (bsc#1012628). +- HID: hidraw: fix memory leak in hidraw_release() (bsc#1012628). +- USB: gadget: Fix use-after-free Read in usb_udc_uevent() + (bsc#1012628). +- media: pvrusb2: fix memory leak in pvr_probe (bsc#1012628). +- udmabuf: Set the DMA mask for the udmabuf device (v2) + (bsc#1012628). +- HID: steam: Prevent NULL pointer dereference in + steam_{recv,send}_report (bsc#1012628). +- Revert "PCI/portdrv: Don't disable AER reporting in + get_port_device_capability()" (bsc#1012628). +- Bluetooth: L2CAP: Fix build errors in some archs (bsc#1012628). +- arm64: errata: Add Cortex-A510 to the repeat tlbi list + (bsc#1012628). +- Update config files. + Set CONFIG_ARM64_ERRATUM_2441009=y as per default. +- docs: kerneldoc-preamble: Test xeCJK.sty before loading + (bsc#1012628). +- crypto: lib - remove unneeded selection of XOR_BLOCKS + (bsc#1012628). +- firmware: tegra: bpmp: Do only aligned access to IPC memory area + (bsc#1012628). +- drm/vc4: hdmi: Depends on CONFIG_PM (bsc#1012628). +- drm/vc4: hdmi: Rework power up (bsc#1012628). +- commit 6d5067d + +------------------------------------------------------------------- +Thu Sep 1 08:37:32 CEST 2022 - jsl...@suse.cz + +- rpm/kernel-source.spec.in: simplify finding of broken symlinks + "find -xtype l" will report them, so use that to make the search a bit + faster (without using shell). +- commit 13bbc51 + +------------------------------------------------------------------- +Thu Sep 1 07:18:53 CEST 2022 - jsl...@suse.cz + +- Linux 5.19.6 (bsc#1012628). +- NFS: Fix another fsync() issue after a server reboot + (bsc#1012628). +- audit: fix potential double free on error path from + fsnotify_add_inode_mark (bsc#1012628). +- cgroup: Fix race condition at rebind_subsystems() (bsc#1012628). +- parisc: Make CONFIG_64BIT available for ARCH=parisc64 only + (bsc#1012628). +- parisc: Fix exception handler for fldw and fstw instructions + (bsc#1012628). +- kernel/sys_ni: add compat entry for fadvise64_64 (bsc#1012628). +- kprobes: don't call disarm_kprobe() for disabled kprobes + (bsc#1012628). +- mm/uffd: reset write protection when unregister with wp-mode + (bsc#1012628). +- mm/hugetlb: support write-faults in shared mappings + (bsc#1012628). +- mt76: mt7921: fix command timeout in AP stop period + (bsc#1012628). +- xfrm: fix refcount leak in __xfrm_policy_check() (bsc#1012628). +- Revert "xfrm: update SA curlft.use_time" (bsc#1012628). +- xfrm: clone missing x->lastused in xfrm_do_migrate + (bsc#1012628). +- af_key: Do not call xfrm_probe_algs in parallel (bsc#1012628). +- xfrm: policy: fix metadata dst->dev xmit null pointer + dereference (bsc#1012628). +- fs: require CAP_SYS_ADMIN in target namespace for idmapped + mounts (bsc#1012628). +- Revert "net: macsec: update SCI upon MAC address + change." (bsc#1012628). +- NFSv4.2 fix problems with __nfs42_ssc_open (bsc#1012628). +- SUNRPC: RPC level errors should set task->tk_rpc_status + (bsc#1012628). +- mm/smaps: don't access young/dirty bit if pte unpresent + (bsc#1012628). +- ntfs: fix acl handling (bsc#1012628). +- rose: check NULL rose_loopback_neigh->loopback (bsc#1012628). +- r8152: fix the units of some registers for RTL8156A + (bsc#1012628). +- r8152: fix the RX FIFO settings when suspending (bsc#1012628). +- nfc: pn533: Fix use-after-free bugs caused by pn532_cmd_timeout + (bsc#1012628). +- ice: xsk: prohibit usage of non-balanced queue id (bsc#1012628). +- ice: xsk: use Rx ring's XDP ring when picking NAPI context + (bsc#1012628). +- net/mlx5e: Properly disable vlan strip on non-UL reps + (bsc#1012628). +- net/mlx5: LAG, fix logic over MLX5_LAG_FLAG_NDEVS_READY + (bsc#1012628). +- net/mlx5: Eswitch, Fix forwarding decision to uplink + (bsc#1012628). ++++ 1024 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.2083/dtb-aarch64.changes dtb-armv6l.changes: same change dtb-armv7l.changes: same change dtb-riscv64.changes: same change kernel-64kb.changes: same change kernel-debug.changes: same change kernel-default.changes: same change kernel-docs.changes: same change kernel-kvmsmall.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-zfcpdump.changes: same change New: ---- linux-5.19.tar.sign linux.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:47.490930379 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:47.494930390 +0200 @@ -17,7 +17,7 @@ %define srcversion 5.19 -%define patchversion 5.19.2 +%define patchversion 5.19.7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -29,9 +29,9 @@ %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build}) Name: dtb-aarch64 -Version: 5.19.2 +Version: 5.19.7 %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif @@ -114,6 +114,73 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 +# These files are found in the kernel-source package: +NoSource: 0 +NoSource: 3 +NoSource: 14 +NoSource: 16 +NoSource: 17 +NoSource: 21 +NoSource: 23 +NoSource: 33 +NoSource: 35 +NoSource: 36 +NoSource: 37 +NoSource: 38 +NoSource: 39 +NoSource: 40 +NoSource: 46 +NoSource: 47 +NoSource: 48 +NoSource: 49 +NoSource: 50 +NoSource: 51 +NoSource: 52 +NoSource: 53 +NoSource: 54 +NoSource: 55 +NoSource: 56 +NoSource: 57 +NoSource: 58 +NoSource: 60 +NoSource: 61 +NoSource: 62 +NoSource: 63 +NoSource: 64 +NoSource: 65 +NoSource: 67 +NoSource: 68 +NoSource: 69 +NoSource: 70 +NoSource: 71 +NoSource: 72 +NoSource: 73 +NoSource: 74 +NoSource: 75 +NoSource: 76 +NoSource: 77 +NoSource: 78 +NoSource: 79 +NoSource: 80 +NoSource: 81 +NoSource: 82 +NoSource: 83 +NoSource: 84 +NoSource: 85 +NoSource: 100 +NoSource: 101 +NoSource: 102 +NoSource: 103 +NoSource: 104 +NoSource: 105 +NoSource: 106 +NoSource: 108 +NoSource: 109 +NoSource: 110 +NoSource: 111 +NoSource: 113 +NoSource: 120 +NoSource: 121 %description Device Tree files for $MACHINES. dtb-armv6l.spec: same change dtb-armv7l.spec: same change dtb-riscv64.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:47.626930723 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:47.630930733 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.19 -%define patchversion 5.19.2 +%define patchversion 5.19.7 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -110,9 +110,9 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0-only Group: System/Kernel -Version: 5.19.2 +Version: 5.19.7 %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif @@ -239,10 +239,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 -Provides: kernel-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: kernel-%build_flavor-base-srchash-2b3da4915c03713f32e48582d3a1130238586489 +Provides: kernel-srchash-2b3da4915c03713f32e48582d3a1130238586489 # END COMMON DEPS -Provides: %name-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: %name-srchash-2b3da4915c03713f32e48582d3a1130238586489 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -310,20 +310,6 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: aarch64 -%define kmp_target_cpu %_target_cpu -%ifarch %ix86 -# Only i386/default supports i586, mark other flavors' packages as i686 -%if ! %build_default -BuildArch: i686 -# KMPs are always built as i586, because rpm does not allow to build -# subpackages for different architectures. Therefore, we change the -# /usr/src/linux-obj/<arch> symlink to i586. -%define kmp_target_cpu i586 -%endif -%endif - # These files are found in the kernel-source package: NoSource: 0 NoSource: 3 @@ -392,6 +378,21 @@ NoSource: 120 NoSource: 121 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: aarch64 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif + + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:47.666930824 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:47.670930834 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.19 -%define patchversion 5.19.2 +%define patchversion 5.19.7 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -110,9 +110,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0-only Group: System/Kernel -Version: 5.19.2 +Version: 5.19.7 %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif @@ -239,10 +239,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 -Provides: kernel-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: kernel-%build_flavor-base-srchash-2b3da4915c03713f32e48582d3a1130238586489 +Provides: kernel-srchash-2b3da4915c03713f32e48582d3a1130238586489 # END COMMON DEPS -Provides: %name-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: %name-srchash-2b3da4915c03713f32e48582d3a1130238586489 %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -318,20 +318,6 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: aarch64 %ix86 ppc64 ppc64le x86_64 -%define kmp_target_cpu %_target_cpu -%ifarch %ix86 -# Only i386/default supports i586, mark other flavors' packages as i686 -%if ! %build_default -BuildArch: i686 -# KMPs are always built as i586, because rpm does not allow to build -# subpackages for different architectures. Therefore, we change the -# /usr/src/linux-obj/<arch> symlink to i586. -%define kmp_target_cpu i586 -%endif -%endif - # These files are found in the kernel-source package: NoSource: 0 NoSource: 3 @@ -400,6 +386,21 @@ NoSource: 120 NoSource: 121 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: aarch64 %ix86 ppc64 ppc64le x86_64 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif + + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:47.698930905 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:47.702930915 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.19 -%define patchversion 5.19.2 +%define patchversion 5.19.7 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -110,9 +110,9 @@ Summary: The Standard Kernel License: GPL-2.0-only Group: System/Kernel -Version: 5.19.2 +Version: 5.19.7 %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif @@ -239,10 +239,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 -Provides: kernel-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: kernel-%build_flavor-base-srchash-2b3da4915c03713f32e48582d3a1130238586489 +Provides: kernel-srchash-2b3da4915c03713f32e48582d3a1130238586489 # END COMMON DEPS -Provides: %name-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: %name-srchash-2b3da4915c03713f32e48582d3a1130238586489 %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -362,20 +362,6 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le riscv64 s390x x86_64 -%define kmp_target_cpu %_target_cpu -%ifarch %ix86 -# Only i386/default supports i586, mark other flavors' packages as i686 -%if ! %build_default -BuildArch: i686 -# KMPs are always built as i586, because rpm does not allow to build -# subpackages for different architectures. Therefore, we change the -# /usr/src/linux-obj/<arch> symlink to i586. -%define kmp_target_cpu i586 -%endif -%endif - # These files are found in the kernel-source package: NoSource: 0 NoSource: 3 @@ -444,6 +430,21 @@ NoSource: 120 NoSource: 121 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le riscv64 s390x x86_64 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif + + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:47.734930996 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:47.738931006 +0200 @@ -17,7 +17,7 @@ %define srcversion 5.19 -%define patchversion 5.19.2 +%define patchversion 5.19.7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,9 +31,9 @@ Summary: Kernel Documentation License: GPL-2.0-only Group: Documentation/Man -Version: 5.19.2 +Version: 5.19.7 %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif @@ -67,7 +67,7 @@ %endif URL: https://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: %name-srchash-2b3da4915c03713f32e48582d3a1130238586489 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz ++++++ kernel-kvmsmall.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:47.766931077 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:47.774931097 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.19 -%define patchversion 5.19.2 +%define patchversion 5.19.7 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -110,9 +110,9 @@ Summary: The Small Developer Kernel for KVM License: GPL-2.0-only Group: System/Kernel -Version: 5.19.2 +Version: 5.19.7 %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif @@ -239,10 +239,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 -Provides: kernel-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: kernel-%build_flavor-base-srchash-2b3da4915c03713f32e48582d3a1130238586489 +Provides: kernel-srchash-2b3da4915c03713f32e48582d3a1130238586489 # END COMMON DEPS -Provides: %name-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: %name-srchash-2b3da4915c03713f32e48582d3a1130238586489 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -310,20 +310,6 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: aarch64 ppc64 ppc64le x86_64 -%define kmp_target_cpu %_target_cpu -%ifarch %ix86 -# Only i386/default supports i586, mark other flavors' packages as i686 -%if ! %build_default -BuildArch: i686 -# KMPs are always built as i586, because rpm does not allow to build -# subpackages for different architectures. Therefore, we change the -# /usr/src/linux-obj/<arch> symlink to i586. -%define kmp_target_cpu i586 -%endif -%endif - # These files are found in the kernel-source package: NoSource: 0 NoSource: 3 @@ -392,6 +378,21 @@ NoSource: 120 NoSource: 121 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: aarch64 ppc64 ppc64le x86_64 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif + + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 ++++++ kernel-lpae.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:47.802931168 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:47.810931188 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.19 -%define patchversion 5.19.2 +%define patchversion 5.19.7 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -110,9 +110,9 @@ Summary: Kernel for LPAE enabled systems License: GPL-2.0-only Group: System/Kernel -Version: 5.19.2 +Version: 5.19.7 %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif @@ -239,10 +239,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 -Provides: kernel-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: kernel-%build_flavor-base-srchash-2b3da4915c03713f32e48582d3a1130238586489 +Provides: kernel-srchash-2b3da4915c03713f32e48582d3a1130238586489 # END COMMON DEPS -Provides: %name-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: %name-srchash-2b3da4915c03713f32e48582d3a1130238586489 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -310,20 +310,6 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: armv7hl -%define kmp_target_cpu %_target_cpu -%ifarch %ix86 -# Only i386/default supports i586, mark other flavors' packages as i686 -%if ! %build_default -BuildArch: i686 -# KMPs are always built as i586, because rpm does not allow to build -# subpackages for different architectures. Therefore, we change the -# /usr/src/linux-obj/<arch> symlink to i586. -%define kmp_target_cpu i586 -%endif -%endif - # These files are found in the kernel-source package: NoSource: 0 NoSource: 3 @@ -392,6 +378,21 @@ NoSource: 120 NoSource: 121 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: armv7hl +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif + + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:47.842931268 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:47.846931279 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 5.19.2 +%define patchversion 5.19.7 %define variant %{nil} %define vanilla_only 0 @@ -45,7 +45,7 @@ %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +BuildRequires: kernel%kernel_flavor-srchash-2b3da4915c03713f32e48582d3a1130238586489 %if 0%{?rhel_version} BuildRequires: kernel @@ -64,9 +64,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0-only Group: SLES -Version: 5.19.2 +Version: 5.19.7 %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:47.878931359 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:47.886931379 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 5.19.2 +%define patchversion 5.19.7 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0-only Group: SLES -Version: 5.19.2 +Version: 5.19.7 %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:47.918931461 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:47.926931481 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.19 -%define patchversion 5.19.2 +%define patchversion 5.19.7 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -110,9 +110,9 @@ Summary: Kernel with PAE Support License: GPL-2.0-only Group: System/Kernel -Version: 5.19.2 +Version: 5.19.7 %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif @@ -239,10 +239,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 -Provides: kernel-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: kernel-%build_flavor-base-srchash-2b3da4915c03713f32e48582d3a1130238586489 +Provides: kernel-srchash-2b3da4915c03713f32e48582d3a1130238586489 # END COMMON DEPS -Provides: %name-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: %name-srchash-2b3da4915c03713f32e48582d3a1130238586489 %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -332,20 +332,6 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 -%define kmp_target_cpu %_target_cpu -%ifarch %ix86 -# Only i386/default supports i586, mark other flavors' packages as i686 -%if ! %build_default -BuildArch: i686 -# KMPs are always built as i586, because rpm does not allow to build -# subpackages for different architectures. Therefore, we change the -# /usr/src/linux-obj/<arch> symlink to i586. -%define kmp_target_cpu i586 -%endif -%endif - # These files are found in the kernel-source package: NoSource: 0 NoSource: 3 @@ -414,6 +400,21 @@ NoSource: 120 NoSource: 121 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: %ix86 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif + + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:47.954931551 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:47.958931562 +0200 @@ -17,7 +17,7 @@ %define srcversion 5.19 -%define patchversion 5.19.2 +%define patchversion 5.19.7 %define variant %{nil} %define vanilla_only 0 @@ -31,9 +31,9 @@ %endif Name: kernel-source -Version: 5.19.2 +Version: 5.19.7 %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif @@ -50,10 +50,14 @@ BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: %name-srchash-2b3da4915c03713f32e48582d3a1130238586489 Provides: linux Provides: multiversion(kernel) Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz +%if "https://www.kernel.org/pub/linux/kernel/v5.x/" != "" +Source1: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.sign +Source2: linux.keyring +%endif Source3: kernel-source.rpmlintrc Source14: series.conf Source16: guards @@ -217,7 +221,7 @@ # Unpack the vanilla kernel sources tar -xf %{S:0} -find . -type l | while read f; do test -e "$f" || rm -v "$f"; done +find . -xtype l -delete -printf "deleted '%f'\n" if test "%srcversion" != "%kernelrelease%variant"; then mv linux-%srcversion linux-%kernelrelease%variant fi ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:47.990931642 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:47.994931652 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0-only Group: Development/Sources -Version: 5.19.2 +Version: 5.19.7 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif @@ -52,7 +52,7 @@ %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: %name-srchash-2b3da4915c03713f32e48582d3a1130238586489 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:48.022931723 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:48.026931733 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.19 -%define patchversion 5.19.2 +%define patchversion 5.19.7 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -110,9 +110,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0-only Group: System/Kernel -Version: 5.19.2 +Version: 5.19.7 %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif @@ -239,10 +239,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 -Provides: kernel-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: kernel-%build_flavor-base-srchash-2b3da4915c03713f32e48582d3a1130238586489 +Provides: kernel-srchash-2b3da4915c03713f32e48582d3a1130238586489 # END COMMON DEPS -Provides: %name-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: %name-srchash-2b3da4915c03713f32e48582d3a1130238586489 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -310,20 +310,6 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le riscv64 s390x x86_64 -%define kmp_target_cpu %_target_cpu -%ifarch %ix86 -# Only i386/default supports i586, mark other flavors' packages as i686 -%if ! %build_default -BuildArch: i686 -# KMPs are always built as i586, because rpm does not allow to build -# subpackages for different architectures. Therefore, we change the -# /usr/src/linux-obj/<arch> symlink to i586. -%define kmp_target_cpu i586 -%endif -%endif - # These files are found in the kernel-source package: NoSource: 0 NoSource: 3 @@ -392,6 +378,21 @@ NoSource: 120 NoSource: 121 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le riscv64 s390x x86_64 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif + + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 ++++++ kernel-zfcpdump.spec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:48.054931804 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:48.062931824 +0200 @@ -18,7 +18,7 @@ %define srcversion 5.19 -%define patchversion 5.19.2 +%define patchversion 5.19.7 %define variant %{nil} %define vanilla_only 0 %define compress_modules zstd @@ -110,9 +110,9 @@ Summary: The IBM System Z zfcpdump Kernel License: GPL-2.0-only Group: System/Kernel -Version: 5.19.2 +Version: 5.19.7 %if 0%{?is_kotd} -Release: <RELEASE>.g6c252ef +Release: <RELEASE>.g2b3da49 %else Release: 0 %endif @@ -239,10 +239,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 -Provides: kernel-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: kernel-%build_flavor-base-srchash-2b3da4915c03713f32e48582d3a1130238586489 +Provides: kernel-srchash-2b3da4915c03713f32e48582d3a1130238586489 # END COMMON DEPS -Provides: %name-srchash-6c252efa6215101fc5985edaddc903198d01a2d8 +Provides: %name-srchash-2b3da4915c03713f32e48582d3a1130238586489 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -310,20 +310,6 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: s390x -%define kmp_target_cpu %_target_cpu -%ifarch %ix86 -# Only i386/default supports i586, mark other flavors' packages as i686 -%if ! %build_default -BuildArch: i686 -# KMPs are always built as i586, because rpm does not allow to build -# subpackages for different architectures. Therefore, we change the -# /usr/src/linux-obj/<arch> symlink to i586. -%define kmp_target_cpu i586 -%endif -%endif - # These files are found in the kernel-source package: NoSource: 0 NoSource: 3 @@ -392,6 +378,21 @@ NoSource: 120 NoSource: 121 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: s390x +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif + + # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/arm64/default new/config/arm64/default --- old/config/arm64/default 2022-08-18 07:06:49.000000000 +0200 +++ new/config/arm64/default 2022-09-05 13:32:11.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.19.2 Kernel Configuration +# Linux/arm64 5.19.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -393,6 +393,7 @@ CONFIG_ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE=y CONFIG_ARM64_ERRATUM_2253138=y CONFIG_ARM64_ERRATUM_2224489=y +CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2064142=y CONFIG_ARM64_ERRATUM_2038923=y CONFIG_ARM64_ERRATUM_1902691=y @@ -9392,7 +9393,6 @@ CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_PCI_LIB_LEGACY=y CONFIG_VIRTIO_MENU=y -# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_VDPA=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv6hl/default new/config/armv6hl/default --- old/config/armv6hl/default 2022-08-18 07:06:49.000000000 +0200 +++ new/config/armv6hl/default 2022-09-05 13:32:11.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.19.2 Kernel Configuration +# Linux/arm 5.19.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -6695,7 +6695,6 @@ CONFIG_VIRTIO_ANCHOR=y CONFIG_VIRTIO=y CONFIG_VIRTIO_MENU=y -# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MMIO=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/default new/config/armv7hl/default --- old/config/armv7hl/default 2022-08-18 07:06:49.000000000 +0200 +++ new/config/armv7hl/default 2022-09-05 13:32:11.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.19.2 Kernel Configuration +# Linux/arm 5.19.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -9315,7 +9315,6 @@ CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_PCI_LIB_LEGACY=y CONFIG_VIRTIO_MENU=y -# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_BALLOON=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/lpae new/config/armv7hl/lpae --- old/config/armv7hl/lpae 2022-08-18 07:06:49.000000000 +0200 +++ new/config/armv7hl/lpae 2022-09-05 13:32:11.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.19.2 Kernel Configuration +# Linux/arm 5.19.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -9026,7 +9026,6 @@ CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_PCI_LIB_LEGACY=y CONFIG_VIRTIO_MENU=y -# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_VDPA=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2022-08-18 07:06:49.000000000 +0200 +++ new/config/i386/pae 2022-09-05 13:32:11.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 5.19.2 Kernel Configuration +# Linux/i386 5.19.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -4708,7 +4708,7 @@ # CONFIG_SPI_XCOMM is not set # CONFIG_SPI_XILINX is not set # CONFIG_SPI_ZYNQMP_GQSPI is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=m # # SPI Multiplexer support @@ -8440,7 +8440,6 @@ CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_PCI_LIB_LEGACY=y CONFIG_VIRTIO_MENU=y -# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_VDPA=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default --- old/config/ppc64/default 2022-08-18 07:06:49.000000000 +0200 +++ new/config/ppc64/default 2022-09-05 13:32:11.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.19.2 Kernel Configuration +# Linux/powerpc 5.19.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -4089,7 +4089,7 @@ CONFIG_HW_RANDOM_XIPHERA=m # CONFIG_APPLICOM is not set CONFIG_DEVMEM=y -CONFIG_NVRAM=m +CONFIG_NVRAM=y CONFIG_DEVPORT=y # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y @@ -7150,7 +7150,6 @@ CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_PCI_LIB_LEGACY=y CONFIG_VIRTIO_MENU=y -# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_VDPA=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64le/default new/config/ppc64le/default --- old/config/ppc64le/default 2022-08-18 07:06:49.000000000 +0200 +++ new/config/ppc64le/default 2022-09-05 13:32:11.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.19.2 Kernel Configuration +# Linux/powerpc 5.19.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -3958,7 +3958,7 @@ CONFIG_HW_RANDOM_XIPHERA=m # CONFIG_APPLICOM is not set CONFIG_DEVMEM=y -CONFIG_NVRAM=m +CONFIG_NVRAM=y CONFIG_DEVPORT=y # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y @@ -6997,7 +6997,6 @@ CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_PCI_LIB_LEGACY=y CONFIG_VIRTIO_MENU=y -# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_VDPA=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/riscv64/default new/config/riscv64/default --- old/config/riscv64/default 2022-08-18 07:06:49.000000000 +0200 +++ new/config/riscv64/default 2022-09-05 13:32:11.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 5.19.2 Kernel Configuration +# Linux/riscv 5.19.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -7445,7 +7445,6 @@ CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_PCI_LIB_LEGACY=y CONFIG_VIRTIO_MENU=y -# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_VDPA=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/default new/config/s390x/default --- old/config/s390x/default 2022-08-18 07:06:49.000000000 +0200 +++ new/config/s390x/default 2022-09-05 13:32:11.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 5.19.2 Kernel Configuration +# Linux/s390 5.19.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -3218,7 +3218,6 @@ CONFIG_VIRTIO=y CONFIG_VIRTIO_PCI_LIB=m CONFIG_VIRTIO_MENU=y -# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set # CONFIG_VIRTIO_PCI is not set CONFIG_VIRTIO_VDPA=m CONFIG_VIRTIO_BALLOON=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/zfcpdump new/config/s390x/zfcpdump --- old/config/s390x/zfcpdump 2022-08-18 07:06:49.000000000 +0200 +++ new/config/s390x/zfcpdump 2022-09-05 13:32:11.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 5.19.2 Kernel Configuration +# Linux/s390 5.19.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -1084,7 +1084,6 @@ CONFIG_VIRTIO_ANCHOR=y CONFIG_VIRTIO=y CONFIG_VIRTIO_MENU=y -# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_VDPA=y # CONFIG_VIRTIO_BALLOON is not set # CONFIG_VIRTIO_INPUT is not set @@ -1410,7 +1409,6 @@ # end of Kernel hardening options # end of Security options -CONFIG_XOR_BLOCKS=y CONFIG_CRYPTO=y # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2022-08-18 07:06:49.000000000 +0200 +++ new/config/x86_64/default 2022-09-05 13:32:11.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.19.2 Kernel Configuration +# Linux/x86_64 5.19.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -4749,7 +4749,7 @@ # CONFIG_SPI_XCOMM is not set # CONFIG_SPI_XILINX is not set # CONFIG_SPI_ZYNQMP_GQSPI is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=m # # SPI Multiplexer support @@ -8365,7 +8365,6 @@ CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_PCI_LIB_LEGACY=y CONFIG_VIRTIO_MENU=y -# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_VDPA=m ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:48.742933541 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:48.746933551 +0200 @@ -247,6 +247,7 @@ @PROVIDES_OBSOLETES_BASE@ %obsolete_rebuilds %name @SOURCES@ + BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: @ARCHS@ %define kmp_target_cpu %_target_cpu @@ -261,8 +262,6 @@ %endif %endif -# These files are found in the kernel-source package: -@NOSOURCE@ # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 ++++++ kernel-docs.spec.in ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:48.822933743 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:48.826933753 +0200 @@ -71,8 +71,6 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @SOURCES@ -# These files are found in the kernel-source package: -@NOSOURCE@ %description A few basic documents from the current kernel sources. ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:48.930934016 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:48.934934026 +0200 @@ -54,6 +54,10 @@ Provides: linux Provides: multiversion(kernel) Source0: @TARBALL_URL@linux-%srcversion.tar.xz +%if "@TARBALL_URL@" != "" +Source1: @TARBALL_URL@linux-%srcversion.tar.sign +Source2: linux.keyring +%endif Source3: kernel-source.rpmlintrc Source14: series.conf Source16: guards @@ -217,7 +221,7 @@ # Unpack the vanilla kernel sources tar -xf %{S:0} -find . -type l | while read f; do test -e "$f" || rm -v "$f"; done +find . -xtype l -delete -printf "deleted '%f'\n" if test "%srcversion" != "%kernelrelease%variant"; then mv linux-%srcversion linux-%kernelrelease%variant fi ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:49.062934349 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:49.066934359 +0200 @@ -78,6 +78,9 @@ $rpmrelease =~ s/-/./g; my $sources = join("\n", $templates{source} =~ /^Source\d+:[^\n]*/msg); +# Do not include the signature and keyring as source in the binary packages +# The sources are not really included anyway, and for non-upstream tarballs these files do not exist +$sources = join("\n", grep { $_ !~ /[.](?:keyring|tar[.]sign)\s*$/ } $sources =~ /^[^\n]*/msg); # Find all SourceN: foo.tar.(bz2|xz) lines and generate the NoSource: # lines and the %setup line my @tarballs = ($sources =~ /^Source(\d+):[^\n]*\.tar\.(?:bz2|xz)/msg); @@ -114,8 +117,7 @@ RELEASE => $rpmrelease, COMMIT => $commit, COMMIT_FULL => $commit_full, - SOURCES => $sources, - NOSOURCE => $nosource, + SOURCES => $sources . "\n# These files are found in the kernel-source package:\n" . $nosource, UNPACK_PATCHES => $unpack_patches, SCRIPTS => $scripts, LIVEPATCH => $livepatch, ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 54751 lines of diff (skipped) ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/kbuild-dummy-tools-pretend-we-understand-__LONG_DOUB.patch new/patches.rpmify/kbuild-dummy-tools-pretend-we-understand-__LONG_DOUB.patch --- old/patches.rpmify/kbuild-dummy-tools-pretend-we-understand-__LONG_DOUB.patch 2022-08-15 10:31:11.000000000 +0200 +++ new/patches.rpmify/kbuild-dummy-tools-pretend-we-understand-__LONG_DOUB.patch 2022-08-30 08:27:37.000000000 +0200 @@ -1,9 +1,8 @@ From: Jiri Slaby <jsl...@suse.cz> -Date: Wed, 3 Mar 2021 11:43:14 +0100 +Date: Wed, 10 Aug 2022 11:26:03 +0200 Subject: kbuild: dummy-tools: pretend we understand __LONG_DOUBLE_128__ -Git-commit: a0355ac79494b416f6cd8bf03d50f6907cf1cefb -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes -Patch-mainline: Queued in subsystem maintainer repo +Git-commit: 0df499eaf3c1a43ebb0a84ac854262e3fa731bcf +Patch-mainline: 6.0-rc2 References: ppc config fix There is a test in powerpc's Kconfig which checks __LONG_DOUBLE_128__ @@ -13,17 +12,12 @@ being in super-config generated by dummy-tools. So take this into account in the gcc script and preprocess __LONG_DOUBLE_128__ as "1". -Cc: Masahiro Yamada <masahi...@kernel.org> -Cc: Michal Marek <michal.l...@markovi.net> -Cc: Nick Desaulniers <ndesaulni...@google.com> -Cc: linux-kbu...@vger.kernel.org Signed-off-by: Jiri Slaby <jsl...@suse.cz> +Signed-off-by: Masahiro Yamada <masahi...@kernel.org> --- - scripts/dummy-tools/gcc | 2 +- + scripts/dummy-tools/gcc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/scripts/dummy-tools/gcc b/scripts/dummy-tools/gcc -index 7db82584..1db1889f 100755 --- a/scripts/dummy-tools/gcc +++ b/scripts/dummy-tools/gcc @@ -59,7 +59,7 @@ fi @@ -35,6 +29,3 @@ exit 0 else echo "no input files" >&2 --- -2.35.3 - ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Revert-Revert-tcp-change-pingpong-threshold-to-3.patch new/patches.suse/Revert-Revert-tcp-change-pingpong-threshold-to-3.patch --- old/patches.suse/Revert-Revert-tcp-change-pingpong-threshold-to-3.patch 2022-08-18 07:06:49.000000000 +0200 +++ new/patches.suse/Revert-Revert-tcp-change-pingpong-threshold-to-3.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,136 +0,0 @@ -From: Jiri Slaby <jsl...@suse.cz> -Date: Sat, 6 Aug 2022 11:53:24 +0200 -Subject: Revert "Revert "tcp: change pingpong threshold to 3"" -Patch-mainline: Submitted 2022/08/06 -References: bsc#1202188 - -This reverts commit 4d8f24eeedc58d5f87b650ddda73c16e8ba56559. It causes a -python-eventlet test fail with: -________________ TestHttpd.test_018b_http_10_keepalive_framing _________________ - -self = <tests.wsgi_test.TestHttpd testMethod=test_018b_http_10_keepalive_framing> - - def test_018b_http_10_keepalive_framing(self): - # verify that if an http/1.0 client sends connection: keep-alive - # that we don't mangle the request framing if the app doesn't read the request - def app(environ, start_response): - resp_body = { - '/1': b'first response', - '/2': b'second response', - '/3': b'third response', - }.get(environ['PATH_INFO']) - if resp_body is None: - resp_body = 'Unexpected path: ' + environ['PATH_INFO'] - if six.PY3: - resp_body = resp_body.encode('latin1') - # Never look at wsgi.input! - start_response('200 OK', [('Content-type', 'text/plain')]) - return [resp_body] - - self.site.application = app - sock = eventlet.connect(self.server_addr) - req_body = b'GET /tricksy HTTP/1.1\r\n' - body_len = str(len(req_body)).encode('ascii') - - sock.sendall(b'PUT /1 HTTP/1.0\r\nHost: localhost\r\nConnection: keep-alive\r\n' - b'Content-Length: ' + body_len + b'\r\n\r\n' + req_body) - result1 = read_http(sock) - self.assertEqual(b'first response', result1.body) - self.assertEqual(result1.headers_original.get('Connection'), 'keep-alive') - - sock.sendall(b'PUT /2 HTTP/1.0\r\nHost: localhost\r\nConnection: keep-alive\r\n' - b'Content-Length: ' + body_len + b'\r\nExpect: 100-continue\r\n\r\n') - # Client may have a short timeout waiting on that 100 Continue - # and basically immediately send its body - sock.sendall(req_body) - result2 = read_http(sock) - self.assertEqual(b'second response', result2.body) - self.assertEqual(result2.headers_original.get('Connection'), 'close') - -> sock.sendall(b'PUT /3 HTTP/1.0\r\nHost: localhost\r\nConnection: close\r\n\r\n') - -tests/wsgi_test.py:648: -_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ -eventlet/greenio/base.py:407: in sendall - tail = self.send(data, flags) -eventlet/greenio/base.py:401: in send - return self._send_loop(self.fd.send, data, flags) -_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - -self = <eventlet.greenio.base.GreenSocket object at 0x7f5f2f73c9a0> -send_method = <built-in method send of socket object at 0x7f5f2f73d520> -data = b'PUT /3 HTTP/1.0\r\nHost: localhost\r\nConnection: close\r\n\r\n' -args = (0,), _timeout_exc = timeout('timed out'), eno = 32 - - def _send_loop(self, send_method, data, *args): - if self.act_non_blocking: - return send_method(data, *args) - - _timeout_exc = socket_timeout('timed out') - while True: - try: -> return send_method(data, *args) -E BrokenPipeError: [Errno 32] Broken pipe - -eventlet/greenio/base.py:388: BrokenPipeError -==================== - -So revert temporarily until this gets resolved upstream. - -Signed-off-by: Jiri Slaby <jsl...@suse.cz> ---- - include/net/inet_connection_sock.h | 10 +++++++++- - net/ipv4/tcp_output.c | 15 +++++++++------ - 2 files changed, 18 insertions(+), 7 deletions(-) - ---- a/include/net/inet_connection_sock.h -+++ b/include/net/inet_connection_sock.h -@@ -321,7 +321,7 @@ void inet_csk_update_fastreuse(struct in - - struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu); - --#define TCP_PINGPONG_THRESH 1 -+#define TCP_PINGPONG_THRESH 3 - - static inline void inet_csk_enter_pingpong_mode(struct sock *sk) - { -@@ -338,6 +338,14 @@ static inline bool inet_csk_in_pingpong_ - return inet_csk(sk)->icsk_ack.pingpong >= TCP_PINGPONG_THRESH; - } - -+static inline void inet_csk_inc_pingpong_cnt(struct sock *sk) -+{ -+ struct inet_connection_sock *icsk = inet_csk(sk); -+ -+ if (icsk->icsk_ack.pingpong < U8_MAX) -+ icsk->icsk_ack.pingpong++; -+} -+ - static inline bool inet_csk_has_ulp(struct sock *sk) - { - return inet_sk(sk)->is_icsk && !!inet_csk(sk)->icsk_ulp_ops; ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -167,13 +167,16 @@ static void tcp_event_data_sent(struct t - if (tcp_packets_in_flight(tp) == 0) - tcp_ca_event(sk, CA_EVENT_TX_START); - -- tp->lsndtime = now; -- -- /* If it is a reply for ato after last received -- * packet, enter pingpong mode. -+ /* If this is the first data packet sent in response to the -+ * previous received data, -+ * and it is a reply for ato after last received packet, -+ * increase pingpong count. - */ -- if ((u32)(now - icsk->icsk_ack.lrcvtime) < icsk->icsk_ack.ato) -- inet_csk_enter_pingpong_mode(sk); -+ if (before(tp->lsndtime, icsk->icsk_ack.lrcvtime) && -+ (u32)(now - icsk->icsk_ack.lrcvtime) < icsk->icsk_ack.ato) -+ inet_csk_inc_pingpong_cnt(sk); -+ -+ tp->lsndtime = now; - } - - /* Account for an ACK we sent. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Revert-block-freeze-the-queue-earlier-in-del_gendisk.patch new/patches.suse/Revert-block-freeze-the-queue-earlier-in-del_gendisk.patch --- old/patches.suse/Revert-block-freeze-the-queue-earlier-in-del_gendisk.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/Revert-block-freeze-the-queue-earlier-in-del_gendisk.patch 2022-09-05 13:32:36.000000000 +0200 @@ -0,0 +1,45 @@ +From 8d58e56c03dba9cc461ccfd36a3ca35eaa19229a Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <ti...@suse.de> +Date: Mon, 29 Aug 2022 07:42:19 +0200 +Subject: [PATCH] Revert "block: freeze the queue earlier in del_gendisk" +References: bsc#1202534 bsc#1202589 +Patch-mainline: Not yet, temporary workaround until the upstream fix + +This reverts commit a09b314005f3a0956ebf56e01b3b80339df577cc. + +The commit above seems causing a hang at shutdown/reboot with the +mysterious repeated dying message: + block device autoloading is deprecated and will be removed. + +Revert the commit for fixing the regression. + +Signed-off-by: Takashi Iwai <ti...@suse.de> + +--- + block/genhd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/block/genhd.c b/block/genhd.c +index d36fabf0abc1..988ba52fd331 100644 +--- a/block/genhd.c ++++ b/block/genhd.c +@@ -602,7 +602,6 @@ void del_gendisk(struct gendisk *disk) + * Prevent new I/O from crossing bio_queue_enter(). + */ + blk_queue_start_drain(q); +- blk_mq_freeze_queue_wait(q); + + if (!(disk->flags & GENHD_FL_HIDDEN)) { + sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi"); +@@ -626,6 +625,8 @@ void del_gendisk(struct gendisk *disk) + pm_runtime_set_memalloc_noio(disk_to_dev(disk), false); + device_del(disk_to_dev(disk)); + ++ blk_mq_freeze_queue_wait(q); ++ + blk_throtl_cancel_bios(disk->queue); + + blk_sync_queue(q); +-- +2.35.3 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Revert-btrfs-check-if-root-is-readonly-while-setting.patch new/patches.suse/Revert-btrfs-check-if-root-is-readonly-while-setting.patch --- old/patches.suse/Revert-btrfs-check-if-root-is-readonly-while-setting.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/Revert-btrfs-check-if-root-is-readonly-while-setting.patch 2022-09-05 13:32:36.000000000 +0200 @@ -0,0 +1,30 @@ +From: Jiri Slaby <jsl...@suse.cz> +Date: Mon, 5 Sep 2022 10:17:00 +0200 +Subject: Revert "btrfs: check if root is readonly while setting security + xattr" +Patch-mainline: never, under discussion +References: bsc#1203114 + +This reverts commit 0f72e355c4a0737691610c9d3e6d1a23324a51a4, commit +b51111271b0352aa596c5ae8faf06939e91b3b68 upstream. + +It generates a lot of: +dracut-pre-pivot[456]: /sbin/restorecon: Could not set context for /usr/lib/modules/5.19.6-1-default/kernel/drivers/usb/cdns3/cdns-usb-common.ko.zst: Read-only file system + +Signed-off-by: Jiri Slaby <jsl...@suse.cz> +--- + fs/btrfs/xattr.c | 3 --- + 1 file changed, 3 deletions(-) + +--- a/fs/btrfs/xattr.c ++++ b/fs/btrfs/xattr.c +@@ -371,9 +371,6 @@ static int btrfs_xattr_handler_set(const + const char *name, const void *buffer, + size_t size, int flags) + { +- if (btrfs_root_readonly(BTRFS_I(inode)->root)) +- return -EROFS; +- + name = xattr_full_name(handler, name); + return btrfs_setxattr_trans(inode, name, buffer, size, flags); + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Revert-usb-typec-ucsi-add-a-common-function-ucsi_unr.patch new/patches.suse/Revert-usb-typec-ucsi-add-a-common-function-ucsi_unr.patch --- old/patches.suse/Revert-usb-typec-ucsi-add-a-common-function-ucsi_unr.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/Revert-usb-typec-ucsi-add-a-common-function-ucsi_unr.patch 2022-09-05 13:32:36.000000000 +0200 @@ -0,0 +1,135 @@ +From 5f73aa2cf8bef4a39baa1591c3144ede4788826e Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <ti...@suse.de> +Date: Tue, 23 Aug 2022 08:54:55 +0200 +Subject: [PATCH] Revert "usb: typec: ucsi: add a common function + ucsi_unregister_connectors()" +Git-commit: 5f73aa2cf8bef4a39baa1591c3144ede4788826e +Patch-mainline: Queued in subsystem maintainer repo +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git +References: bsc#1202386 + + +The recent commit 87d0e2f41b8c ("usb: typec: ucsi: add a common +function ucsi_unregister_connectors()") introduced a regression that +caused NULL dereference at reading the power supply sysfs. It's a +stale sysfs entry that should have been removed but remains with NULL +ops. The commit changed the error handling to skip the entries after +a NULL con->wq, and this leaves the power device unreleased. + +For addressing the regression, the straight revert is applied here. +Further code improvements can be done from the scratch again. + +Link: https://bugzilla.suse.com/show_bug.cgi?id=1202386 +Link: https://lore.kernel.org/r/87r11cmbx0.wl-ti...@suse.de +Fixes: 87d0e2f41b8c ("usb: typec: ucsi: add a common function ucsi_unregister_connectors()") +Cc: <sta...@vger.kernel.org> +Acked-by: Heikki Krogerus <heikki.kroge...@linux.intel.com> +Signed-off-by: Takashi Iwai <ti...@suse.de> +Link: https://lore.kernel.org/r/20220823065455.32579-1-ti...@suse.de +Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> +--- + drivers/usb/typec/ucsi/ucsi.c | 53 ++++++++++++++++------------------- + 1 file changed, 24 insertions(+), 29 deletions(-) + +diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c +index 1aea46493b85..7f2624f42724 100644 +--- a/drivers/usb/typec/ucsi/ucsi.c ++++ b/drivers/usb/typec/ucsi/ucsi.c +@@ -1200,32 +1200,6 @@ static int ucsi_register_port(struct ucsi *ucsi, int index) + return ret; + } + +-static void ucsi_unregister_connectors(struct ucsi *ucsi) +-{ +- struct ucsi_connector *con; +- int i; +- +- if (!ucsi->connector) +- return; +- +- for (i = 0; i < ucsi->cap.num_connectors; i++) { +- con = &ucsi->connector[i]; +- +- if (!con->wq) +- break; +- +- cancel_work_sync(&con->work); +- ucsi_unregister_partner(con); +- ucsi_unregister_altmodes(con, UCSI_RECIPIENT_CON); +- ucsi_unregister_port_psy(con); +- destroy_workqueue(con->wq); +- typec_unregister_port(con->port); +- } +- +- kfree(ucsi->connector); +- ucsi->connector = NULL; +-} +- + /** + * ucsi_init - Initialize UCSI interface + * @ucsi: UCSI to be initialized +@@ -1234,6 +1208,7 @@ static void ucsi_unregister_connectors(struct ucsi *ucsi) + */ + static int ucsi_init(struct ucsi *ucsi) + { ++ struct ucsi_connector *con; + u64 command; + int ret; + int i; +@@ -1264,7 +1239,7 @@ static int ucsi_init(struct ucsi *ucsi) + } + + /* Allocate the connectors. Released in ucsi_unregister() */ +- ucsi->connector = kcalloc(ucsi->cap.num_connectors, ++ ucsi->connector = kcalloc(ucsi->cap.num_connectors + 1, + sizeof(*ucsi->connector), GFP_KERNEL); + if (!ucsi->connector) { + ret = -ENOMEM; +@@ -1288,7 +1263,15 @@ static int ucsi_init(struct ucsi *ucsi) + return 0; + + err_unregister: +- ucsi_unregister_connectors(ucsi); ++ for (con = ucsi->connector; con->port; con++) { ++ ucsi_unregister_partner(con); ++ ucsi_unregister_altmodes(con, UCSI_RECIPIENT_CON); ++ ucsi_unregister_port_psy(con); ++ if (con->wq) ++ destroy_workqueue(con->wq); ++ typec_unregister_port(con->port); ++ con->port = NULL; ++ } + + err_reset: + memset(&ucsi->cap, 0, sizeof(ucsi->cap)); +@@ -1402,6 +1385,7 @@ EXPORT_SYMBOL_GPL(ucsi_register); + void ucsi_unregister(struct ucsi *ucsi) + { + u64 cmd = UCSI_SET_NOTIFICATION_ENABLE; ++ int i; + + /* Make sure that we are not in the middle of driver initialization */ + cancel_delayed_work_sync(&ucsi->work); +@@ -1409,7 +1393,18 @@ void ucsi_unregister(struct ucsi *ucsi) + /* Disable notifications */ + ucsi->ops->async_write(ucsi, UCSI_CONTROL, &cmd, sizeof(cmd)); + +- ucsi_unregister_connectors(ucsi); ++ for (i = 0; i < ucsi->cap.num_connectors; i++) { ++ cancel_work_sync(&ucsi->connector[i].work); ++ ucsi_unregister_partner(&ucsi->connector[i]); ++ ucsi_unregister_altmodes(&ucsi->connector[i], ++ UCSI_RECIPIENT_CON); ++ ucsi_unregister_port_psy(&ucsi->connector[i]); ++ if (ucsi->connector[i].wq) ++ destroy_workqueue(ucsi->connector[i].wq); ++ typec_unregister_port(ucsi->connector[i].port); ++ } ++ ++ kfree(ucsi->connector); + } + EXPORT_SYMBOL_GPL(ucsi_unregister); + +-- +2.35.3 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Revert-zram-remove-double-compression-logic.patch new/patches.suse/Revert-zram-remove-double-compression-logic.patch --- old/patches.suse/Revert-zram-remove-double-compression-logic.patch 2022-08-18 07:06:49.000000000 +0200 +++ new/patches.suse/Revert-zram-remove-double-compression-logic.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,141 +0,0 @@ -From: Jiri Slaby <jsl...@suse.cz> -Date: Wed, 10 Aug 2022 09:06:09 +0200 -Subject: Revert "zram: remove double compression logic" -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable -Git-commit: c3697d57c2019274c23680ffdcb22057f6db14fd -Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1202203 - -This reverts commit e7be8d1dd983156b ("zram: remove double compression -logic") as it causes zram failures. It does not revert cleanly, PTR_ERR -handling was introduced in the meantime. This is handled by appropriate -IS_ERR. - -When under memory pressure, zs_malloc() can fail. Before the above -commit, the allocation was retried with direct reclaim enabled (GFP_NOIO). -After the commit, it is not -- only __GFP_KSWAPD_RECLAIM is tried. - -So when the failure occurs under memory pressure, the overlaying -filesystem such as ext2 (mounted by ext4 module in this case) can emit -failures, making the (file)system unusable: - EXT4-fs warning (device zram0): ext4_end_bio:343: I/O error 10 writing to inode 16386 starting block 159744) - Buffer I/O error on device zram0, logical block 159744 - -With direct reclaim, memory is really reclaimed and allocation succeeds, -eventually. In the worst case, the oom killer is invoked, which is proper -outcome if user sets up zram too large (in comparison to available RAM). - -This very diff doesn't apply to 5.19 (stable) cleanly (see PTR_ERR note -above). Use revert of e7be8d1dd983 directly. - -Link: https://bugzilla.suse.com/show_bug.cgi?id=1202203 -Link: https://lkml.kernel.org/r/20220810070609.14402-1-jsl...@suse.cz -Fixes: e7be8d1dd983 ("zram: remove double compression logic") -Signed-off-by: Jiri Slaby <jsl...@suse.cz> -Reviewed-by: Sergey Senozhatsky <senozhat...@chromium.org> -Cc: Minchan Kim <minc...@kernel.org> -Cc: Nitin Gupta <ngu...@vflare.org> -Cc: Alexey Romanov <avroma...@sberdevices.ru> -Cc: Dmitry Rokosov <ddroko...@sberdevices.ru> -Cc: Lukas Czerner <lczer...@redhat.com> -Cc: <sta...@vger.kernel.org> [5.19] -Signed-off-by: Andrew Morton <a...@linux-foundation.org> ---- - drivers/block/zram/zram_drv.c | 42 ++++++++++++++++++++++++++++++++---------- - drivers/block/zram/zram_drv.h | 1 + - 2 files changed, 33 insertions(+), 10 deletions(-) - ---- a/drivers/block/zram/zram_drv.c -+++ b/drivers/block/zram/zram_drv.c -@@ -1144,14 +1144,15 @@ static ssize_t bd_stat_show(struct devic - static ssize_t debug_stat_show(struct device *dev, - struct device_attribute *attr, char *buf) - { -- int version = 2; -+ int version = 1; - struct zram *zram = dev_to_zram(dev); - ssize_t ret; - - down_read(&zram->init_lock); - ret = scnprintf(buf, PAGE_SIZE, -- "version: %d\n%8llu\n", -+ "version: %d\n%8llu %8llu\n", - version, -+ (u64)atomic64_read(&zram->stats.writestall), - (u64)atomic64_read(&zram->stats.miss_free)); - up_read(&zram->init_lock); - -@@ -1367,6 +1368,7 @@ static int __zram_bvec_write(struct zram - } - kunmap_atomic(mem); - -+compress_again: - zstrm = zcomp_stream_get(zram->comp); - src = kmap_atomic(page); - ret = zcomp_compress(zstrm, src, &comp_len); -@@ -1375,20 +1377,39 @@ static int __zram_bvec_write(struct zram - if (unlikely(ret)) { - zcomp_stream_put(zram->comp); - pr_err("Compression failed! err=%d\n", ret); -+ zs_free(zram->mem_pool, handle); - return ret; - } - - if (comp_len >= huge_class_size) - comp_len = PAGE_SIZE; -- -- handle = zs_malloc(zram->mem_pool, comp_len, -- __GFP_KSWAPD_RECLAIM | -- __GFP_NOWARN | -- __GFP_HIGHMEM | -- __GFP_MOVABLE); -- -- if (unlikely(!handle)) { -+ /* -+ * handle allocation has 2 paths: -+ * a) fast path is executed with preemption disabled (for -+ * per-cpu streams) and has __GFP_DIRECT_RECLAIM bit clear, -+ * since we can't sleep; -+ * b) slow path enables preemption and attempts to allocate -+ * the page with __GFP_DIRECT_RECLAIM bit set. we have to -+ * put per-cpu compression stream and, thus, to re-do -+ * the compression once handle is allocated. -+ * -+ * if we have a 'non-null' handle here then we are coming -+ * from the slow path and handle has already been allocated. -+ */ -+ if (!handle) -+ handle = zs_malloc(zram->mem_pool, comp_len, -+ __GFP_KSWAPD_RECLAIM | -+ __GFP_NOWARN | -+ __GFP_HIGHMEM | -+ __GFP_MOVABLE); -+ if (!handle) { - zcomp_stream_put(zram->comp); -+ atomic64_inc(&zram->stats.writestall); -+ handle = zs_malloc(zram->mem_pool, comp_len, -+ GFP_NOIO | __GFP_HIGHMEM | -+ __GFP_MOVABLE); -+ if (handle) -+ goto compress_again; - return -ENOMEM; - } - -@@ -1946,6 +1967,7 @@ static int zram_add(void) - if (ZRAM_LOGICAL_BLOCK_SIZE == PAGE_SIZE) - blk_queue_max_write_zeroes_sectors(zram->disk->queue, UINT_MAX); - -+ blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, zram->disk->queue); - ret = device_add_disk(NULL, zram->disk, zram_disk_groups); - if (ret) - goto out_cleanup_disk; ---- a/drivers/block/zram/zram_drv.h -+++ b/drivers/block/zram/zram_drv.h -@@ -81,6 +81,7 @@ struct zram_stats { - atomic64_t huge_pages_since; /* no. of huge pages since zram set up */ - atomic64_t pages_stored; /* no. of pages currently stored */ - atomic_long_t max_used_pages; /* no. of maximum pages stored */ -+ atomic64_t writestall; /* no. of write slow paths */ - atomic64_t miss_free; /* no. of missed free */ - #ifdef CONFIG_ZRAM_WRITEBACK - atomic64_t bd_count; /* no. of pages in backing device */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/drm-amd-display-Add-SMU-logging-code.patch new/patches.suse/drm-amd-display-Add-SMU-logging-code.patch --- old/patches.suse/drm-amd-display-Add-SMU-logging-code.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/drm-amd-display-Add-SMU-logging-code.patch 2022-09-05 13:32:36.000000000 +0200 @@ -0,0 +1,172 @@ +From 4b33b5ffcf68de3a43e7dddc91c5dc86e6ed8587 Mon Sep 17 00:00:00 2001 +From: Saaem Rizvi <syedsaaem.ri...@amd.com> +Date: Thu, 9 Jun 2022 15:34:43 -0400 +Subject: [PATCH] drm/amd/display: Add SMU logging code +Git-commit: 4b33b5ffcf68de3a43e7dddc91c5dc86e6ed8587 +Patch-mainline: v6.0-rc1 +References: bsc#1202366 + +[WHY] +Logging for SMU response value after the wait allows us to know +immediately what the response value was. Makes it easier to debug should +the value be anything other than OK. + +[HOW] +Using the the already available DC SMU logging functions. + +Tested-by: Daniel Wheeler <daniel.whee...@amd.com> +Reviewed-by: Charlene Liu <charlene....@amd.com> +Acked-by: Rodrigo Siqueira <rodrigo.sique...@amd.com> +Signed-off-by: Saaem Rizvi <syedsaaem.ri...@amd.com> +Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> +Acked-by: Takashi Iwai <ti...@suse.de> + +--- + .../display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 12 ++++++++++++ + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 12 ++++++++++++ + .../gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 8 ++++++++ + .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 8 ++++++++ + .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c | 8 ++++++++ + 5 files changed, 48 insertions(+) + +diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c +index 30c6f9cd717f..4137394a6ace 100644 +--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c ++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c +@@ -41,6 +41,12 @@ + #define FN(reg_name, field) \ + FD(reg_name##__##field) + ++#include "logger_types.h" ++#undef DC_LOGGER ++#define DC_LOGGER \ ++ CTX->logger ++#define smu_print(str, ...) {DC_LOG_SMU(str, ##__VA_ARGS__); } ++ + #define VBIOSSMC_MSG_TestMessage 0x1 + #define VBIOSSMC_MSG_GetSmuVersion 0x2 + #define VBIOSSMC_MSG_PowerUpGfx 0x3 +@@ -97,6 +103,12 @@ static int rn_vbios_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, + result = rn_smu_wait_for_response(clk_mgr, 10, 200000); + ASSERT(result == VBIOSSMC_Result_OK); + ++ smu_print("SMU response after wait: %d\n", result); ++ ++ if (result == VBIOSSMC_Status_BUSY) { ++ return -1; ++ } ++ + /* First clear response register */ + REG_WRITE(MP1_SMN_C2PMSG_91, VBIOSSMC_Status_BUSY); + +diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c +index 1cae01a91a69..d8f03328558b 100644 +--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c ++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c +@@ -41,6 +41,12 @@ + #define FN(reg_name, field) \ + FD(reg_name##__##field) + ++#include "logger_types.h" ++#undef DC_LOGGER ++#define DC_LOGGER \ ++ CTX->logger ++#define smu_print(str, ...) {DC_LOG_SMU(str, ##__VA_ARGS__); } ++ + #define VBIOSSMC_MSG_GetSmuVersion 0x2 + #define VBIOSSMC_MSG_SetDispclkFreq 0x4 + #define VBIOSSMC_MSG_SetDprefclkFreq 0x5 +@@ -96,6 +102,12 @@ static int dcn301_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, + + result = dcn301_smu_wait_for_response(clk_mgr, 10, 200000); + ++ smu_print("SMU response after wait: %d\n", result); ++ ++ if (result == VBIOSSMC_Status_BUSY) { ++ return -1; ++ } ++ + /* First clear response register */ + REG_WRITE(MP1_SMN_C2PMSG_91, VBIOSSMC_Status_BUSY); + +diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c +index c5d7d075026f..6a17f7ed4d01 100644 +--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c ++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c +@@ -40,6 +40,12 @@ + #define FN(reg_name, field) \ + FD(reg_name##__##field) + ++#include "logger_types.h" ++#undef DC_LOGGER ++#define DC_LOGGER \ ++ CTX->logger ++#define smu_print(str, ...) {DC_LOG_SMU(str, ##__VA_ARGS__); } ++ + #define VBIOSSMC_MSG_TestMessage 0x1 + #define VBIOSSMC_MSG_GetSmuVersion 0x2 + #define VBIOSSMC_MSG_PowerUpGfx 0x3 +@@ -104,6 +110,8 @@ static int dcn31_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, + result = dcn31_smu_wait_for_response(clk_mgr, 10, 200000); + ASSERT(result == VBIOSSMC_Result_OK); + ++ smu_print("SMU response after wait: %d\n", result); ++ + if (result == VBIOSSMC_Status_BUSY) { + return -1; + } +diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c +index 2600313fea57..74a78fda62fb 100644 +--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c ++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c +@@ -70,6 +70,12 @@ static const struct IP_BASE NBIO_BASE = { { { { 0x00000000, 0x00000014, 0x00000D + #define REG_NBIO(reg_name) \ + (NBIO_BASE.instance[0].segment[regBIF_BX_PF2_ ## reg_name ## _BASE_IDX] + regBIF_BX_PF2_ ## reg_name) + ++#include "logger_types.h" ++#undef DC_LOGGER ++#define DC_LOGGER \ ++ CTX->logger ++#define smu_print(str, ...) {DC_LOG_SMU(str, ##__VA_ARGS__); } ++ + #define mmMP1_C2PMSG_3 0x3B1050C + + #define VBIOSSMC_MSG_TestMessage 0x01 ///< To check if PMFW is alive and responding. Requirement specified by PMFW team +@@ -132,6 +138,8 @@ static int dcn315_smu_send_msg_with_param( + result = dcn315_smu_wait_for_response(clk_mgr, 10, 200000); + ASSERT(result == VBIOSSMC_Result_OK); + ++ smu_print("SMU response after wait: %d\n", result); ++ + if (result == VBIOSSMC_Status_BUSY) { + return -1; + } +diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c +index dceec4b96052..b2d1f24cfb80 100644 +--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c ++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c +@@ -58,6 +58,12 @@ static const struct IP_BASE MP0_BASE = { { { { 0x00016000, 0x00DC0000, 0x00E0000 + #define FN(reg_name, field) \ + FD(reg_name##__##field) + ++#include "logger_types.h" ++#undef DC_LOGGER ++#define DC_LOGGER \ ++ CTX->logger ++#define smu_print(str, ...) {DC_LOG_SMU(str, ##__VA_ARGS__); } ++ + #define VBIOSSMC_MSG_TestMessage 0x01 ///< To check if PMFW is alive and responding. Requirement specified by PMFW team + #define VBIOSSMC_MSG_GetPmfwVersion 0x02 ///< Get PMFW version + #define VBIOSSMC_MSG_Spare0 0x03 ///< Spare0 +@@ -120,6 +126,8 @@ static int dcn316_smu_send_msg_with_param( + result = dcn316_smu_wait_for_response(clk_mgr, 10, 200000); + ASSERT(result == VBIOSSMC_Result_OK); + ++ smu_print("SMU response after wait: %d\n", result); ++ + if (result == VBIOSSMC_Status_BUSY) { + return -1; + } +-- +2.35.3 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/drm-amd-display-Removing-assert-statements-for-Linux.patch new/patches.suse/drm-amd-display-Removing-assert-statements-for-Linux.patch --- old/patches.suse/drm-amd-display-Removing-assert-statements-for-Linux.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/drm-amd-display-Removing-assert-statements-for-Linux.patch 2022-09-05 13:32:36.000000000 +0200 @@ -0,0 +1,169 @@ +From 149f6d1a6035a7aa6595ac6eeb9c8f566b2103cd Mon Sep 17 00:00:00 2001 +From: Saaem Rizvi <syedsaaem.ri...@amd.com> +Date: Mon, 20 Jun 2022 10:25:19 -0400 +Subject: [PATCH] drm/amd/display: Removing assert statements for Linux +Git-commit: 149f6d1a6035a7aa6595ac6eeb9c8f566b2103cd +Patch-mainline: v6.0-rc1 +References: bsc#1202366 + +[WHY] +Assert statements causing several bugs on Linux DM + +[HOW] +Removing assert statement for Linux DM +(ASSERT(result == VBIOSSMC_Result_OK)). Also adding +logging statements for setting dcfclk. + +Bug: https://bugzilla.kernel.org/show_bug.cgi?id=216092 +Fixes: c1b972a18d05 ("drm/amd/display: Insert pulling smu busy status before sending another request") +Reviewed-by: Gabe Teeger <gabe.tee...@amd.com> +Acked-by: Solomon Chiu <solomon.c...@amd.com> +Signed-off-by: Saaem Rizvi <syedsaaem.ri...@amd.com> +Tested-by: Daniel Wheeler <daniel.whee...@amd.com> +Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> +Acked-by: Takashi Iwai <ti...@suse.de> + +--- + .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 8 ++++++-- + .../gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 7 ++++++- + drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 8 ++++++-- + .../gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 8 ++++++-- + .../gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c | 8 ++++++-- + 5 files changed, 30 insertions(+), 9 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c +index 4137394a6ace..27fbe906682f 100644 +--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c ++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c +@@ -101,9 +101,9 @@ static int rn_vbios_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, + uint32_t result; + + result = rn_smu_wait_for_response(clk_mgr, 10, 200000); +- ASSERT(result == VBIOSSMC_Result_OK); + +- smu_print("SMU response after wait: %d\n", result); ++ if (result != VBIOSSMC_Result_OK) ++ smu_print("SMU Response was not OK. SMU response after wait received is: %d\n", result); + + if (result == VBIOSSMC_Status_BUSY) { + return -1; +@@ -188,6 +188,10 @@ int rn_vbios_smu_set_hard_min_dcfclk(struct clk_mgr_internal *clk_mgr, int reque + VBIOSSMC_MSG_SetHardMinDcfclkByFreq, + khz_to_mhz_ceil(requested_dcfclk_khz)); + ++#ifdef DBG ++ smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000); ++#endif ++ + return actual_dcfclk_set_mhz * 1000; + } + +diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c +index d8f03328558b..e4f96b6fd79d 100644 +--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c ++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c +@@ -102,7 +102,8 @@ static int dcn301_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, + + result = dcn301_smu_wait_for_response(clk_mgr, 10, 200000); + +- smu_print("SMU response after wait: %d\n", result); ++ if (result != VBIOSSMC_Result_OK) ++ smu_print("SMU Response was not OK. SMU response after wait received is: %d\n", result); + + if (result == VBIOSSMC_Status_BUSY) { + return -1; +@@ -179,6 +180,10 @@ int dcn301_smu_set_hard_min_dcfclk(struct clk_mgr_internal *clk_mgr, int request + VBIOSSMC_MSG_SetHardMinDcfclkByFreq, + khz_to_mhz_ceil(requested_dcfclk_khz)); + ++#ifdef DBG ++ smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000); ++#endif ++ + return actual_dcfclk_set_mhz * 1000; + } + +diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c +index 6a17f7ed4d01..090b2c02aee1 100644 +--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c ++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c +@@ -108,9 +108,9 @@ static int dcn31_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, + uint32_t result; + + result = dcn31_smu_wait_for_response(clk_mgr, 10, 200000); +- ASSERT(result == VBIOSSMC_Result_OK); + +- smu_print("SMU response after wait: %d\n", result); ++ if (result != VBIOSSMC_Result_OK) ++ smu_print("SMU Response was not OK. SMU response after wait received is: %d\n", result); + + if (result == VBIOSSMC_Status_BUSY) { + return -1; +@@ -202,6 +202,10 @@ int dcn31_smu_set_hard_min_dcfclk(struct clk_mgr_internal *clk_mgr, int requeste + VBIOSSMC_MSG_SetHardMinDcfclkByFreq, + khz_to_mhz_ceil(requested_dcfclk_khz)); + ++#ifdef DBG ++ smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000); ++#endif ++ + return actual_dcfclk_set_mhz * 1000; + } + +diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c +index 74a78fda62fb..925d6e13620e 100644 +--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c ++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c +@@ -136,9 +136,9 @@ static int dcn315_smu_send_msg_with_param( + uint32_t result; + + result = dcn315_smu_wait_for_response(clk_mgr, 10, 200000); +- ASSERT(result == VBIOSSMC_Result_OK); + +- smu_print("SMU response after wait: %d\n", result); ++ if (result != VBIOSSMC_Result_OK) ++ smu_print("SMU Response was not OK. SMU response after wait received is: %d\n", result); + + if (result == VBIOSSMC_Status_BUSY) { + return -1; +@@ -205,6 +205,10 @@ int dcn315_smu_set_hard_min_dcfclk(struct clk_mgr_internal *clk_mgr, int request + VBIOSSMC_MSG_SetHardMinDcfclkByFreq, + khz_to_mhz_ceil(requested_dcfclk_khz)); + ++#ifdef DBG ++ smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000); ++#endif ++ + return actual_dcfclk_set_mhz * 1000; + } + +diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c +index b2d1f24cfb80..457a9254ae1c 100644 +--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c ++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c +@@ -124,9 +124,9 @@ static int dcn316_smu_send_msg_with_param( + uint32_t result; + + result = dcn316_smu_wait_for_response(clk_mgr, 10, 200000); +- ASSERT(result == VBIOSSMC_Result_OK); + +- smu_print("SMU response after wait: %d\n", result); ++ if (result != VBIOSSMC_Result_OK) ++ smu_print("SMU Response was not OK. SMU response after wait received is: %d\n", result); + + if (result == VBIOSSMC_Status_BUSY) { + return -1; +@@ -191,6 +191,10 @@ int dcn316_smu_set_hard_min_dcfclk(struct clk_mgr_internal *clk_mgr, int request + VBIOSSMC_MSG_SetHardMinDcfclkByFreq, + khz_to_mhz_ceil(requested_dcfclk_khz)); + ++#ifdef DBG ++ smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000); ++#endif ++ + return actual_dcfclk_set_mhz * 1000; + } + +-- +2.35.3 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/mm-gup-fix-FOLL_FORCE-COW-security-issue-and-remove-.patch new/patches.suse/mm-gup-fix-FOLL_FORCE-COW-security-issue-and-remove-.patch --- old/patches.suse/mm-gup-fix-FOLL_FORCE-COW-security-issue-and-remove-.patch 2022-08-18 07:06:49.000000000 +0200 +++ new/patches.suse/mm-gup-fix-FOLL_FORCE-COW-security-issue-and-remove-.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,303 +0,0 @@ -From: David Hildenbrand <da...@redhat.com> -Date: Tue, 9 Aug 2022 22:56:40 +0200 -Subject: mm/gup: fix FOLL_FORCE COW security issue and remove FOLL_COW -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable -Git-commit: 4f5409708b5bd1f8f0ebae0e9e9919896b56d871 -Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1202013 CVE-2022-2590 - -Ever since the Dirty COW (CVE-2016-5195) security issue happened, we know -that FOLL_FORCE can be possibly dangerous, especially if there are races -that can be exploited by user space. - -Right now, it would be sufficient to have some code that sets a PTE of a -R/O-mapped shared page dirty, in order for it to erroneously become -writable by FOLL_FORCE. The implications of setting a write-protected PTE -dirty might not be immediately obvious to everyone. - -And in fact ever since commit 9ae0f87d009c ("mm/shmem: unconditionally set -pte dirty in mfill_atomic_install_pte"), we can use UFFDIO_CONTINUE to map -a shmem page R/O while marking the pte dirty. This can be used by -unprivileged user space to modify tmpfs/shmem file content even if the -user does not have write permissions to the file, and to bypass memfd -write sealing -- Dirty COW restricted to tmpfs/shmem (CVE-2022-2590). - -To fix such security issues for good, the insight is that we really only -need that fancy retry logic (FOLL_COW) for COW mappings that are not -writable (!VM_WRITE). And in a COW mapping, we really only broke COW if -we have an exclusive anonymous page mapped. If we have something else -mapped, or the mapped anonymous page might be shared (!PageAnonExclusive), -we have to trigger a write fault to break COW. If we don't find an -exclusive anonymous page when we retry, we have to trigger COW breaking -once again because something intervened. - -Let's move away from this mandatory-retry + dirty handling and rely on our -PageAnonExclusive() flag for making a similar decision, to use the same -COW logic as in other kernel parts here as well. In case we stumble over -a PTE in a COW mapping that does not map an exclusive anonymous page, COW -was not properly broken and we have to trigger a fake write-fault to break -COW. - -Just like we do in can_change_pte_writable() added via commit 64fe24a3e05e -("mm/mprotect: try avoiding write faults for exclusive anonymous pages -when changing protection") and commit 76aefad628aa ("mm/mprotect: fix -soft-dirty check in can_change_pte_writable()"), take care of softdirty -and uffd-wp manually. - -For example, a write() via /proc/self/mem to a uffd-wp-protected range has -to fail instead of silently granting write access and bypassing the -userspace fault handler. Note that FOLL_FORCE is not only used for debug -access, but also triggered by applications without debug intentions, for -example, when pinning pages via RDMA. - -This fixes CVE-2022-2590. Note that only x86_64 and aarch64 are -affected, because only those support CONFIG_HAVE_ARCH_USERFAULTFD_MINOR. - -Fortunately, FOLL_COW is no longer required to handle FOLL_FORCE. So -let's just get rid of it. - -Thanks to Nadav Amit for pointing out that the pte_dirty() check in -FOLL_FORCE code is problematic and might be exploitable. - -Note 1: We don't check for the PTE being dirty because it doesn't matter - for making a "was COWed" decision anymore, and whoever modifies the - page has to set the page dirty either way. - -Note 2: Kernels before extended uffd-wp support and before - PageAnonExclusive (< 5.19) can simply revert the problematic - commit instead and be safe regarding UFFDIO_CONTINUE. A backport to - v5.19 requires minor adjustments due to lack of - vma_soft_dirty_enabled(). - -Link: https://lkml.kernel.org/r/20220809205640.70916-1-da...@redhat.com -Fixes: 9ae0f87d009c ("mm/shmem: unconditionally set pte dirty in mfill_atomic_install_pte") -Signed-off-by: David Hildenbrand <da...@redhat.com> -Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> -Cc: Axel Rasmussen <axelrasmus...@google.com> -Cc: Nadav Amit <nadav.a...@gmail.com> -Cc: Peter Xu <pet...@redhat.com> -Cc: Hugh Dickins <hu...@google.com> -Cc: Andrea Arcangeli <aarca...@redhat.com> -Cc: Matthew Wilcox <wi...@infradead.org> -Cc: Vlastimil Babka <vba...@suse.cz> -Cc: John Hubbard <jhubb...@nvidia.com> -Cc: Jason Gunthorpe <j...@nvidia.com> -Cc: David Laight <david.lai...@aculab.com> -Cc: <sta...@vger.kernel.org> [5.16] -Signed-off-by: Andrew Morton <a...@linux-foundation.org> -Signed-off-by: Jiri Slaby <jsl...@suse.cz> ---- - include/linux/mm.h | 1 - mm/gup.c | 68 +++++++++++++++++++++++++++++++++++------------------ - mm/huge_memory.c | 64 +++++++++++++++++++++++++++++++++---------------- - 3 files changed, 89 insertions(+), 44 deletions(-) - ---- a/include/linux/mm.h -+++ b/include/linux/mm.h -@@ -2939,7 +2939,6 @@ struct page *follow_page(struct vm_area_ - #define FOLL_MIGRATION 0x400 /* wait for page to replace migration entry */ - #define FOLL_TRIED 0x800 /* a retry, previous pass started an IO */ - #define FOLL_REMOTE 0x2000 /* we are working on non-current tsk/mm */ --#define FOLL_COW 0x4000 /* internal GUP flag */ - #define FOLL_ANON 0x8000 /* don't do file mappings */ - #define FOLL_LONGTERM 0x10000 /* mapping lifetime is indefinite: see below */ - #define FOLL_SPLIT_PMD 0x20000 /* split huge pmd before returning */ ---- a/mm/gup.c -+++ b/mm/gup.c -@@ -478,14 +478,42 @@ static int follow_pfn_pte(struct vm_area - return -EEXIST; - } - --/* -- * FOLL_FORCE can write to even unwritable pte's, but only -- * after we've gone through a COW cycle and they are dirty. -- */ --static inline bool can_follow_write_pte(pte_t pte, unsigned int flags) -+/* FOLL_FORCE can write to even unwritable PTEs in COW mappings. */ -+static inline bool can_follow_write_pte(pte_t pte, struct page *page, -+ struct vm_area_struct *vma, -+ unsigned int flags) - { -- return pte_write(pte) || -- ((flags & FOLL_FORCE) && (flags & FOLL_COW) && pte_dirty(pte)); -+ /* If the pte is writable, we can write to the page. */ -+ if (pte_write(pte)) -+ return true; -+ -+ /* Maybe FOLL_FORCE is set to override it? */ -+ if (!(flags & FOLL_FORCE)) -+ return false; -+ -+ /* But FOLL_FORCE has no effect on shared mappings */ -+ if (vma->vm_flags & (VM_MAYSHARE | VM_SHARED)) -+ return false; -+ -+ /* ... or read-only private ones */ -+ if (!(vma->vm_flags & VM_MAYWRITE)) -+ return false; -+ -+ /* ... or already writable ones that just need to take a write fault */ -+ if (vma->vm_flags & VM_WRITE) -+ return false; -+ -+ /* -+ * See can_change_pte_writable(): we broke COW and could map the page -+ * writable if we have an exclusive anonymous page ... -+ */ -+ if (!page || !PageAnon(page) || !PageAnonExclusive(page)) -+ return false; -+ -+ /* ... and a write-fault isn't required for other reasons. */ -+ if (vma_soft_dirty_enabled(vma) && !pte_soft_dirty(pte)) -+ return false; -+ return !userfaultfd_pte_wp(vma, pte); - } - - static struct page *follow_page_pte(struct vm_area_struct *vma, -@@ -528,12 +556,19 @@ retry: - } - if ((flags & FOLL_NUMA) && pte_protnone(pte)) - goto no_page; -- if ((flags & FOLL_WRITE) && !can_follow_write_pte(pte, flags)) { -- pte_unmap_unlock(ptep, ptl); -- return NULL; -- } - - page = vm_normal_page(vma, address, pte); -+ -+ /* -+ * We only care about anon pages in can_follow_write_pte() and don't -+ * have to worry about pte_devmap() because they are never anon. -+ */ -+ if ((flags & FOLL_WRITE) && -+ !can_follow_write_pte(pte, page, vma, flags)) { -+ page = NULL; -+ goto out; -+ } -+ - if (!page && pte_devmap(pte) && (flags & (FOLL_GET | FOLL_PIN))) { - /* - * Only return device mapping pages in the FOLL_GET or FOLL_PIN -@@ -967,17 +1002,6 @@ static int faultin_page(struct vm_area_s - return -EBUSY; - } - -- /* -- * The VM_FAULT_WRITE bit tells us that do_wp_page has broken COW when -- * necessary, even if maybe_mkwrite decided not to set pte_write. We -- * can thus safely do subsequent page lookups as if they were reads. -- * But only do so when looping for pte_write is futile: in some cases -- * userspace may also be wanting to write to the gotten user page, -- * which a read fault here might prevent (a readonly page might get -- * reCOWed by userspace write). -- */ -- if ((ret & VM_FAULT_WRITE) && !(vma->vm_flags & VM_WRITE)) -- *flags |= FOLL_COW; - return 0; - } - ---- a/mm/huge_memory.c -+++ b/mm/huge_memory.c -@@ -977,12 +977,6 @@ struct page *follow_devmap_pmd(struct vm - - assert_spin_locked(pmd_lockptr(mm, pmd)); - -- /* -- * When we COW a devmap PMD entry, we split it into PTEs, so we should -- * not be in this function with `flags & FOLL_COW` set. -- */ -- WARN_ONCE(flags & FOLL_COW, "mm: In follow_devmap_pmd with FOLL_COW set"); -- - /* FOLL_GET and FOLL_PIN are mutually exclusive. */ - if (WARN_ON_ONCE((flags & (FOLL_PIN | FOLL_GET)) == - (FOLL_PIN | FOLL_GET))) -@@ -1348,14 +1342,42 @@ fallback: - return VM_FAULT_FALLBACK; - } - --/* -- * FOLL_FORCE can write to even unwritable pmd's, but only -- * after we've gone through a COW cycle and they are dirty. -- */ --static inline bool can_follow_write_pmd(pmd_t pmd, unsigned int flags) -+/* FOLL_FORCE can write to even unwritable PMDs in COW mappings. */ -+static inline bool can_follow_write_pmd(pmd_t pmd, struct page *page, -+ struct vm_area_struct *vma, -+ unsigned int flags) - { -- return pmd_write(pmd) || -- ((flags & FOLL_FORCE) && (flags & FOLL_COW) && pmd_dirty(pmd)); -+ /* If the pmd is writable, we can write to the page. */ -+ if (pmd_write(pmd)) -+ return true; -+ -+ /* Maybe FOLL_FORCE is set to override it? */ -+ if (!(flags & FOLL_FORCE)) -+ return false; -+ -+ /* But FOLL_FORCE has no effect on shared mappings */ -+ if (vma->vm_flags & (VM_MAYSHARE | VM_SHARED)) -+ return false; -+ -+ /* ... or read-only private ones */ -+ if (!(vma->vm_flags & VM_MAYWRITE)) -+ return false; -+ -+ /* ... or already writable ones that just need to take a write fault */ -+ if (vma->vm_flags & VM_WRITE) -+ return false; -+ -+ /* -+ * See can_change_pte_writable(): we broke COW and could map the page -+ * writable if we have an exclusive anonymous page ... -+ */ -+ if (!page || !PageAnon(page) || !PageAnonExclusive(page)) -+ return false; -+ -+ /* ... and a write-fault isn't required for other reasons. */ -+ if (vma_soft_dirty_enabled(vma) && !pmd_soft_dirty(pmd)) -+ return false; -+ return !userfaultfd_huge_pmd_wp(vma, pmd); - } - - struct page *follow_trans_huge_pmd(struct vm_area_struct *vma, -@@ -1364,12 +1386,16 @@ struct page *follow_trans_huge_pmd(struc - unsigned int flags) - { - struct mm_struct *mm = vma->vm_mm; -- struct page *page = NULL; -+ struct page *page; - - assert_spin_locked(pmd_lockptr(mm, pmd)); - -- if (flags & FOLL_WRITE && !can_follow_write_pmd(*pmd, flags)) -- goto out; -+ page = pmd_page(*pmd); -+ VM_BUG_ON_PAGE(!PageHead(page) && !is_zone_device_page(page), page); -+ -+ if ((flags & FOLL_WRITE) && -+ !can_follow_write_pmd(*pmd, page, vma, flags)) -+ return NULL; - - /* Avoid dumping huge zero page */ - if ((flags & FOLL_DUMP) && is_huge_zero_pmd(*pmd)) -@@ -1377,10 +1403,7 @@ struct page *follow_trans_huge_pmd(struc - - /* Full NUMA hinting faults to serialise migration in fault paths */ - if ((flags & FOLL_NUMA) && pmd_protnone(*pmd)) -- goto out; -- -- page = pmd_page(*pmd); -- VM_BUG_ON_PAGE(!PageHead(page) && !is_zone_device_page(page), page); -+ return NULL; - - if (!pmd_write(*pmd) && gup_must_unshare(flags, page)) - return ERR_PTR(-EMLINK); -@@ -1397,7 +1420,6 @@ struct page *follow_trans_huge_pmd(struc - page += (addr & ~HPAGE_PMD_MASK) >> PAGE_SHIFT; - VM_BUG_ON_PAGE(!PageCompound(page) && !is_zone_device_page(page), page); - --out: - return page; - } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/mm-mprotect-fix-soft-dirty-check-in-can_change_pte_w.patch new/patches.suse/mm-mprotect-fix-soft-dirty-check-in-can_change_pte_w.patch --- old/patches.suse/mm-mprotect-fix-soft-dirty-check-in-can_change_pte_w.patch 2022-08-18 07:06:49.000000000 +0200 +++ new/patches.suse/mm-mprotect-fix-soft-dirty-check-in-can_change_pte_w.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,177 +0,0 @@ -From: Peter Xu <pet...@redhat.com> -Date: Mon, 25 Jul 2022 10:20:46 -0400 -Subject: mm/mprotect: fix soft-dirty check in can_change_pte_writable() -Git-commit: 76aefad628aae152207ee624a7981b9aa1a267d8 -Patch-mainline: v6.0-rc1 -References: bsc#1202013 CVE-2022-2590 - -Patch series "mm/mprotect: Fix soft-dirty checks", v4. - - -This patch (of 3): - -The check wanted to make sure when soft-dirty tracking is enabled we won't -grant write bit by accident, as a page fault is needed for dirty tracking. -The intention is correct but we didn't check it right because -VM_SOFTDIRTY set actually means soft-dirty tracking disabled. Fix it. - -There's another thing tricky about soft-dirty is that, we can't check the -vma flag !(vma_flags & VM_SOFTDIRTY) directly but only check it after we -checked CONFIG_MEM_SOFT_DIRTY because otherwise VM_SOFTDIRTY will be -defined as zero, and !(vma_flags & VM_SOFTDIRTY) will constantly return -true. To avoid misuse, introduce a helper for checking whether vma has -soft-dirty tracking enabled. - -We can easily verify this with any exclusive anonymous page, like program -below: - -=======8<====== - #include <stdio.h> - #include <unistd.h> - #include <stdlib.h> - #include <assert.h> - #include <inttypes.h> - #include <stdint.h> - #include <sys/types.h> - #include <sys/mman.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> - #include <stdbool.h> - - #define BIT_ULL(nr) (1ULL << (nr)) - #define PM_SOFT_DIRTY BIT_ULL(55) - - unsigned int psize; - char *page; - - uint64_t pagemap_read_vaddr(int fd, void *vaddr) - { - uint64_t value; - int ret; - - ret = pread(fd, &value, sizeof(uint64_t), - ((uint64_t)vaddr >> 12) * sizeof(uint64_t)); - assert(ret == sizeof(uint64_t)); - - return value; - } - - void clear_refs_write(void) - { - int fd = open("/proc/self/clear_refs", O_RDWR); - - assert(fd >= 0); - write(fd, "4", 2); - close(fd); - } - - #define check_soft_dirty(str, expect) do { \ - bool dirty = pagemap_read_vaddr(fd, page) & PM_SOFT_DIRTY; \ - if (dirty != expect) { \ - printf("ERROR: %s, soft-dirty=%d (expect: %d) -", str, dirty, expect); \ - exit(-1); \ - } \ - } while (0) - - int main(void) - { - int fd = open("/proc/self/pagemap", O_RDONLY); - - assert(fd >= 0); - psize = getpagesize(); - page = mmap(NULL, psize, PROT_READ|PROT_WRITE, - MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); - assert(page != MAP_FAILED); - - *page = 1; - check_soft_dirty("Just faulted in page", 1); - clear_refs_write(); - check_soft_dirty("Clear_refs written", 0); - mprotect(page, psize, PROT_READ); - check_soft_dirty("Marked RO", 0); - mprotect(page, psize, PROT_READ|PROT_WRITE); - check_soft_dirty("Marked RW", 0); - *page = 2; - check_soft_dirty("Wrote page again", 1); - - munmap(page, psize); - close(fd); - printf("Test passed. -"); - - return 0; - } -=======8<====== - -Here we attach a Fixes to commit 64fe24a3e05e only for easy tracking, as -this patch won't apply to a tree before that point. However the commit -wasn't the source of problem, but instead 64e455079e1b. It's just that -after 64fe24a3e05e anonymous memory will also suffer from this problem -with mprotect(). - -Link: https://lkml.kernel.org/r/20220725142048.30450-1-pet...@redhat.com -Link: https://lkml.kernel.org/r/20220725142048.30450-2-pet...@redhat.com -Fixes: 64e455079e1b ("mm: softdirty: enable write notifications on VMAs after VM_SOFTDIRTY cleared") -Fixes: 64fe24a3e05e ("mm/mprotect: try avoiding write faults for exclusive anonymous pages when changing protection") -Signed-off-by: Peter Xu <pet...@redhat.com> -Reviewed-by: David Hildenbrand <da...@redhat.com> -Cc: Nadav Amit <nadav.a...@gmail.com> -Cc: Andrea Arcangeli <aarca...@redhat.com> -Signed-off-by: Andrew Morton <a...@linux-foundation.org> -Signed-off-by: Jiri Slaby <jsl...@suse.cz> ---- - mm/internal.h | 18 ++++++++++++++++++ - mm/mmap.c | 2 +- - mm/mprotect.c | 2 +- - 3 files changed, 20 insertions(+), 2 deletions(-) - ---- a/mm/internal.h -+++ b/mm/internal.h -@@ -861,4 +861,22 @@ struct folio *try_grab_folio(struct page - - DECLARE_PER_CPU(struct per_cpu_nodestat, boot_nodestats); - -+static inline bool vma_soft_dirty_enabled(struct vm_area_struct *vma) -+{ -+ /* -+ * NOTE: we must check this before VM_SOFTDIRTY on soft-dirty -+ * enablements, because when without soft-dirty being compiled in, -+ * VM_SOFTDIRTY is defined as 0x0, then !(vm_flags & VM_SOFTDIRTY) -+ * will be constantly true. -+ */ -+ if (!IS_ENABLED(CONFIG_MEM_SOFT_DIRTY)) -+ return false; -+ -+ /* -+ * Soft-dirty is kind of special: its tracking is enabled when the -+ * vma flags not set. -+ */ -+ return !(vma->vm_flags & VM_SOFTDIRTY); -+} -+ - #endif /* __MM_INTERNAL_H */ ---- a/mm/mmap.c -+++ b/mm/mmap.c -@@ -1694,7 +1694,7 @@ int vma_wants_writenotify(struct vm_area - return 0; - - /* Do we need to track softdirty? */ -- if (IS_ENABLED(CONFIG_MEM_SOFT_DIRTY) && !(vm_flags & VM_SOFTDIRTY)) -+ if (vma_soft_dirty_enabled(vma)) - return 1; - - /* Specialty mapping? */ ---- a/mm/mprotect.c -+++ b/mm/mprotect.c -@@ -149,7 +149,7 @@ static unsigned long change_pte_range(st - /* Avoid taking write faults for known dirty pages */ - if (dirty_accountable && pte_dirty(ptent) && - (pte_soft_dirty(ptent) || -- !(vma->vm_flags & VM_SOFTDIRTY))) { -+ !vma_soft_dirty_enabled(vma))) { - ptent = pte_mkwrite(ptent); - } - ptep_modify_prot_commit(vma, addr, pte, oldpte, ptent); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/mt76-mt7921e-fix-crash-in-chip-reset-fail.patch new/patches.suse/mt76-mt7921e-fix-crash-in-chip-reset-fail.patch --- old/patches.suse/mt76-mt7921e-fix-crash-in-chip-reset-fail.patch 2022-08-18 07:06:49.000000000 +0200 +++ new/patches.suse/mt76-mt7921e-fix-crash-in-chip-reset-fail.patch 2022-09-05 13:32:36.000000000 +0200 @@ -1,8 +1,9 @@ From: Deren Wu <deren...@mediatek.com> -Subject: [PATCH] mt76: mt7921e: fix crash in chip reset fail Date: Tue, 2 Aug 2022 23:15:07 +0800 -Message-id: <727eb5ffd3c7c805245e512da150ecf0a7154020.1659452909.git.deren...@mediatek.com> -Patch-mainline: Submitted, linux-wireless ML +Subject: wifi: mt76: mt7921e: fix crash in chip reset fail +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +Git-commit: fa3fbe64037839f448dc569212bafc5a495d8219 +Patch-mainline: Queued in subsystem maintainer repository References: bsc#1201845 In case of drv own fail in reset, we may need to run mac_reset several @@ -36,19 +37,19 @@ [ 5859.633834] ret_from_fork+0x1f/0x30 [ 5859.633842] </TASK> +Cc: sta...@vger.kernel.org Fixes: 0efaf31dec57 ("mt76: mt7921: fix MT7921E reset failure") Signed-off-by: Deren Wu <deren...@mediatek.com> +Link: https://lore.kernel.org/r/727eb5ffd3c7c805245e512da150ecf0a7154020.1659452909.git.deren...@mediatek.com +Signed-off-by: Johannes Berg <johannes.b...@intel.com> Acked-by: Takashi Iwai <ti...@suse.de> - --- - drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c -index e1800674089a..576a0149251b 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c -@@ -261,7 +261,7 @@ int mt7921e_mac_reset(struct mt7921_dev *dev) +@@ -345,7 +345,7 @@ int mt7921e_mac_reset(struct mt7921_dev err = mt7921e_driver_own(dev); if (err) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/snd-hda-intel-iommu-workaround.patch new/patches.suse/snd-hda-intel-iommu-workaround.patch --- old/patches.suse/snd-hda-intel-iommu-workaround.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/snd-hda-intel-iommu-workaround.patch 2022-09-05 13:32:36.000000000 +0200 @@ -0,0 +1,30 @@ +From: Takashi Iwai <ti...@suse.de> +Subject: Workaround for missing HD-audio on AMD platforms +Patch-mainline: Never, ever; temporary workaround +References: bsc#1202492 + +The recent change to add support for IOMMU group in PCI core +(commit 512881eacfa7 "bus: platform,amba,fsl-mc,PCI: Add device DMA +ownership management") caused a regression at probing HD-audio devices +on some devices like AMD platforms; it results in the lack of complete +HD-audio devices. + +Until the issue gets fixed properly in IOMMU and/or PCI core side, +apply a temporay workaround in HD-audio driver. + +Signed-off-by: Takashi Iwai <ti...@suse.de> + +--- + sound/pci/hda/hda_intel.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -2793,6 +2793,7 @@ static struct pci_driver azx_driver = { + .driver = { + .pm = AZX_PM_OPS, + }, ++ .driver_managed_dma = true, // XXX: FIXME - just a workaround + }; + + module_pci_driver(azx_driver); ++++++ series.conf ++++++ ++++ 663 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/series.conf ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.2083/series.conf ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.XQpRuq/_old 2022-09-06 13:00:50.330937551 +0200 +++ /var/tmp/diff_new_pack.XQpRuq/_new 2022-09-06 13:00:50.330937551 +0200 @@ -1,4 +1,4 @@ -2022-08-18 05:06:49 +0000 -GIT Revision: 6c252efa6215101fc5985edaddc903198d01a2d8 +2022-09-05 11:32:36 +0000 +GIT Revision: 2b3da4915c03713f32e48582d3a1130238586489 GIT Branch: stable