Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit dc8cab1

Browse files
committed
Merge tag 'android15-6.6.57_r00' into android15-6.6
Catch the android15-6.6 branch up to the 6.6.57 LTS release. Changes included in here include: * c47a7d2 Merge bed2b90 ("mm/swapfile: skip HugeTLB pages for unuse_vma") into android15-6.6 |\ | * bed2b90 mm/swapfile: skip HugeTLB pages for unuse_vma | * a0035fc mm/mglru: only clear kswapd_failures if reclaimable | * 17396e3 mm/mremap: fix move_normal_pmd/retract_page_tables race | * 6b91fd6 selftests/mm: fix deadlock for fork after pthread_create on ARM | * 8f5fa1c selftests/mm: replace atomic_bool with pthread_barrier_t | * a9af9d5 fat: fix uninitialized variable | * 8e29f32 irqchip/gic-v3-its: Fix VSYNC referencing an unmapped VPE on GIC v4.1 | * 20b5342 net: microchip: vcap api: Fix memory leaks in vcap_api_encode_rule_test() | * 81db1e5 net: macb: Avoid 20s boot delay by skipping MDIO bus registration for fixed-link PHY | * 8165bf8 arm64: probes: Fix uprobes for big-endian kernels | * 173c13e arm64: probes: Fix simulate_ldr*_literal() | * 9f1e773 arm64: probes: Remove broken LDR (literal) uprobe support | * a3f169e posix-clock: Fix missing timespec64 check in pc_clock_settime() | * 75150ba net: enetc: add missing static descriptor and inline keyword | * 760a7c9 net: enetc: disable NAPI after all rings are disabled | * a419f47 net: enetc: disable Tx BD rings after they are empty | * 3718434 net: enetc: block concurrent XDP transmissions during ring reconfiguration | * 1c95443 net: enetc: remove xdp_drops statistic from enetc_xdp_drop() | * 7b2e478 mptcp: pm: fix UaF read in mptcp_pm_nl_rm_addr_or_subflow | * 3c088db ALSA: hda/conexant - Fix audio routing for HP EliteOne 1000 G2 | * 5511999 ksmbd: fix user-after-free from session log off | * 7fc7c47 btrfs: fix uninitialized pointer free on read_alloc_one_name() error | * e11ce03 btrfs: fix uninitialized pointer free in add_inode_ref() * | 987f817 Merge 6.6.57 into android15-6.6-lts |\| | * e9448e3 Linux 6.6.57 | * 8d5aebf scsi: Revert "scsi: sd: Do not repeat the starting disk message" | * e6fc67c e1000e: fix force smbus during suspend flow | * 611f74b net: ethernet: cortina: Restore TSO support | * 7caf966 secretmem: disable memfd_secret() if arch cannot set direct map | * e5a0031 fs/proc/kcore.c: allow translation of physical memory addresses | * 19a5029 kthread: unpark only parked kthread | * f00545e btrfs: split remaining space to discard in chunks | * 73a4f5a selftests/rseq: Fix mm_cid test failure | * 87070a9 selftests/mm: fix incorrect buffer->mirror size in hmm2 double_map test | * bd3222d powercap: intel_rapl_tpmi: Fix bogus register reading | * 697e3dd nouveau/dmem: Fix vulnerability in migrate_to_ram upon copy error | * b822007 device-dax: correct pgoff align in dax_set_mapping() | * 8b36f4d mptcp: pm: do not remove closing subflows | * b8be15d mptcp: handle consistently DSS corruption | * 143ffa7 net: phy: Remove LED entry from LEDs list on unregister | * 28a2c3e net: dsa: lan9303: ensure chip reset and wait for READY status | * 3be342e net: Fix an unsafe loop on the list | * 563e689 net: explicitly clear the sk pointer, when pf->create fails | * 31c6222 ata: libata: avoid superfluous disk spin down + spin up during hibernation | * a448ced mptcp: fallback when MPTCP opts are dropped after 1st data * | 949695e Merge 7994a48 ("scsi: ufs: Use pre-calculated offsets in ufshcd_init_lrb()") into android15-6.6-lts |\| | * 7994a48 scsi: ufs: Use pre-calculated offsets in ufshcd_init_lrb() | * e04642a scsi: wd33c93: Don't use stale scsi_pointer value | * 8676393 Bluetooth: hci_conn: Fix UAF in hci_enhanced_setup_sync | * 55f2bd9 drm/i915/hdcp: fix connector refcounting | * 937943c drm/vc4: Stop the active perfmon before being destroyed | * 07c5110 drm/v3d: Stop the active perfmon before being destroyed | * fb1643d hid: intel-ish-hid: Fix uninitialized variable 'rv' in ish_fw_xfer_direct_dma | * 0b97fe0 usb: gadget: core: force synchronous registration | * 0770cda usb: storage: ignore bogus device raised by JieLi BR21 USB sound chip | * cb8b441 usb: xhci: Fix problem with xhci resume from suspend | * 38aef06 usb: dwc3: core: Stop processing of pending events if controller is halted | * 936564b Revert "usb: yurex: Replace snprintf() with the safer scnprintf() variant" | * 1fa959e HID: plantronics: Workaround for an unexcepted opposite volume key | * c1846e0 HID: multitouch: Add support for lenovo Y9000P Touchpad | * 1c3b4c9 HID: amd_sfh: Switch to device-managed dmam_alloc_coherent() | * 11381ee hwmon: (adt7470) Add missing dependency on REGMAP_I2C | * f503329 hwmon: (adm9240) Add missing dependency on REGMAP_I2C | * fe5866f hwmon: (mc34vr500) Add missing dependency on REGMAP_I2C | * de90999 hwmon: (tmp513) Add missing dependency on REGMAP_I2C | * 2caf6c4 hwmon: intel-m10-bmc-hwmon: relabel Columbiaville to CVL Die Temperature | * 26b177e wifi: mac80211: Avoid address calculations via out of bounds array indexing | * ea912d3 hid-asus: add ROG Ally X prod ID to quirk list | * 1815b32 HID: asus: add ROG Z13 lightbar | * 5ec4596 HID: asus: add ROG Ally N-Key ID and keycodes | * f742108 HID: i2c-hid: Skip SET_POWER SLEEP for Cirque touchpad on system suspend | * 64575ec HID: i2c-hid: Renumber I2C_HID_QUIRK_ defines | * e600ee9 HID: i2c-hid: Remove I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV quirk | * b289b83 HID: mcp2200: added driver for GPIOs of MCP2200 * | b131b8a Revert "rtnetlink: change nlk->cb_mutex role" * | 20a7f3c Revert "rtnetlink: add RTNL_FLAG_DUMP_UNLOCKED flag" * | d1697bc Revert "phonet: no longer hold RTNL in route_dumpit()" * | 847f07e Revert "phonet: Handle error of rtnl_register_module()." * | ced98dd Revert "mpls: no longer hold RTNL in mpls_netconf_dump_devconf()" * | 50bb17d Revert "mpls: Handle error of rtnl_register_module()." * | 8527422 Merge 84a5fee ("rcu/nocb: Fix rcuog wake-up from offline softirq") into android15-6.6-lts |\| | * 84a5fee rcu/nocb: Fix rcuog wake-up from offline softirq | * 174caf7 rcu/nocb: Make IRQs disablement symmetric | * 8bb79eb slip: make slhc_remember() more robust against malicious packets | * 8fe992f ppp: fix ppp_async_encode() illegal access | * c246bfb phonet: Handle error of rtnl_register_module(). | * a8e473f phonet: no longer hold RTNL in route_dumpit() | * 4597c38 mpls: Handle error of rtnl_register_module(). | * ff7abcc mpls: no longer hold RTNL in mpls_netconf_dump_devconf() | * ba5366b rtnetlink: add RTNL_FLAG_DUMP_UNLOCKED flag | * c8c76f1 rtnetlink: change nlk->cb_mutex role | * f4df31a mctp: Handle error of rtnl_register_module(). | * 60bfd34 bridge: Handle error of rtnl_register_module(). | * ca15d28 vxlan: Handle error of rtnl_register_module(). | * 35b72be rtnetlink: Add bulk registration helpers for rtnetlink message handlers. | * eae7435 net: do not delay dst_entries_add() in dst_release() | * 64121e3 netfilter: fib: check correct rtable in vrf setups * | 1fd6baf UPSTREAM: netfilter: xtables: fix typo causing some targets not to load on IPv6 * | 94d28e6 Merge 997f67d ("netfilter: xtables: avoid NFPROTO_UNSPEC where needed") into android15-6.6-lts |\| | * 997f67d netfilter: xtables: avoid NFPROTO_UNSPEC where needed * | 1069c55 ANDROID: GKI: rexport __qdisc_calculate_pkt_len * | 5b7829d Revert "tcp: new TCP_INFO stats for RTO events" * | 6eb2f6b Revert "tcp: fix TFO SYN_RECV to not zero retrans_stamp with retransmits out" * | 7fc395e Merge b4ff011 ("sctp: ensure sk_state is set to CLOSED if hashing fails in sctp_listen_start") into android15-6.6-lts |\| | * b4ff011 sctp: ensure sk_state is set to CLOSED if hashing fails in sctp_listen_start | * a63850d btrfs: zoned: fix missing RCU locking in error message when loading zone info | * 25c5ef2 net: ibm: emac: mal: fix wrong goto | * 1edf039 net/sched: accept TCA_STAB only for root qdisc | * ba578ec e1000e: change I219 (19) devices to ADP | * 57c5053 igb: Do not bring the device up after non-fatal error | * 703c4d8 i40e: Fix macvlan leak by synchronizing access to mac_filter_hash | * 29d7aa1 ice: Flush FDB entries before reset | * 3b66266 ice: rename switchdev to eswitch | * fa6ab2d ice: Fix netif_is_ice() in Safe Mode | * a91c6e1 powercap: intel_rapl_tpmi: Ignore minor version change | * f0a6c43 platform/x86/intel/tpmi: Add defines to get version information | * 1e4a5ee gpio: aspeed: Use devm_clk api to manage clock source | * 2a165df gpio: aspeed: Add the flush write to ensure the write complete. | * cfa836d nouveau/dmem: Fix privileged error in copy engine channel | * 0aac3fb drm/nouveau: pass cli to nouveau_channel_new() instead of drm+device | * ca57186 net: dsa: b53: fix jumbo frames on 10/100 ports | * dd5b3a8 net: dsa: b53: allow lower MTUs on BCM5325/5365 | * 94c4cb9 net: dsa: b53: fix max MTU for BCM5325/BCM5365 | * bd1f41c net: dsa: b53: fix max MTU for 1g switches | * f9a966a net: dsa: b53: fix jumbo frame mtu check | * 1d068c9 net: ethernet: adi: adin1110: Fix some error handling path in adin1110_read_fifo() | * 826e9b7 Revert "net: stmmac: set PP_FLAG_DMA_SYNC_DEV only if XDP is enabled" | * dd64ea0 thermal: intel: int340x: processor: Fix warning during module unload | * 335a4cb thermal: int340x: processor_thermal: Set feature mask before proc_thermal_add | * 80a146b net: phy: bcm84881: Fix some error handling paths | * 38b2d5a Bluetooth: RFCOMM: FIX possible deadlock in rfcomm_sk_state_change | * 597ea17 selftests: net: no_forwarding: fix VID for $swp2 in one_bridge_two_pvids() test | * 3453f58 netfilter: br_netfilter: fix panic with metadata_dst skb | * 446be55 rxrpc: Fix uninitialised variable in rxrpc_send_data() | * 2daffbd tcp: fix TFO SYN_RECV to not zero retrans_stamp with retransmits out | * 718c49f tcp: new TCP_INFO stats for RTO events | * 04dce9a tcp: fix tcp_enter_recovery() to zero retrans_stamp when it's safe | * e676ca6 tcp: fix to allow timestamp undo if no retransmits were sent | * 9ca6346 net: phy: dp83869: fix memory corruption when enabling fiber | * fca41e5 NFSv4: Prevent NULL-pointer dereference in nfs42_complete_copies() | * dedc14e SUNRPC: Fix integer overflow in decode_rc_list() * | 8195df6 Merge fde7db1 ("ice: fix VLAN replay after reset") into android15-6.6-lts |\| | * fde7db1 ice: fix VLAN replay after reset | * 803f310 ice: set correct dst VSI in only LAN filters | * 4ab0723 NFSD: Mark filecache "down" if init fails | * 1fab023 x86/amd_nb: Add new PCI IDs for AMD family 1Ah model 60h | * 9736678 x86/amd_nb: Add new PCI IDs for AMD family 0x1a | * 688872c fbdev: sisfb: Fix strbuf array overflow | * 0809fb8 smb: client: fix UAF in async decryption | * f7fb5dd fbcon: Fix a NULL pointer dereference issue in fbcon_putcs | * 65b2d49 drm/amd/display: Check null pointer before dereferencing se | * 0ef6e01 scsi: lpfc: Ensure DA_ID handling completion before deleting an NPIV instance | * ab88c77 scsi: lpfc: Add ELS_RSP cmd to the list of WQEs to flush in lpfc_els_flush_cmd() | * 5da9855 driver core: bus: Return -EIO instead of 0 when show/store invalid bus attribute | * d885c46 driver core: bus: Fix double free in driver API bus_register() | * a84ae28 staging: vme_user: added bound check to geoid | * 5b53a7a tools/iio: Add memory allocation failure check for trigger_name | * b01793c virtio_pmem: Check device status before requesting flush | * 784744b netfilter: nf_reject: Fix build warning when CONFIG_BRIDGE_NETFILTER=n | * 5b04f41 netfilter: nf_nat: don't try nat source port reallocation for reverse dir clash | * 1215e29 LoongArch: Fix memleak in pci_acpi_scan_root() | * 0b700d2 comedi: ni_routing: tools: Check when the file could not be opened | * 0be5282 usb: dwc2: Adjust the timing of USB Driver Interrupt Registration in the Crashkernel Scenario | * 01ac64e usb: chipidea: udc: enable suspend interrupt after usb reset | * b72bf5c usb: typec: tipd: Free IRQ only if it was requested before | * e418d91 serial: protect uart_port_dtr_rts() in uart_shutdown() too | * 339273a clk: imx: Remove CLK_SET_PARENT_GATE for DRAM mux for i.MX7D | * 7fb5f95 remoteproc: imx_rproc: Use imx specific hook for find_loaded_rsc_table | * 7af8d69 media: videobuf2-core: clear memory related fields in __vb2_plane_dmabuf_put() | * a39416d riscv/kexec_file: Fix relocation type R_RISCV_ADD16 and R_RISCV_SUB16 unknown | * 740a605 soundwire: cadence: re-check Peripheral status with delayed_work | * 99002ae RDMA/mlx5: Enforce umem boundaries for explicit ODP page faults | * a29a9c2 riscv: avoid Imbalance in RAS | * 50c4307 mfd: intel_soc_pmic_chtwc: Make Lenovo Yoga Tab 3 X90F DMI match less strict | * fa840ba ntb: ntb_hw_switchtec: Fix use after free vulnerability in switchtec_ntb_remove due to race condition | * f4ce3b5 io_uring: check if we need to reschedule during overflow flush | * 3088483 RISC-V: Don't have MAX_PHYSMEM_BITS exceed phys_addr_t | * ea0256e i3c: master: cdns: Fix use after free vulnerability in cdns_i3c_master Driver Due to Race Condition | * 8f53f6f PCI: Mark Creative Labs EMU20k2 INTx masking as broken | * f8e2a04 i2c: i801: Use a different adapter-name for IDF adapters | * 2488685 PCI: Add ACS quirk for Qualcomm SA8775P | * f829cb4 clk: bcm: bcm53573: fix OF node leak in init * | e64a7d1 Revert "bpf: Prevent tail call between progs attached to different hooks" * | 764ed90 Revert "scsi: Remove scsi device no_start_on_resume flag" * | b1ed761 Revert "scsi: sd: Do not repeat the starting disk message" * | 9b330fb Merge ccb8e44 ("RDMA/rtrs-srv: Avoid null pointer deref during path establishment") into android15-6.6-lts |\| | * ccb8e44 RDMA/rtrs-srv: Avoid null pointer deref during path establishment | * bd9a77a PCI: Add function 0 DMA alias quirk for Glenfly Arise chip | * 1598bf0 soundwire: intel_bus_common: enable interrupts before exiting reset | * a195a42 RDMA/mad: Improve handling of timed out WRs of mad agent | * 6ba8ecf ktest.pl: Avoid false positives with grub2 skip regex | * 5d5e3b4 bpf: Prevent tail call between progs attached to different hooks | * 96b1280 s390/cpum_sf: Remove WARN_ON_ONCE statements | * e789b7f ext4: nested locking for xattr inode | * 58c0648 ext4: don't set SB_RDONLY after filesystem errors | * cadbdd7 bpf, x64: Fix a jit convergence issue | * 5575bea s390/mm: Add cond_resched() to cmm_alloc/free_pages() | * 78cddbd s390/facility: Disable compile time optimization for decompressor code | * c43622d bpf: Check percpu map value size first | * aaa880f selftests/bpf: Fix ARG_PTR_TO_LONG {half-,}uninitialized test | * 1881193 Input: synaptics-rmi4 - fix UAF of IRQ domain on driver removal | * 6e20720 zram: don't free statically defined names | * 6272936 zram: free secondary algorithms names | * c556e72 ntfs3: Change to non-blocking allocation in ntfs_d_hash | * fd94986 virtio_console: fix misc probe bugs | * 5e20797 fs/ntfs3: Refactor enum_rstbl to suppress static checker | * cdb1efe fs/ntfs3: Fix sparse warning in ni_fiemap | * 16f93bd fs/ntfs3: Do not call file_modified if collapse range failed | * 939b4b2 drm/amd/display: Revert "Check HDCP returned status" | * b505e4f drm/amd/display: Remove a redundant check in authenticated_dp | * 1a7ca97 lib/build_OID_registry: avoid non-destructive substitution for Perl < 5.13.2 compat | * dcfaf8b jbd2: fix kernel-doc for j_transaction_overhead_buffers | * 5f77c8e Bluetooth: Fix usage of __hci_cmd_sync_status | * 66c4360 selftests: Introduce Makefile variable to list shared bash scripts | * f45c65b selftests: net: Remove executable bits from library scripts | * ab656dd libsubcmd: Don't free the usage string | * 03cec19 perf sched: Move curr_pid and cpu_last_switched initialization to perf_sched__{lat|map|replay}() | * 4078f1d perf sched: Move curr_thread initialization to perf_sched__map() | * e649fb7 perf sched: Fix memory leak in perf_sched__map() | * 85ca3d4 perf sched: Move start_work_mutex and work_done_wait_mutex initialization to perf_sched__replay() | * 8605243 bootconfig: Fix the kerneldoc of _xbc_exit() | * f0fc028 e1000e: move force SMBUS near the end of enable_ulp function | * 1fe8304 i40e: Include types.h to some headers | * f717743 i40e: Fix ST code value for Clause 45 | * a47a759 scsi: sd: Do not repeat the starting disk message | * 9e6075e scsi: Remove scsi device no_start_on_resume flag * | fc6c0cd Merge 2e56117 ("ASoC: tas2781: mark dvc_tlv with __maybe_unused") into android15-6.6-lts |\| | * 2e56117 ASoC: tas2781: mark dvc_tlv with __maybe_unused | * 9c122d0 ata: ahci: Add mask_port_map module parameter | * 924c0af spi: spi-fsl-lpspi: remove redundant spi_controller_put call | * 18f3fdb riscv: cpufeature: Fix thead vector hwcap removal | * 5915b89 tracing: Have saved_cmdlines arrays all in one allocation | * 26c907b libceph: init the cursor when preparing sparse read in msgr2 | * fb90d97 pds_core: no health-thread in VF path | * bd1521e Revert "powerpc/ps3_defconfig: Disable PPC64_BIG_ENDIAN_ELF_ABI_V2" | * 4398765 bus: mhi: ep: Do not allocate memory for MHI objects from DMA zone | * 39601f4 bus: mhi: ep: Add support for async DMA read operation | * b6af3a9 bus: mhi: ep: Add support for async DMA write operation | * a77e595 bus: mhi: ep: Introduce async read/write callbacks | * efdfa92 bus: mhi: ep: Rename read_from_host() and write_to_host() APIs | * be6c52b drm/crtc: fix uninitialized variable use even harder | * 0d3d223 ALSA: hda/realtek: cs35l41: Fix device ID / model name | * c800174 ALSA: hda/realtek: cs35l41: Fix order and duplicates in quirks table | * e87cb9d tracing: Remove precision vsnprintf() check from print event | * 9dd05da drm/panel: boe-tv101wum-nl6: Fine tune Himax83102-j02 panel HFP and HBP (again) | * 452c074 net: ethernet: cortina: Drop TSO support | * 6e0d055 riscv: Remove SHADOW_OVERFLOW_STACK_SIZE macro | * 50e3356 gfs2: Revert "ignore negated quota changes" | * 8251e3b gfs2: qd_check_sync cleanups | * e51c5af gfs2: Revert "introduce qd_bh_get_or_undo" | * 9060935 phy: qualcomm: eusb2-repeater: Rework init to drop redundant zero-out loop | * fa3532b phy: qualcomm: phy-qcom-eusb2-repeater: Add tuning overrides | * e905bc7 ASoC: cs35l56: Load tunings for the correct speaker models | * 9790a7a Revert "PCI/MSI: Provide stubs for IMS functions" | * 7745e14 net: fec: don't save PTP state if PTP is unsupported | * ac20736 unicode: Don't special case ignorable code points * c85a18d Merge branch 'android15-6.6' into android15-6.6-lts * 1c32c67 ANDROID: GKI: add some pci symbols to the virtual device list * 1bdac13 Merge branch 'android15-6.6' into android15-6.6-lts * 5606e91 Merge commit '83009f9e8377' into android15-6.6-lts * 2c3827d Merge commit '36ff1c94893b' into android15-6.6-lts * 6abb6b5 Merge commit '1024387ef8a7' into android15-6.6-lts * 7d41f04 Merge commit '6efc067f8653' into android15-6.6-lts * d262a3a Merge commit '1b71af176dd7' into android15-6.6-lts * 7fcee4e Merge commit 'ac3cc81be506' into android15-6.6-lts * 37c0346 ANDROID: Fix platforms config_setting values. * be46f7c Merge commit '0391215c1cb0' into android15-6.6-lts * 39e7522 Merge commit 'c3ffc2d6088e' into android15-6.6-lts * 24557b5 Merge commit 'fa971ae4451b' into android15-6.6-lts * ef63064 Merge commit '7d112046a3f0' into android15-6.6-lts * 73993eb Merge commit 'b5c719f94146' into android15-6.6-lts Change-Id: I50aa9116bc4734ae3064c85c0fcc9274b0d42165 Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents ff40f1d + c47a7d2 commit dc8cab1

