Skip to content

Commit d3f1bec

Browse files
khusikakhusika
committed
Merge tag 'v6.1.116' into orange-pi-6.1-rk35xx
This is the 6.1.116 stable release * tag 'v6.1.116' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: Linux 6.1.116 migrate_pages_batch: fix statistics for longterm pin retry mm: avoid gcc complaint about pointer casting vt: prevent kernel-infoleak in con_font_get() drm/amd/display: Skip on writeback when it's not applicable drm/amd/display: Add null checks for 'stream' and 'plane' before dereferencing mtd: spi-nor: winbond: fix w25q128 regression LoongArch: Fix build errors due to backported TIMENS mm: shmem: fix data-race in shmem_getattr() wifi: iwlwifi: mvm: fix 6 GHz scan construction nilfs2: fix kernel bug due to missing clearing of checked flag wifi: mac80211: fix NULL dereference at band check in starting tx ba session x86/bugs: Use code segment selector for VERW operand io_uring: always lock __io_cqring_overflow_flush vmscan,migrate: fix page count imbalance on node stats when demoting pages migrate_pages: split unmap_and_move() to _unmap() and _move() migrate_pages: restrict number of pages to migrate in batch migrate_pages: separate hugetlb folios migration migrate_pages: organize stats with struct migrate_pages_stats mm/migrate.c: stop using 0 as NULL pointer migrate: convert migrate_pages() to use folios migrate: convert unmap_and_move() to use folios mm: migrate: try again if THP split is failed due to page refcnt io_uring/rw: fix missing NOWAIT check for O_DIRECT start write io_uring: use kiocb_{start,end}_write() helpers fs: create kiocb_{start,end}_write() helpers io_uring: rename kiocb_end_write() local helper kasan: remove vmalloc_percpu test nvmet-auth: assign dh_key to NULL after kfree_sensitive ALSA: hda/realtek: Fix headset mic on TUXEDO Stellaris 16 Gen6 mb1 mctp i2c: handle NULL header address ocfs2: pass u64 to ocfs2_truncate_inline maybe overflow mm/page_alloc: let GFP_ATOMIC order-0 allocs access highatomic reserves mm/page_alloc: explicitly define how __GFP_HIGH non-blocking allocations accesses reserves mm/page_alloc: explicitly define what alloc flags deplete min reserves mm/page_alloc: explicitly record high-order atomic allocations in alloc_flags mm/page_alloc: treat RT tasks similar to __GFP_HIGH mm/page_alloc: rename ALLOC_HIGH to ALLOC_MIN_RESERVE cxl/port: Fix cxl_bus_rescan() vs bus_rescan_devices() cxl/acpi: Move rescan to the workqueue riscv: Remove duplicated GET_RM riscv: Remove unused GENERATING_ASM_OFFSETS riscv: Use '%u' to format the output of 'cpu' riscv: efi: Set NX compat flag in PE/COFF header ALSA: hda/realtek: Limit internal Mic boost on Dell platform riscv: vdso: Prevent the compiler from inserting calls to memset() cgroup/bpf: use a dedicated workqueue for cgroup bpf destruction block: fix sanity checks in blk_rq_map_user_bvec nilfs2: fix potential deadlock with newly created symlinks iio: light: veml6030: fix microlux value calculation iio: adc: ad7124: fix division by zero in ad7124_set_channel_odr() staging: iio: frequency: ad9832: fix division by zero in ad9832_calc_freqreg() wifi: iwlegacy: Clear stale interrupts before resuming device wifi: cfg80211: clear wdev->cqm_config pointer on free wifi: ath10k: Fix memory leak in management tx wifi: mac80211: do not pass a stopped vif to the driver in .get_txpower Revert "driver core: Fix uevent_show() vs driver detach race" xhci: Use pm_runtime_get to prevent RPM on unsupported systems xhci: Fix Link TRB DMA in command ring stopped completion event usb: typec: fix unreleased fwnode_handle in typec_port_register_altmodes() usb: phy: Fix API devm_usb_put_phy() can not release the phy usbip: tools: Fix detach_port() invalid port error path ALSA: usb-audio: Add quirks for Dell WD19 dock USB: gadget: dummy-hcd: Fix "task hung" problem usb: gadget: dummy_hcd: execute hrtimer callback in softirq context usb: gadget: dummy_hcd: Set transfer interval to 1 microframe usb: gadget: dummy_hcd: Switch to hrtimer transfer scheduler misc: sgi-gru: Don't disable preemption in GRU driver NFS: remove revoked delegation from server's delegation list net: amd: mvme147: Fix probe banner message scsi: scsi_transport_fc: Allow setting rport state to current state fs/ntfs3: Additional check in ni_clear() fs/ntfs3: Fix possible deadlock in mi_read fs/ntfs3: Stale inode instead of bad fs/ntfs3: Fix warning possible deadlock in ntfs_set_state fs/ntfs3: Check if more than chunk-size bytes are written ACPI: CPPC: Make rmw_lock a raw_spin_lock afs: Fix missing subdir edit when renamed between parent dirs afs: Automatically generate trace tag enums firmware: arm_sdei: Fix the input parameter of cpuhp_remove_state() kasan: Fix Software Tag-Based KASAN with GCC compiler-gcc: remove attribute support check for `__no_sanitize_address__` compiler-gcc: be consistent with underscores use for `no_sanitize` iomap: turn iomap_want_unshare_iter into an inline function fsdax: dax_unshare_iter needs to copy entire blocks fsdax: remove zeroing code from dax_unshare_iter iomap: share iomap_unshare_iter predicate code with fsdax iomap: don't bother unsharing delalloc extents iomap: improve shared block detection in iomap_unshare_iter iomap: convert iomap_unshare_iter to use large folios netfilter: nft_payload: sanitize offset and length before calling skb_checksum() mlxsw: spectrum_ipip: Fix memory leak when changing remote IPv6 address mlxsw: spectrum_ipip: Rename Spectrum-2 ip6gre operations mlxsw: spectrum_router: Add support for double entry RIFs mlxsw: spectrum_ptp: Add missing verification before pushing Tx header net: skip offload for NETIF_F_IPV6_CSUM if ipv6 header contains extension Bluetooth: hci: fix null-ptr-deref in hci_read_supported_codecs netfilter: nf_reject_ipv6: fix potential crash in nf_send_reset6() netfilter: Fix use-after-free in get_info() bpf: Fix out-of-bounds write in trie_get_next_key() netdevsim: Add trailing zero to terminate the string in nsim_nexthop_bucket_activity_write() net/sched: stop qdisc_tree_reduce_backlog on TC_H_ROOT gtp: allow -1 to be specified as file description from userspace ipv4: ip_tunnel: Fix suspicious RCU usage warning in ip_tunnel_init_flow() net: stmmac: TSO: Fix unbalanced DMA map/unmap for non-paged SKB data macsec: Fix use-after-free while sending the offloading packet ASoC: cs42l51: Fix some error handling paths in cs42l51_probe() wifi: iwlwifi: mvm: Fix response handling in iwl_mvm_send_recovery_cmd() wifi: iwlwifi: mvm: disconnect station vifs if recovery failed RDMA/bnxt_re: synchronize the qp-handle table array RDMA/mlx5: Round max_rd_atomic/max_dest_rd_atomic up instead of down RDMA/cxgb4: Dump vendor specific QP details wifi: brcm80211: BRCM_TRACING should depend on TRACING wifi: ath11k: Fix invalid ring usage in full monitor mode wifi: mac80211: skip non-uploaded keys in ieee80211_iter_keys mac80211: MAC80211_MESSAGE_TRACING should depend on TRACING wifi: iwlegacy: Fix "field-spanning write" warning in il_enqueue_hcmd() cgroup: Fix potential overflow issue when checking max_depth fs/proc/kcore.c: allow translation of physical memory addresses fs/proc/kcore: reinstate bounce buffer for KCORE_TEXT regions fs/proc/kcore: convert read_kcore() to read_kcore_iter() fs/proc/kcore: avoid bounce buffer for ktext data mm: remove kern_addr_valid() completely selftests/mm: fix incorrect buffer->mirror size in hmm2 double_map test cpufreq: Avoid a bad reference count on CPU node cpufreq: Generalize of_perf_domain_get_sharing_cpumask phandle format Signed-off-by: Khusika Dhamar Gusti <[email protected]>
2 parents 86e5e5a + d7039b8 commit d3f1bec

