]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
move 5.10 queue back into place
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Oct 2022 11:05:45 +0000 (13:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Oct 2022 11:05:45 +0000 (13:05 +0200)
79 files changed:
queue-5.10/acpi-extlog-handle-multiple-records.patch [moved from temp-5.10/acpi-extlog-handle-multiple-records.patch with 100% similarity]
queue-5.10/acpi-video-force-backlight-native-for-more-tongfang-devices.patch [moved from temp-5.10/acpi-video-force-backlight-native-for-more-tongfang-devices.patch with 100% similarity]
queue-5.10/arm64-dts-qcom-sc7180-trogdor-fixup-modem-memory-region.patch [moved from temp-5.10/arm64-dts-qcom-sc7180-trogdor-fixup-modem-memory-region.patch with 100% similarity]
queue-5.10/arm64-errata-remove-aes-hwcap-for-compat-tasks.patch [moved from temp-5.10/arm64-errata-remove-aes-hwcap-for-compat-tasks.patch with 100% similarity]
queue-5.10/arm64-topology-move-store_cpu_topology-to-shared-code.patch [moved from temp-5.10/arm64-topology-move-store_cpu_topology-to-shared-code.patch with 100% similarity]
queue-5.10/ata-ahci-imx-fix-module_alias.patch [moved from temp-5.10/ata-ahci-imx-fix-module_alias.patch with 100% similarity]
queue-5.10/ata-ahci-match-em_max_slots-with-sata_pmp_max_ports.patch [moved from temp-5.10/ata-ahci-match-em_max_slots-with-sata_pmp_max_ports.patch with 100% similarity]
queue-5.10/blk-wbt-call-rq_qos_add-after-wb_normal-is-initialized.patch [moved from temp-5.10/blk-wbt-call-rq_qos_add-after-wb_normal-is-initialized.patch with 100% similarity]
queue-5.10/blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch [moved from temp-5.10/blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch with 100% similarity]
queue-5.10/block-wbt-remove-unnecessary-invoking-of-wbt_update_limits-in-wbt_init.patch [moved from temp-5.10/block-wbt-remove-unnecessary-invoking-of-wbt_update_limits-in-wbt_init.patch with 100% similarity]
queue-5.10/btrfs-fix-processing-of-delayed-data-refs-during-bac.patch [moved from temp-5.10/btrfs-fix-processing-of-delayed-data-refs-during-bac.patch with 100% similarity]
queue-5.10/btrfs-fix-processing-of-delayed-tree-block-refs-duri.patch [moved from temp-5.10/btrfs-fix-processing-of-delayed-tree-block-refs-duri.patch with 100% similarity]
queue-5.10/cifs-fix-xid-leak-in-cifs_copy_file_range.patch [moved from temp-5.10/cifs-fix-xid-leak-in-cifs_copy_file_range.patch with 100% similarity]
queue-5.10/cifs-fix-xid-leak-in-cifs_flock.patch [moved from temp-5.10/cifs-fix-xid-leak-in-cifs_flock.patch with 100% similarity]
queue-5.10/cifs-fix-xid-leak-in-cifs_ses_add_channel.patch [moved from temp-5.10/cifs-fix-xid-leak-in-cifs_ses_add_channel.patch with 100% similarity]
queue-5.10/cpufreq-qcom-fix-memory-leak-in-error-path.patch [moved from temp-5.10/cpufreq-qcom-fix-memory-leak-in-error-path.patch with 100% similarity]
queue-5.10/cpufreq-qcom-fix-writes-in-read-only-memory-region.patch [moved from temp-5.10/cpufreq-qcom-fix-writes-in-read-only-memory-region.patch with 100% similarity]
queue-5.10/dmaengine-mxs-dma-remove-the-unused-.id_table.patch [moved from temp-5.10/dmaengine-mxs-dma-remove-the-unused-.id_table.patch with 100% similarity]
queue-5.10/dmaengine-mxs-use-platform_driver_register.patch [moved from temp-5.10/dmaengine-mxs-use-platform_driver_register.patch with 100% similarity]
queue-5.10/drm-virtio-use-appropriate-atomic-state-in-virtio_gp.patch [moved from temp-5.10/drm-virtio-use-appropriate-atomic-state-in-virtio_gp.patch with 100% similarity]
queue-5.10/fcntl-fix-potential-deadlocks-for-fown_struct.lock.patch [moved from temp-5.10/fcntl-fix-potential-deadlocks-for-fown_struct.lock.patch with 100% similarity]
queue-5.10/fcntl-make-f_getown-ex-return-0-on-dead-owner-task.patch [moved from temp-5.10/fcntl-make-f_getown-ex-return-0-on-dead-owner-task.patch with 100% similarity]
queue-5.10/hid-magicmouse-do-not-set-btn_mouse-on-double-report.patch [moved from temp-5.10/hid-magicmouse-do-not-set-btn_mouse-on-double-report.patch with 100% similarity]
queue-5.10/hv_netvsc-fix-race-between-vf-offering-and-vf-association-message-from-host.patch [moved from temp-5.10/hv_netvsc-fix-race-between-vf-offering-and-vf-association-message-from-host.patch with 100% similarity]
queue-5.10/hwmon-coretemp-handle-large-core-id-value.patch [moved from temp-5.10/hwmon-coretemp-handle-large-core-id-value.patch with 100% similarity]
queue-5.10/i2c-qcom-cci-fix-ordering-of-pm_runtime_xx-and-i2c_add_adapter.patch [moved from temp-5.10/i2c-qcom-cci-fix-ordering-of-pm_runtime_xx-and-i2c_add_adapter.patch with 100% similarity]
queue-5.10/i40e-fix-dma-mappings-leak.patch [moved from temp-5.10/i40e-fix-dma-mappings-leak.patch with 100% similarity]
queue-5.10/iommu-vt-d-allow-nvs-regions-in-arch_rmrr_sanity_che.patch [moved from temp-5.10/iommu-vt-d-allow-nvs-regions-in-arch_rmrr_sanity_che.patch with 100% similarity]
queue-5.10/iommu-vt-d-clean-up-si_domain-in-the-init_dmars-erro.patch [moved from temp-5.10/iommu-vt-d-clean-up-si_domain-in-the-init_dmars-erro.patch with 100% similarity]
queue-5.10/ionic-catch-null-pointer-issue-on-reconfig.patch [moved from temp-5.10/ionic-catch-null-pointer-issue-on-reconfig.patch with 100% similarity]
queue-5.10/kvm-add-support-for-arch-compat-vm-ioctls.patch [moved from temp-5.10/kvm-add-support-for-arch-compat-vm-ioctls.patch with 100% similarity]
queue-5.10/kvm-arm64-vgic-fix-exit-condition-in-scan_its_table.patch [moved from temp-5.10/kvm-arm64-vgic-fix-exit-condition-in-scan_its_table.patch with 100% similarity]
queue-5.10/makefile.debug-re-enable-debug-info-for-.s-files.patch [moved from temp-5.10/makefile.debug-re-enable-debug-info-for-.s-files.patch with 100% similarity]
queue-5.10/media-mceusb-set-timeout-to-at-least-timeout-provided.patch [moved from temp-5.10/media-mceusb-set-timeout-to-at-least-timeout-provided.patch with 100% similarity]
queue-5.10/media-venus-dec-handle-the-case-where-find_format-fails.patch [moved from temp-5.10/media-venus-dec-handle-the-case-where-find_format-fails.patch with 100% similarity]
queue-5.10/mm-proc-pid-smaps_rollup-fix-no-vma-s-null-deref.patch [moved from temp-5.10/mm-proc-pid-smaps_rollup-fix-no-vma-s-null-deref.patch with 100% similarity]
queue-5.10/mmc-core-add-sd-card-quirk-for-broken-discard.patch [moved from temp-5.10/mmc-core-add-sd-card-quirk-for-broken-discard.patch with 100% similarity]
queue-5.10/mmc-sdhci-tegra-use-actual-clock-rate-for-sw-tuning-.patch [moved from temp-5.10/mmc-sdhci-tegra-use-actual-clock-rate-for-sw-tuning-.patch with 100% similarity]
queue-5.10/net-atm-fix-proc_mpc_write-incorrect-return-value.patch [moved from temp-5.10/net-atm-fix-proc_mpc_write-incorrect-return-value.patch with 100% similarity]
queue-5.10/net-hns-fix-possible-memory-leak-in-hnae_ae_register.patch [moved from temp-5.10/net-hns-fix-possible-memory-leak-in-hnae_ae_register.patch with 100% similarity]
queue-5.10/net-hsr-avoid-possible-null-deref-in-skb_clone.patch [moved from temp-5.10/net-hsr-avoid-possible-null-deref-in-skb_clone.patch with 100% similarity]
queue-5.10/net-phy-dp83822-disable-mdi-crossover-status-change-.patch [moved from temp-5.10/net-phy-dp83822-disable-mdi-crossover-status-change-.patch with 100% similarity]
queue-5.10/net-phy-dp83867-extend-rx-strap-quirk-for-sgmii-mode.patch [moved from temp-5.10/net-phy-dp83867-extend-rx-strap-quirk-for-sgmii-mode.patch with 100% similarity]
queue-5.10/net-sched-cake-fix-null-pointer-access-issue-when-ca.patch [moved from temp-5.10/net-sched-cake-fix-null-pointer-access-issue-when-ca.patch with 100% similarity]
queue-5.10/net-sched-delete-duplicate-cleanup-of-backlog-and-ql.patch [moved from temp-5.10/net-sched-delete-duplicate-cleanup-of-backlog-and-ql.patch with 100% similarity]
queue-5.10/net-sched-fix-race-condition-in-qdisc_graft.patch [moved from temp-5.10/net-sched-fix-race-condition-in-qdisc_graft.patch with 100% similarity]
queue-5.10/net-sched-sfb-fix-null-pointer-access-issue-when-sfb.patch [moved from temp-5.10/net-sched-sfb-fix-null-pointer-access-issue-when-sfb.patch with 100% similarity]
queue-5.10/nvme-hwmon-consistently-ignore-errors-from-nvme_hwmo.patch [moved from temp-5.10/nvme-hwmon-consistently-ignore-errors-from-nvme_hwmo.patch with 100% similarity]
queue-5.10/nvme-hwmon-kmalloc-the-nvme-smart-log-buffer.patch [moved from temp-5.10/nvme-hwmon-kmalloc-the-nvme-smart-log-buffer.patch with 100% similarity]
queue-5.10/nvme-hwmon-return-error-code-when-registration-fails.patch [moved from temp-5.10/nvme-hwmon-return-error-code-when-registration-fails.patch with 100% similarity]
queue-5.10/nvme-hwmon-rework-to-avoid-devm-allocation.patch [moved from temp-5.10/nvme-hwmon-rework-to-avoid-devm-allocation.patch with 100% similarity]
queue-5.10/ocfs2-clear-dinode-links-count-in-case-of-error.patch [moved from temp-5.10/ocfs2-clear-dinode-links-count-in-case-of-error.patch with 100% similarity]
queue-5.10/ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch [moved from temp-5.10/ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch with 100% similarity]
queue-5.10/perf-pmu-validate-raw-event-with-sysfs-exported-form.patch [moved from temp-5.10/perf-pmu-validate-raw-event-with-sysfs-exported-form.patch with 100% similarity]
queue-5.10/perf-skip-and-warn-on-unknown-format-confign-attrs.patch [moved from temp-5.10/perf-skip-and-warn-on-unknown-format-confign-attrs.patch with 100% similarity]
queue-5.10/perf-x86-intel-pt-relax-address-filter-validation.patch [moved from temp-5.10/perf-x86-intel-pt-relax-address-filter-validation.patch with 100% similarity]
queue-5.10/r8152-add-pid-for-the-lenovo-onelink-dock.patch [moved from temp-5.10/r8152-add-pid-for-the-lenovo-onelink-dock.patch with 100% similarity]
queue-5.10/riscv-add-machine-name-to-kernel-boot-log-and-stack-.patch [moved from temp-5.10/riscv-add-machine-name-to-kernel-boot-log-and-stack-.patch with 100% similarity]
queue-5.10/riscv-always-honor-the-config_cmdline_force-when-par.patch [moved from temp-5.10/riscv-always-honor-the-config_cmdline_force-when-par.patch with 100% similarity]
queue-5.10/riscv-topology-fix-default-topology-reporting.patch [moved from temp-5.10/riscv-topology-fix-default-topology-reporting.patch with 100% similarity]
queue-5.10/selinux-enable-use-of-both-gfp_kernel-and-gfp_atomic-in-convert_context.patch [moved from temp-5.10/selinux-enable-use-of-both-gfp_kernel-and-gfp_atomic-in-convert_context.patch with 100% similarity]
queue-5.10/series [moved from temp-5.10/series with 92% similarity]
queue-5.10/sfc-change-vf-mac-via-pf-as-first-preference-if-avai.patch [moved from temp-5.10/sfc-change-vf-mac-via-pf-as-first-preference-if-avai.patch with 100% similarity]
queue-5.10/sfc-include-vport_id-in-filter-spec-hash-and-equal.patch [moved from temp-5.10/sfc-include-vport_id-in-filter-spec-hash-and-equal.patch with 100% similarity]
queue-5.10/tcp-add-num_closed_socks-to-struct-sock_reuseport.patch [moved from temp-5.10/tcp-add-num_closed_socks-to-struct-sock_reuseport.patch with 100% similarity]
queue-5.10/tipc-fix-an-information-leak-in-tipc_topsrv_kern_sub.patch [moved from temp-5.10/tipc-fix-an-information-leak-in-tipc_topsrv_kern_sub.patch with 100% similarity]
queue-5.10/tipc-fix-recognition-of-trial-period.patch [moved from temp-5.10/tipc-fix-recognition-of-trial-period.patch with 100% similarity]
queue-5.10/tracing-do-not-free-snapshot-if-tracer-is-on-cmdline.patch [moved from temp-5.10/tracing-do-not-free-snapshot-if-tracer-is-on-cmdline.patch with 100% similarity]
queue-5.10/tracing-simplify-conditional-compilation-code-in-tra.patch [moved from temp-5.10/tracing-simplify-conditional-compilation-code-in-tra.patch with 100% similarity]
queue-5.10/udp-update-reuse-has_conns-under-reuseport_lock.patch [moved from temp-5.10/udp-update-reuse-has_conns-under-reuseport_lock.patch with 100% similarity]
queue-5.10/x86-kconfig-drop-check-for-mabi-ms-for-config_efi_stub.patch [moved from temp-5.10/x86-kconfig-drop-check-for-mabi-ms-for-config_efi_stub.patch with 100% similarity]
queue-5.10/x86-microcode-amd-apply-the-patch-early-on-every-logical-thread.patch [moved from temp-5.10/x86-microcode-amd-apply-the-patch-early-on-every-logical-thread.patch with 100% similarity]
queue-5.10/xen-assume-xenfeat_gnttab_map_avail_bits-being-set-f.patch [moved from temp-5.10/xen-assume-xenfeat_gnttab_map_avail_bits-being-set-f.patch with 100% similarity]
queue-5.10/xen-gntdev-accommodate-vma-splitting.patch [moved from temp-5.10/xen-gntdev-accommodate-vma-splitting.patch with 100% similarity]
temp-5.10/bpf-generate-btf_kind_float-when-linking-vmlinux.patch [deleted file]
temp-5.10/kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch [deleted file]
temp-5.10/kbuild-quote-objcopy-var-to-avoid-a-pahole-call-break-the-build.patch [deleted file]
temp-5.10/kbuild-skip-per-cpu-btf-generation-for-pahole-v1.18-v1.21.patch [deleted file]
temp-5.10/kbuild-unify-options-for-btf-generation-for-vmlinux-and-modules.patch [deleted file]

similarity index 92%
rename from temp-5.10/series
rename to queue-5.10/series
index c1724ca930304421225a187da9c32f30b7668784..a43e694e9e3818d30cf047ece055b69a11d9ea83 100644 (file)
@@ -12,11 +12,6 @@ kvm-add-support-for-arch-compat-vm-ioctls.patch
 kvm-arm64-vgic-fix-exit-condition-in-scan_its_table.patch
 media-mceusb-set-timeout-to-at-least-timeout-provided.patch
 media-venus-dec-handle-the-case-where-find_format-fails.patch
-bpf-generate-btf_kind_float-when-linking-vmlinux.patch
-kbuild-quote-objcopy-var-to-avoid-a-pahole-call-break-the-build.patch
-kbuild-skip-per-cpu-btf-generation-for-pahole-v1.18-v1.21.patch
-kbuild-unify-options-for-btf-generation-for-vmlinux-and-modules.patch
-kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch
 block-wbt-remove-unnecessary-invoking-of-wbt_update_limits-in-wbt_init.patch
 blk-wbt-call-rq_qos_add-after-wb_normal-is-initialized.patch
 arm64-errata-remove-aes-hwcap-for-compat-tasks.patch
diff --git a/temp-5.10/bpf-generate-btf_kind_float-when-linking-vmlinux.patch b/temp-5.10/bpf-generate-btf_kind_float-when-linking-vmlinux.patch
deleted file mode 100644 (file)
index ff15941..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From foo@baz Wed Oct 26 06:44:13 PM CEST 2022
-From: Jiri Olsa <jolsa@kernel.org>
-Date: Wed, 19 Oct 2022 10:56:00 +0200
-Subject: bpf: Generate BTF_KIND_FLOAT when linking vmlinux
-To: stable@vger.kernel.org
-Cc: "Andrii Nakryiko" <andrii@kernel.org>, bpf@vger.kernel.org, "Arnaldo Carvalho de Melo" <acme@kernel.org>, "Daniel Borkmann" <daniel@iogearbox.net>, "Martin Rodriguez Reboredo" <yakoyoku@gmail.com>, "Javier Martinez Canillas" <javierm@redhat.com>, "Ilya Leoshkevich" <iii@linux.ibm.com>, "Nathan Chancellor" <nathan@kernel.org>, "Philip Müller" <philm@manjaro.org>
-Message-ID: <20221019085604.1017583-2-jolsa@kernel.org>
-
-From: Ilya Leoshkevich <iii@linux.ibm.com>
-
-commit db16c1fe92d7ba7d39061faef897842baee2c887  upstream.
-
-[backported for dependency only extra_paholeopt variable setup and
-usage, we don't want floats generated in 5.10]
-
-pahole v1.21 supports the --btf_gen_floats flag, which makes it
-generate the information about the floating-point types [1].
-
-Adjust link-vmlinux.sh to pass this flag to pahole in case it's
-supported, which is determined using a simple version check.
-
-[1] https://lore.kernel.org/dwarves/YHRiXNX1JUF2Az0A@kernel.org/
-
-Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
-Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
-Acked-by: Andrii Nakryiko <andrii@kernel.org>
-Link: https://lore.kernel.org/bpf/20210413190043.21918-1-iii@linux.ibm.com
-Signed-off-by: Jiri Olsa <jolsa@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- scripts/link-vmlinux.sh |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/scripts/link-vmlinux.sh
-+++ b/scripts/link-vmlinux.sh
-@@ -146,6 +146,7 @@ vmlinux_link()
- gen_btf()
- {
-       local pahole_ver
-+      local extra_paholeopt=
-       if ! [ -x "$(command -v ${PAHOLE})" ]; then
-               echo >&2 "BTF: ${1}: pahole (${PAHOLE}) is not available"
-@@ -161,7 +162,7 @@ gen_btf()
-       vmlinux_link ${1}
-       info "BTF" ${2}
--      LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${1}
-+      LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${extra_paholeopt} ${1}
-       # Create ${2} which contains just .BTF section but no symbols. Add
-       # SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all
diff --git a/temp-5.10/kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch b/temp-5.10/kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch
deleted file mode 100644 (file)
index ffaa5bd..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From foo@baz Wed Oct 26 06:44:13 PM CEST 2022
-From: Jiri Olsa <jolsa@kernel.org>
-Date: Wed, 19 Oct 2022 10:56:04 +0200
-Subject: kbuild: Add skip_encoding_btf_enum64 option to pahole
-To: stable@vger.kernel.org
-Cc: bpf@vger.kernel.org, "Arnaldo Carvalho de Melo" <acme@kernel.org>, "Daniel Borkmann" <daniel@iogearbox.net>, "Martin Rodriguez Reboredo" <yakoyoku@gmail.com>, "Andrii Nakryiko" <andrii@kernel.org>, "Javier Martinez Canillas" <javierm@redhat.com>, "Ilya Leoshkevich" <iii@linux.ibm.com>, "Nathan Chancellor" <nathan@kernel.org>, "Philip Müller" <philm@manjaro.org>
-Message-ID: <20221019085604.1017583-6-jolsa@kernel.org>
-
-From: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
-
-New pahole (version 1.24) generates by default new BTF_KIND_ENUM64 BTF tag,
-which is not supported by stable kernel.
-
-As a result the kernel with CONFIG_DEBUG_INFO_BTF option will fail to
-compile with following error:
-
-  BTFIDS  vmlinux
-FAILED: load BTF from vmlinux: Invalid argument
-
-New pahole provides --skip_encoding_btf_enum64 option to skip BTF_KIND_ENUM64
-generation and produce BTF supported by stable kernel.
-
-Adding this option to scripts/pahole-flags.sh.
-
-This change does not have equivalent commit in linus tree, because linus tree
-has support for BTF_KIND_ENUM64 tag, so it does not need to be disabled.
-
-Signed-off-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
-Signed-off-by: Jiri Olsa <jolsa@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- scripts/pahole-flags.sh |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/scripts/pahole-flags.sh
-+++ b/scripts/pahole-flags.sh
-@@ -14,4 +14,8 @@ if [ "${pahole_ver}" -ge "118" ] && [ "$
-       extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars"
- fi
-+if [ "${pahole_ver}" -ge "124" ]; then
-+      extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64"
-+fi
-+
- echo ${extra_paholeopt}
diff --git a/temp-5.10/kbuild-quote-objcopy-var-to-avoid-a-pahole-call-break-the-build.patch b/temp-5.10/kbuild-quote-objcopy-var-to-avoid-a-pahole-call-break-the-build.patch
deleted file mode 100644 (file)
index cf48c72..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-From foo@baz Wed Oct 26 06:44:13 PM CEST 2022
-From: Jiri Olsa <jolsa@kernel.org>
-Date: Wed, 19 Oct 2022 10:56:01 +0200
-Subject: kbuild: Quote OBJCOPY var to avoid a pahole call break the build
-To: stable@vger.kernel.org
-Cc: "Andrii Nakryiko" <andrii@kernel.org>, "Arnaldo Carvalho de Melo" <acme@redhat.com>, bpf@vger.kernel.org, "Arnaldo Carvalho de Melo" <acme@kernel.org>, "Daniel Borkmann" <daniel@iogearbox.net>, "Martin Rodriguez Reboredo" <yakoyoku@gmail.com>, "Javier Martinez Canillas" <javierm@redhat.com>, "Ilya Leoshkevich" <iii@linux.ibm.com>, "Nathan Chancellor" <nathan@kernel.org>, "Philip Müller" <philm@manjaro.org>
-Message-ID: <20221019085604.1017583-3-jolsa@kernel.org>
-
-From: Javier Martinez Canillas <javierm@redhat.com>
-
-commit ff2e6efda0d5c51b33e2bcc0b0b981ac0a0ef214 upstream.
-
-[backported for dependency, skipped Makefile.modfinal change,
-because module BTF is not supported in 5.10]
-
-The ccache tool can be used to speed up cross-compilation, by calling the
-compiler and binutils through ccache. For example, following should work:
-
-    $ export ARCH=arm64 CROSS_COMPILE="ccache aarch64-linux-gnu-"
-
-    $ make M=drivers/gpu/drm/rockchip/
-
-but pahole fails to extract the BTF info from DWARF, breaking the build:
-
-      CC [M]  drivers/gpu/drm/rockchip//rockchipdrm.mod.o
-      LD [M]  drivers/gpu/drm/rockchip//rockchipdrm.ko
-      BTF [M] drivers/gpu/drm/rockchip//rockchipdrm.ko
-    aarch64-linux-gnu-objcopy: invalid option -- 'J'
-    Usage: aarch64-linux-gnu-objcopy [option(s)] in-file [out-file]
-     Copies a binary file, possibly transforming it in the process
-    ...
-    make[1]: *** [scripts/Makefile.modpost:156: __modpost] Error 2
-    make: *** [Makefile:1866: modules] Error 2
-
-this fails because OBJCOPY is set to "ccache aarch64-linux-gnu-copy" and
-later pahole is executed with the following command line:
-
-    LLVM_OBJCOPY=$(OBJCOPY) $(PAHOLE) -J --btf_base vmlinux $@
-
-which gets expanded to:
-
-    LLVM_OBJCOPY=ccache aarch64-linux-gnu-objcopy pahole -J ...
-
-instead of:
-
-    LLVM_OBJCOPY="ccache aarch64-linux-gnu-objcopy" pahole -J ...
-
-Fixes: 5f9ae91f7c0d ("kbuild: Build kernel module BTFs if BTF is enabled and pahole supports it")
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
-Acked-by: Andrii Nakryiko <andrii@kernel.org>
-Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Link: https://lore.kernel.org/bpf/20210526215228.3729875-1-javierm@redhat.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- scripts/link-vmlinux.sh |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/scripts/link-vmlinux.sh
-+++ b/scripts/link-vmlinux.sh
-@@ -162,7 +162,7 @@ gen_btf()
-       vmlinux_link ${1}
-       info "BTF" ${2}
--      LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${extra_paholeopt} ${1}
-+      LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${extra_paholeopt} ${1}
-       # Create ${2} which contains just .BTF section but no symbols. Add
-       # SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all
diff --git a/temp-5.10/kbuild-skip-per-cpu-btf-generation-for-pahole-v1.18-v1.21.patch b/temp-5.10/kbuild-skip-per-cpu-btf-generation-for-pahole-v1.18-v1.21.patch
deleted file mode 100644 (file)
index f1da8b0..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-From foo@baz Wed Oct 26 06:44:13 PM CEST 2022
-From: Jiri Olsa <jolsa@kernel.org>
-Date: Wed, 19 Oct 2022 10:56:02 +0200
-Subject: kbuild: skip per-CPU BTF generation for pahole v1.18-v1.21
-To: stable@vger.kernel.org
-Cc: "Mel Gorman" <mgorman@techsingularity.net>, "Arnaldo Carvalho de Melo" <acme@redhat.com>, "Hao Luo" <haoluo@google.com>, "Michal Suchanek" <msuchanek@suse.de>, bpf@vger.kernel.org, "Arnaldo Carvalho de Melo" <acme@kernel.org>, "Daniel Borkmann" <daniel@iogearbox.net>, "Martin Rodriguez Reboredo" <yakoyoku@gmail.com>, "Andrii Nakryiko" <andrii@kernel.org>, "Javier Martinez Canillas" <javierm@redhat.com>, "Ilya Leoshkevich" <iii@linux.ibm.com>, "Nathan Chancellor" <nathan@kernel.org>, "Philip Müller" <philm@manjaro.org>
-Message-ID: <20221019085604.1017583-4-jolsa@kernel.org>
-
-From: Andrii Nakryiko <andrii@kernel.org>
-
-commit a0b8200d06ad6450c179407baa5f0f52f8cfcc97 upstream.
-
-[small context changes due to missing floats support in 5.10]
-
-Commit "mm/page_alloc: convert per-cpu list protection to local_lock" will
-introduce a zero-sized per-CPU variable, which causes pahole to generate
-invalid BTF.  Only pahole versions 1.18 through 1.21 are impacted, as
-before 1.18 pahole doesn't know anything about per-CPU variables, and 1.22
-contains the proper fix for the issue.
-
-Luckily, pahole 1.18 got --skip_encoding_btf_vars option disabling BTF
-generation for per-CPU variables in anticipation of some unanticipated
-problems.  So use this escape hatch to disable per-CPU var BTF info on
-those problematic pahole versions.  Users relying on availability of
-per-CPU var BTFs would need to upgrade to pahole 1.22+, but everyone won't
-notice any regressions.
-
-Link: https://lkml.kernel.org/r/20210530002536.3193829-1-andrii@kernel.org
-Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
-Acked-by: Mel Gorman <mgorman@techsingularity.net>
-Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
-Cc: Hao Luo <haoluo@google.com>
-Cc: Michal Suchanek <msuchanek@suse.de>
-Cc: Jiri Olsa <jolsa@kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Jiri Olsa <jolsa@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- scripts/link-vmlinux.sh |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/scripts/link-vmlinux.sh
-+++ b/scripts/link-vmlinux.sh
-@@ -161,6 +161,11 @@ gen_btf()
-       vmlinux_link ${1}
-+      if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then
-+              # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars
-+              extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars"
-+      fi
-+
-       info "BTF" ${2}
-       LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${extra_paholeopt} ${1}
diff --git a/temp-5.10/kbuild-unify-options-for-btf-generation-for-vmlinux-and-modules.patch b/temp-5.10/kbuild-unify-options-for-btf-generation-for-vmlinux-and-modules.patch
deleted file mode 100644 (file)
index 130e5b5..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-From foo@baz Wed Oct 26 06:44:13 PM CEST 2022
-From: Jiri Olsa <jolsa@kernel.org>
-Date: Wed, 19 Oct 2022 10:56:03 +0200
-Subject: kbuild: Unify options for BTF generation for vmlinux and modules
-To: stable@vger.kernel.org
-Cc: "Andrii Nakryiko" <andrii@kernel.org>, bpf@vger.kernel.org, "Arnaldo Carvalho de Melo" <acme@kernel.org>, "Daniel Borkmann" <daniel@iogearbox.net>, "Martin Rodriguez Reboredo" <yakoyoku@gmail.com>, "Javier Martinez Canillas" <javierm@redhat.com>, "Ilya Leoshkevich" <iii@linux.ibm.com>, "Nathan Chancellor" <nathan@kernel.org>, "Philip Müller" <philm@manjaro.org>
-Message-ID: <20221019085604.1017583-5-jolsa@kernel.org>
-
-From: Jiri Olsa <jolsa@redhat.com>
-
-commit 9741e07ece7c247dd65e1aa01e16b683f01c05a8 upstream.
-
-[skipped --btf_gen_floats option in pahole-flags.sh, skipped
-Makefile.modfinal change, because there's no BTF kmod support,
-squashing in 'exit 0' change from merge commit fc02cb2b37fe]
-
-Using new PAHOLE_FLAGS variable to pass extra arguments to
-pahole for both vmlinux and modules BTF data generation.
-
-Adding new scripts/pahole-flags.sh script that detect and
-prints pahole options.
-
-[ fixed issues found by kernel test robot ]
-
-Signed-off-by: Jiri Olsa <jolsa@kernel.org>
-Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
-Acked-by: Andrii Nakryiko <andrii@kernel.org>
-Link: https://lore.kernel.org/bpf/20211029125729.70002-1-jolsa@kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- Makefile                |    3 +++
- scripts/link-vmlinux.sh |    8 +-------
- scripts/pahole-flags.sh |   17 +++++++++++++++++
- 3 files changed, 21 insertions(+), 7 deletions(-)
- create mode 100755 scripts/pahole-flags.sh
-
---- a/Makefile
-+++ b/Makefile
-@@ -465,6 +465,8 @@ LZ4                = lz4c
- XZ            = xz
- ZSTD          = zstd
-+PAHOLE_FLAGS  = $(shell PAHOLE=$(PAHOLE) $(srctree)/scripts/pahole-flags.sh)
-+
- CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
-                 -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)
- NOSTDINC_FLAGS :=
-@@ -518,6 +520,7 @@ export KBUILD_CFLAGS CFLAGS_KERNEL CFLAG
- export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
- export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE
- export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL
-+export PAHOLE_FLAGS
- # Files to ignore in find ... statements
---- a/scripts/link-vmlinux.sh
-+++ b/scripts/link-vmlinux.sh
-@@ -146,7 +146,6 @@ vmlinux_link()
- gen_btf()
- {
-       local pahole_ver
--      local extra_paholeopt=
-       if ! [ -x "$(command -v ${PAHOLE})" ]; then
-               echo >&2 "BTF: ${1}: pahole (${PAHOLE}) is not available"
-@@ -161,13 +160,8 @@ gen_btf()
-       vmlinux_link ${1}
--      if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then
--              # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars
--              extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars"
--      fi
--
-       info "BTF" ${2}
--      LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${extra_paholeopt} ${1}
-+      LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${PAHOLE_FLAGS} ${1}
-       # Create ${2} which contains just .BTF section but no symbols. Add
-       # SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all
---- /dev/null
-+++ b/scripts/pahole-flags.sh
-@@ -0,0 +1,17 @@
-+#!/bin/sh
-+# SPDX-License-Identifier: GPL-2.0
-+
-+extra_paholeopt=
-+
-+if ! [ -x "$(command -v ${PAHOLE})" ]; then
-+      exit 0
-+fi
-+
-+pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/')
-+
-+if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then
-+      # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars
-+      extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars"
-+fi
-+
-+echo ${extra_paholeopt}