File tree

266 files changed

+3182
-1215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+3182
-1215
lines changed

Documentation/dev-tools/kselftest.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,21 @@ Contributing new tests (details)
255255

256256
TEST_PROGS_EXTENDED, TEST_GEN_PROGS_EXTENDED mean it is the
257257
executable which is not tested by default.
258+
258259
TEST_FILES, TEST_GEN_FILES mean it is the file which is used by
259260
test.
260261

262+
TEST_INCLUDES is similar to TEST_FILES, it lists files which should be
263+
included when exporting or installing the tests, with the following
264+
differences:
265+
266+
* symlinks to files in other directories are preserved
267+
* the part of paths below tools/testing/selftests/ is preserved when
268+
copying the files to the output directory
269+
270+
TEST_INCLUDES is meant to list dependencies located in other directories of
271+
the selftests hierarchy.
272+
261273
* First use the headers inside the kernel source and/or git repo, and then the
262274
system headers. Headers for the kernel release as opposed to headers
263275
installed by the distro on the system should be the primary focus to be able

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 6
4-
SUBLEVEL = 56
4+
SUBLEVEL = 57
55
EXTRAVERSION =
66
NAME = Pinguïn Aangedreven
77

android/abi_gki_aarch64_virtual_device

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,11 @@
303303
param_ops_uint
304304
passthru_features_check
305305
pci_bus_type
306+
pci_iomap_range
306307
pci_release_region
308+
pci_release_selected_regions
307309
pci_request_region
310+
pci_request_selected_regions
308311
__per_cpu_offset
309312
perf_trace_buf_alloc
310313
perf_trace_run_bpf_submit