File tree

138 files changed

+1421
-995
lines changed

Some content is hidden

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

138 files changed

+1421
-995
lines changed

‎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 = 1
4-
SUBLEVEL = 115
4+
SUBLEVEL = 116
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

‎arch/alpha/include/asm/pgtable.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,6 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
313313
#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
314314
#define __swp_entry_to_pte(x) ((pte_t) { (x).val })
315315

316-
#define kern_addr_valid(addr) (1)
317-
318316
#define pte_ERROR(e) \
319317
printk("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e))
320318
#define pmd_ERROR(e) \

‎arch/arc/include/asm/pgtable-bits-arcv2.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
120120
#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
121121
#define __swp_entry_to_pte(x) ((pte_t) { (x).val })
122122

123-
#define kern_addr_valid(addr) (1)
124-
125123
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
126124
#include <asm/hugepage.h>
127125
#endif

‎arch/arm/include/asm/pgtable-nommu.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
#define pgd_none(pgd) (0)
2222
#define pgd_bad(pgd) (0)
2323
#define pgd_clear(pgdp)
24-
#define kern_addr_valid(addr) (1)
25-
/* FIXME */
2624
/*
2725
* PMD_SHIFT determines the size of the area a second-level page table can map
2826
* PGDIR_SHIFT determines what a third-level page table entry can map

‎arch/arm/include/asm/pgtable.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,10 +300,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
300300
*/
301301
#define MAX_SWAPFILES_CHECK() BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > __SWP_TYPE_BITS)
302302

303-
/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
304-
/* FIXME: this is not correct */
305-
#define kern_addr_valid(addr) (1)
306-
307303
/*
308304
* We provide our own arch_get_unmapped_area to cope with VIPT caches.
309305
*/

‎arch/arm64/include/asm/pgtable.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,8 +1027,6 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma,
10271027
*/
10281028
#define MAX_SWAPFILES_CHECK() BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > __SWP_TYPE_BITS)
10291029

1030-
extern int kern_addr_valid(unsigned long addr);
1031-
10321030
#ifdef CONFIG_ARM64_MTE
10331031

10341032
#define __HAVE_ARCH_PREPARE_TO_SWAP

‎arch/arm64/mm/mmu.c

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -875,53 +875,6 @@ void __init paging_init(void)
875875
create_idmap();
876876
}
877877

878-
/*
879-
* Check whether a kernel address is valid (derived from arch/x86/).
880-
*/
881-
int kern_addr_valid(unsigned long addr)
882-
{
883-
pgd_t *pgdp;
884-
p4d_t *p4dp;
885-
pud_t *pudp, pud;
886-
pmd_t *pmdp, pmd;
887-
pte_t *ptep, pte;
888-
889-
addr = arch_kasan_reset_tag(addr);
890-
if ((((long)addr) >> VA_BITS) != -1UL)
891-
return 0;
892-
893-
pgdp = pgd_offset_k(addr);
894-
if (pgd_none(READ_ONCE(*pgdp)))
895-
return 0;
896-
897-
p4dp = p4d_offset(pgdp, addr);
898-
if (p4d_none(READ_ONCE(*p4dp)))
899-
return 0;
900-
901-
pudp = pud_offset(p4dp, addr);
902-
pud = READ_ONCE(*pudp);
903-
if (pud_none(pud))
904-
return 0;
905-
906-
if (pud_sect(pud))
907-
return pfn_valid(pud_pfn(pud));
908-
909-
pmdp = pmd_offset(pudp, addr);
910-
pmd = READ_ONCE(*pmdp);
911-
if (pmd_none(pmd))
912-
return 0;
913-
914-
if (pmd_sect(pmd))
915-
return pfn_valid(pmd_pfn(pmd));
916-
917-
ptep = pte_offset_kernel(pmdp, addr);
918-
pte = READ_ONCE(*ptep);
919-
if (pte_none(pte))
920-
return 0;
921-
922-
return pfn_valid(pte_pfn(pte));
923-
}
924-
925878
#ifdef CONFIG_MEMORY_HOTPLUG
926879
static void free_hotplug_page_range(struct page *page, size_t size,
927880
struct vmem_altmap *altmap)

‎arch/arm64/mm/pageattr.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,7 @@ void __kernel_map_pages(struct page *page, int numpages, int enable)
204204

205205
/*
206206
* This function is used to determine if a linear map page has been marked as
207-
* not-valid. Walk the page table and check the PTE_VALID bit. This is based
208-
* on kern_addr_valid(), which almost does what we need.
207+
* not-valid. Walk the page table and check the PTE_VALID bit.
209208
*
210209
* Because this is only called on the kernel linear map, p?d_sect() implies
211210
* p?d_present(). When debug_pagealloc is enabled, sections mappings are

‎arch/csky/include/asm/pgtable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,6 @@ extern void paging_init(void);
249249
void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
250250
pte_t *pte);
251251

252-
/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
253-
#define kern_addr_valid(addr) (1)
254-
255252
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
256253
remap_pfn_range(vma, vaddr, pfn, size, prot)
257254

‎arch/hexagon/include/asm/page.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,6 @@ static inline void clear_page(void *page)
131131

132132
#define page_to_virt(page) __va(page_to_phys(page))
133133

134-
/*
135-
* For port to Hexagon Virtual Machine, MAYBE we check for attempts
136-
* to reference reserved HVM space, but in any case, the VM will be
137-
* protected.
138-
*/
139-
#define kern_addr_valid(addr) (1)
140-
141134
#include <asm/mem-layout.h>
142135
#include <asm-generic/memory_model.h>
143136
/* XXX Todo: implement assembly-optimized version of getorder. */

0 commit comments

Comments
 (0)