arch/arm64/include/asm/uprobes.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010
#include <asm/insn.h>
1111
#include <asm/probes.h>
1212

13-
#define MAX_UINSN_BYTES AARCH64_INSN_SIZE
14-
1513
#define UPROBE_SWBP_INSN cpu_to_le32(BRK64_OPCODE_UPROBES)
1614
#define UPROBE_SWBP_INSN_SIZE AARCH64_INSN_SIZE
17-
#define UPROBE_XOL_SLOT_BYTES MAX_UINSN_BYTES
15+
#define UPROBE_XOL_SLOT_BYTES AARCH64_INSN_SIZE
1816

1917
typedef __le32 uprobe_opcode_t;
2018

@@ -23,8 +21,8 @@ struct arch_uprobe_task {
2321

2422
struct arch_uprobe {
2523
union {
26-
u8 insn[MAX_UINSN_BYTES];
27-
u8 ixol[MAX_UINSN_BYTES];
24+
__le32 insn;
25+
__le32 ixol;
2826
};
2927
struct arch_probe_insn api;
3028
bool simulate;

arch/arm64/kernel/probes/decode-insn.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ arm_probe_decode_insn(probe_opcode_t insn, struct arch_probe_insn *api)
9999
aarch64_insn_is_blr(insn) ||
100100
aarch64_insn_is_ret(insn)) {
101101
api->handler = simulate_br_blr_ret;
102-
} else if (aarch64_insn_is_ldr_lit(insn)) {
103-
api->handler = simulate_ldr_literal;
104-
} else if (aarch64_insn_is_ldrsw_lit(insn)) {
105-
api->handler = simulate_ldrsw_literal;
106102
} else {
107103
/*
108104
* Instruction cannot be stepped out-of-line and we don't
@@ -140,6 +136,17 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)
140136
probe_opcode_t insn = le32_to_cpu(*addr);
141137
probe_opcode_t *scan_end = NULL;
142138
unsigned long size = 0, offset = 0;
139+
struct arch_probe_insn *api = &asi->api;
140+
141+
if (aarch64_insn_is_ldr_lit(insn)) {
142+
api->handler = simulate_ldr_literal;
143+
decoded = INSN_GOOD_NO_SLOT;
144+
} else if (aarch64_insn_is_ldrsw_lit(insn)) {
145+
api->handler = simulate_ldrsw_literal;
146+
decoded = INSN_GOOD_NO_SLOT;
147+
} else {
148+
decoded = arm_probe_decode_insn(insn, &asi->api);
149+
}
143150

144151
/*
145152
* If there's a symbol defined in front of and near enough to
@@ -157,7 +164,6 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)
157164
else
158165
scan_end = addr - MAX_ATOMIC_CONTEXT_SIZE;
159166
}
160-
decoded = arm_probe_decode_insn(insn, &asi->api);
161167

162168
if (decoded != INSN_REJECTED && scan_end)
163169
if (is_probed_address_atomic(addr - 1, scan_end))

arch/arm64/kernel/probes/simulate-insn.c

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -171,32 +171,28 @@ simulate_tbz_tbnz(u32 opcode, long addr, struct pt_regs *regs)
171171
void __kprobes
172172
simulate_ldr_literal(u32 opcode, long addr, struct pt_regs *regs)
173173
{
174-
u64 *load_addr;
174+
unsigned long load_addr;
175175
int xn = opcode & 0x1f;
176-
int disp;
177176

178-
disp = ldr_displacement(opcode);
179-
load_addr = (u64 *) (addr + disp);
177+
load_addr = addr + ldr_displacement(opcode);
180178

181179
if (opcode & (1 << 30)) /* x0-x30 */
182-
set_x_reg(regs, xn, *load_addr);
180+
set_x_reg(regs, xn, READ_ONCE(*(u64 *)load_addr));
183181
else /* w0-w30 */
184-
set_w_reg(regs, xn, *load_addr);
182+
set_w_reg(regs, xn, READ_ONCE(*(u32 *)load_addr));
185183

186184
instruction_pointer_set(regs, instruction_pointer(regs) + 4);
187185
}
188186

189187
void __kprobes
190188
simulate_ldrsw_literal(u32 opcode, long addr, struct pt_regs *regs)
191189
{
192-
s32 *load_addr;
190+
unsigned long load_addr;
193191
int xn = opcode & 0x1f;
194-
int disp;
195192

196-
disp = ldr_displacement(opcode);
197-
load_addr = (s32 *) (addr + disp);
193+
load_addr = addr + ldr_displacement(opcode);
198194

199-
set_x_reg(regs, xn, *load_addr);
195+
set_x_reg(regs, xn, READ_ONCE(*(s32 *)load_addr));
200196

201197
instruction_pointer_set(regs, instruction_pointer(regs) + 4);
202198
}

arch/arm64/kernel/probes/uprobes.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm,
4242
else if (!IS_ALIGNED(addr, AARCH64_INSN_SIZE))
4343
return -EINVAL;
4444

45-
insn = *(probe_opcode_t *)(&auprobe->insn[0]);
45+
insn = le32_to_cpu(auprobe->insn);
4646

4747
switch (arm_probe_decode_insn(insn, &auprobe->api)) {
4848
case INSN_REJECTED:
@@ -108,7 +108,7 @@ bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)
108108
if (!auprobe->simulate)
109109
return false;
110110

111-
insn = *(probe_opcode_t *)(&auprobe->insn[0]);
111+
insn = le32_to_cpu(auprobe->insn);
112112
addr = instruction_pointer(regs);
113113

114114
if (auprobe->api.handler)

arch/loongarch/pci/acpi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
225225
if (bus) {
226226
memcpy(bus->sysdata, info->cfg, sizeof(struct pci_config_window));
227227
kfree(info);
228+
kfree(root_ops);
228229
} else {
229230
struct pci_bus *child;
230231

arch/powerpc/configs/ps3_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ CONFIG_PS3_VRAM=m
2424
CONFIG_PS3_LPM=m
2525
# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
2626
CONFIG_KEXEC=y
27-
# CONFIG_PPC64_BIG_ENDIAN_ELF_ABI_V2 is not set
2827
CONFIG_PPC_4K_PAGES=y
2928
CONFIG_SCHED_SMT=y
3029
CONFIG_PM=y

arch/riscv/include/asm/sbi.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,8 @@ static inline int sbi_remote_fence_i(const struct cpumask *cpu_mask) { return -1
327327
static inline void sbi_init(void) {}
328328
#endif /* CONFIG_RISCV_SBI */
329329

330+
unsigned long riscv_get_mvendorid(void);
331+
unsigned long riscv_get_marchid(void);
330332
unsigned long riscv_cached_mvendorid(unsigned int cpu_id);
331333
unsigned long riscv_cached_marchid(unsigned int cpu_id);
332334
unsigned long riscv_cached_mimpid(unsigned int cpu_id);

arch/riscv/include/asm/sparsemem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#ifdef CONFIG_64BIT
88
#define MAX_PHYSMEM_BITS 56
99
#else
10-
#define MAX_PHYSMEM_BITS 34
10+
#define MAX_PHYSMEM_BITS 32
1111
#endif /* CONFIG_64BIT */
1212
#define SECTION_SIZE_BITS 27
1313
#endif /* CONFIG_SPARSEMEM */

arch/riscv/include/asm/thread_info.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
#define THREAD_SHIFT (PAGE_SHIFT + THREAD_SIZE_ORDER)
3535
#define OVERFLOW_STACK_SIZE SZ_4K
36-
#define SHADOW_OVERFLOW_STACK_SIZE (1024)
3736

3837
#define IRQ_STACK_SIZE THREAD_SIZE
3938

arch/riscv/kernel/cpu.c

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,34 @@ int riscv_of_parent_hartid(struct device_node *node, unsigned long *hartid)
139139
return -1;
140140
}
141141

142+
unsigned long __init riscv_get_marchid(void)
143+
{
144+
struct riscv_cpuinfo *ci = this_cpu_ptr(&riscv_cpuinfo);
145+
146+
#if IS_ENABLED(CONFIG_RISCV_SBI)
147+
ci->marchid = sbi_spec_is_0_1() ? 0 : sbi_get_marchid();
148+
#elif IS_ENABLED(CONFIG_RISCV_M_MODE)
149+
ci->marchid = csr_read(CSR_MARCHID);
150+
#else
151+
ci->marchid = 0;
152+
#endif
153+
return ci->marchid;
154+
}
155+
156+
unsigned long __init riscv_get_mvendorid(void)
157+
{
158+
struct riscv_cpuinfo *ci = this_cpu_ptr(&riscv_cpuinfo);
159+
160+
#if IS_ENABLED(CONFIG_RISCV_SBI)
161+
ci->mvendorid = sbi_spec_is_0_1() ? 0 : sbi_get_mvendorid();
162+
#elif IS_ENABLED(CONFIG_RISCV_M_MODE)
163+
ci->mvendorid = csr_read(CSR_MVENDORID);
164+
#else
165+
ci->mvendorid = 0;
166+
#endif
167+
return ci->mvendorid;
168+
}
169+
142170
DEFINE_PER_CPU(struct riscv_cpuinfo, riscv_cpuinfo);
143171

144172
unsigned long riscv_cached_mvendorid(unsigned int cpu_id)
@@ -170,12 +198,16 @@ static int riscv_cpuinfo_starting(unsigned int cpu)
170198
struct riscv_cpuinfo *ci = this_cpu_ptr(&riscv_cpuinfo);
171199

172200
#if IS_ENABLED(CONFIG_RISCV_SBI)
173-
ci->mvendorid = sbi_spec_is_0_1() ? 0 : sbi_get_mvendorid();
174-
ci->marchid = sbi_spec_is_0_1() ? 0 : sbi_get_marchid();
201+
if (!ci->mvendorid)
202+
ci->mvendorid = sbi_spec_is_0_1() ? 0 : sbi_get_mvendorid();
203+
if (!ci->marchid)
204+
ci->marchid = sbi_spec_is_0_1() ? 0 : sbi_get_marchid();
175205
ci->mimpid = sbi_spec_is_0_1() ? 0 : sbi_get_mimpid();
176206
#elif IS_ENABLED(CONFIG_RISCV_M_MODE)
177-
ci->mvendorid = csr_read(CSR_MVENDORID);
178-
ci->marchid = csr_read(CSR_MARCHID);
207+
if (!ci->mvendorid)
208+
ci->mvendorid = csr_read(CSR_MVENDORID);
209+
if (!ci->marchid)
210+
ci->marchid = csr_read(CSR_MARCHID);
179211
ci->mimpid = csr_read(CSR_MIMPID);
180212
#else
181213
ci->mvendorid = 0;

arch/riscv/kernel/cpufeature.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,13 +482,18 @@ static void __init riscv_fill_hwcap_from_isa_string(unsigned long *isa2hwcap)
482482
struct acpi_table_header *rhct;
483483
acpi_status status;
484484
unsigned int cpu;
485+
u64 boot_vendorid;
486+
u64 boot_archid;
485487

486488
if (!acpi_disabled) {
487489
status = acpi_get_table(ACPI_SIG_RHCT, 0, &rhct);
488490
if (ACPI_FAILURE(status))
489491
return;
490492
}
491493

494+
boot_vendorid = riscv_get_mvendorid();
495+
boot_archid = riscv_get_marchid();
496+
492497
for_each_possible_cpu(cpu) {
493498
struct riscv_isainfo *isainfo = &hart_isa[cpu];
494499
unsigned long this_hwcap = 0;
@@ -536,8 +541,7 @@ static void __init riscv_fill_hwcap_from_isa_string(unsigned long *isa2hwcap)
536541
* CPU cores with the ratified spec will contain non-zero
537542
* marchid.
538543
*/
539-
if (acpi_disabled && riscv_cached_mvendorid(cpu) == THEAD_VENDOR_ID &&
540-
riscv_cached_marchid(cpu) == 0x0) {
544+
if (acpi_disabled && boot_vendorid == THEAD_VENDOR_ID && boot_archid == 0x0) {
541545
this_hwcap &= ~isa2hwcap[RISCV_ISA_EXT_v];
542546
clear_bit(RISCV_ISA_EXT_v, isainfo->isa);
543547
}

arch/riscv/kernel/elf_kexec.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,12 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
444444
*(u32 *)loc = CLEAN_IMM(CJTYPE, *(u32 *)loc) |
445445
ENCODE_CJTYPE_IMM(val - addr);
446446
break;
447+
case R_RISCV_ADD16:
448+
*(u16 *)loc += val;
449+
break;
450+
case R_RISCV_SUB16:
451+
*(u16 *)loc -= val;
452+
break;
447453
case R_RISCV_ADD32:
448454
*(u32 *)loc += val;
449455
break;

arch/riscv/kernel/entry.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ SYM_CODE_START(ret_from_fork)
228228
jalr s0
229229
1:
230230
move a0, sp /* pt_regs */
231-
la ra, ret_from_exception
232-
tail syscall_exit_to_user_mode
231+
call syscall_exit_to_user_mode
232+
j ret_from_exception
233233
SYM_CODE_END(ret_from_fork)
234234

235235
/*

arch/s390/include/asm/facility.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@ static inline int test_facility(unsigned long nr)
6060
unsigned long facilities_als[] = { FACILITIES_ALS };
6161

6262
if (__builtin_constant_p(nr) && nr < sizeof(facilities_als) * 8) {
63-
if (__test_facility(nr, &facilities_als))
64-
return 1;
63+
if (__test_facility(nr, &facilities_als)) {
64+
if (!__is_defined(__DECOMPRESSOR))
65+
return 1;
66+
}
6567
}
6668
return __test_facility(nr, &stfle_fac_list);
6769
}

arch/s390/include/asm/io.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
#include <asm/pci_io.h>
1717

1818
#define xlate_dev_mem_ptr xlate_dev_mem_ptr
19+
#define kc_xlate_dev_mem_ptr xlate_dev_mem_ptr
1920
void *xlate_dev_mem_ptr(phys_addr_t phys);
2021
#define unxlate_dev_mem_ptr unxlate_dev_mem_ptr
22+
#define kc_unxlate_dev_mem_ptr unxlate_dev_mem_ptr
2123
void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr);
2224

2325
#define IO_SPACE_LIMIT 0

arch/s390/kernel/perf_cpum_sf.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,7 +1463,7 @@ static int aux_output_begin(struct perf_output_handle *handle,
14631463
unsigned long range, i, range_scan, idx, head, base, offset;
14641464
struct hws_trailer_entry *te;
14651465

1466-
if (WARN_ON_ONCE(handle->head & ~PAGE_MASK))
1466+
if (handle->head & ~PAGE_MASK)
14671467
return -EINVAL;
14681468

14691469
aux->head = handle->head >> PAGE_SHIFT;
@@ -1642,7 +1642,7 @@ static void hw_collect_aux(struct cpu_hw_sf *cpuhw)
16421642
unsigned long num_sdb;
16431643

16441644
aux = perf_get_aux(handle);
1645-
if (WARN_ON_ONCE(!aux))
1645+
if (!aux)
16461646
return;
16471647

16481648
/* Inform user space new data arrived */
@@ -1661,7 +1661,7 @@ static void hw_collect_aux(struct cpu_hw_sf *cpuhw)
16611661
num_sdb);
16621662
break;
16631663
}
1664-
if (WARN_ON_ONCE(!aux))
1664+
if (!aux)
16651665
return;
16661666

16671667
/* Update head and alert_mark to new position */
@@ -1896,12 +1896,8 @@ static void cpumsf_pmu_start(struct perf_event *event, int flags)
18961896
{
18971897
struct cpu_hw_sf *cpuhw = this_cpu_ptr(&cpu_hw_sf);
18981898

1899-
if (WARN_ON_ONCE(!(event->hw.state & PERF_HES_STOPPED)))
1899+
if (!(event->hw.state & PERF_HES_STOPPED))
19001900
return;
1901-
1902-
if (flags & PERF_EF_RELOAD)
1903-
WARN_ON_ONCE(!(event->hw.state & PERF_HES_UPTODATE));
1904-
19051901
perf_pmu_disable(event->pmu);
19061902
event->hw.state = 0;
19071903
cpuhw->lsctl.cs = 1;

0 commit comments

Comments
 (0)