October 2023 - Linux-stable-mirror

by Greg Kroah-Hartman

I'm announcing the release of the 4.14.324 kernel. All users of the 4.14 kernel series must upgrade. The updated 4.14.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/mips/include/asm/dec/prom.h | 2 arch/x86/kernel/fpu/xstate.c | 8 + drivers/android/binder.c | 1 drivers/android/binder_alloc.c | 6 + drivers/android/binder_alloc.h | 1 drivers/dma-buf/sw_sync.c | 18 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 drivers/gpu/drm/radeon/radeon_cs.c | 3 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 2 drivers/media/platform/mtk-vpu/mtk_vpu.c | 6 - drivers/mmc/host/wbsd.c | 2 drivers/net/ethernet/ibm/ibmveth.c | 2 drivers/net/ethernet/intel/i40e/i40e_nvm.c | 16 +-- drivers/net/ethernet/intel/igb/igb_ptp.c | 24 ++-- drivers/net/phy/broadcom.c | 13 ++ drivers/net/team/team.c | 4 drivers/pcmcia/rsrc_nonstatic.c | 2 drivers/scsi/raid_class.c | 48 --------- drivers/scsi/snic/snic_disc.c | 3 drivers/tty/serial/8250/8250_port.c | 1 drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 4 fs/cifs/file.c | 2 fs/gfs2/super.c | 26 ++-- fs/jfs/jfs_dmap.c | 3 fs/jfs/jfs_txnmgr.c | 5 fs/jfs/namei.c | 5 fs/quota/dquot.c | 5 fs/udf/unicode.c | 2 include/linux/raid_class.h | 4 include/linux/virtio_net.h | 4 include/media/v4l2-mem2mem.h | 18 +++ include/net/sock.h | 11 +- kernel/trace/trace.c | 9 + kernel/trace/trace_irqsoff.c | 3 kernel/trace/trace_sched_wakeup.c | 2 lib/clz_ctz.c | 32 +----- lib/mpi/longlong.h | 36 ------ lib/test_firmware.c | 37 +++++- net/batman-adv/bat_v_elp.c | 3 net/batman-adv/bat_v_ogm.c | 7 - net/batman-adv/hard-interface.c | 2 net/batman-adv/translation-table.c | 1 net/bluetooth/l2cap_core.c | 5 net/core/rtnetlink.c | 5 net/core/sock.c | 2 net/ipv4/ip_vti.c | 4 net/ipv4/tcp_timer.c | 4 net/ipv6/ip6_vti.c | 4 net/key/af_key.c | 4 net/netfilter/ipvs/ip_vs_ctl.c | 74 +++++++------ net/netfilter/nf_conntrack_proto_sctp.c | 6 - net/netfilter/nft_dynset.c | 3 net/sctp/socket.c | 2 net/unix/af_unix.c | 9 - net/xfrm/xfrm_user.c | 13 ++ sound/pci/emu10k1/emufx.c | 112 +-------------------- sound/soc/codecs/rt5665.c | 2 sound/usb/quirks-table.h | 29 +++++ 59 files changed, 320 insertions(+), 346 deletions(-) Abel Wu (1): sock: Fix misuse of sk_under_memory_pressure() Alessio Igor Bogani (1): igb: Avoid starting unnecessary workqueues Andrii Staikov (1): i40e: fix misleading debug logs Armin Wolf (1): pcmcia: rsrc_nonstatic: Fix memory leak in nonstatic_release_resource_db() Eric Dumazet (2): net: do not allow gso_size to be set to GSO_BY_FRAGS sock: annotate data-races around prot->memory_pressure Feng Tang (1): x86/fpu: Set X86_FEATURE_OSXSAVE feature after enabling OSXSAVE in CR4 Greg Kroah-Hartman (1): Linux 4.14.324 Gustavo A. R. Silva (1): MIPS: dec: prom: Address -Warray-bounds warning Hans Verkuil (1): media: platform: mediatek: vpu: fix NULL ptr dereference Helge Deller (1): lib/clz_ctz.c: Fix __clzdi2() and __ctzdi2() for 32-bit kernels Ido Schimmel (1): rtnetlink: Reject negative ifindexes in RTM_NEWLINK Immad Mir (2): FS: JFS: Fix null-ptr-deref Read in txBegin FS: JFS: Check for read-only mounted filesystem in txBegin Jan Kara (2): quota: Properly disable quotas when add_dquot_ref() fails udf: Fix uninitialized array access for some pathnames Jason Xing (1): net: fix the RTO timer retransmitting skb every 1ms if linear option is enabled Junwei Hu (1): ipvs: Improve robustness to the ipvs sysctl Justin Chen (1): net: phy: broadcom: stub c45 read/write for 54810 Kuniyuki Iwashima (1): af_unix: Fix null-ptr-deref in unix_stream_sendpage(). Lin Ma (4): net: xfrm: Fix xfrm_address_filter OOB read net: af_key: fix sadb_x_filter validation xfrm: add NULL check in xfrm_update_ae_params net: xfrm: Amend XFRMA_SEC_CTX nla_policy structure Michael Ellerman (1): ibmveth: Use dcbf rather than dcbfl Mirsad Goran Todorovac (1): test_firmware: prevent race conditions by a correct implementation of locking Nathan Chancellor (1): lib/mpi: Eliminate unused umul_ppmm definitions for MIPS Oswald Buddenhagen (1): ALSA: emu10k1: roll up loops in DSP setup code for Audigy Pablo Neira Ayuso (1): netfilter: nft_dynset: disallow object maps Qi Zheng (1): binder: fix memory leak in binder_init() Remi Pommarel (3): batman-adv: Do not get eth header before batadv_check_management_packet batman-adv: Fix TT global entry leak when client roamed back batman-adv: Fix batadv_v_ogm_aggr_send memory leak Rob Clark (1): dma-buf/sw_sync: Avoid recursive lock during fence signal Russell Harmon via samba-technical (1): cifs: Release folio lock on fscache read hit. Sishuai Gong (1): ipvs: fix racy memcpy in proc_do_sync_threshold Sven Eckelmann (1): batman-adv: Trigger events for auto adjusted MTU Tony Lindgren (1): serial: 8250: Fix oops for port->pm on uart_change_pm() Tuo Li (1): gfs2: Fix possible data races in gfs2_show_options() Wei Chen (1): media: vcodec: Fix potential array out-of-bounds in encoder queue_setup Xin Long (1): netfilter: set default timeout to 3 secs for sctp shutdown send and recv state Yang Yingliang (1): mmc: wbsd: fix double mmc_free_host() in wbsd_init() Ye Bin (1): quota: fix warning in dqgrab() Yogesh (1): fs: jfs: Fix UBSAN: array-index-out-of-bounds in dbAllocDmapLev Yuanjun Gong (1): fbdev: mmp: fix value check in mmphw_probe() Yunfei Dong (1): media: v4l2-mem2mem: add lock to protect parameter num_rdy Zhang Shurong (1): ASoC: rt5665: add missed regulator_bulk_disable Zheng Yejian (1): tracing: Fix memleak due to race between current_tracer and trace Zhengchao Shao (2): ip6_vti: fix slab-use-after-free in decode_session6 ip_vti: fix potential slab-use-after-free in decode_session6 Zhengping Jiang (1): Bluetooth: L2CAP: Fix use-after-free Zhu Wang (2): scsi: snic: Fix double free in snic_tgt_create() scsi: core: raid_class: Remove raid_component_add() Ziyang Xuan (1): team: Fix incorrect deletion of ETH_P_8021AD protocol vid from slaves dengxiang (1): ALSA: usb-audio: Add support for Mythware XA001AU capture and playback interfaces. hackyzh002 (1): drm/radeon: Fix integer overflow in radeon_cs_parser_init shanzhulig (1): drm/amdgpu: Fix potential fence use-after-free v2

1 year, 3 months

2
3
0 0

[PATCH AUTOSEL 5.10 01/22] drm/radeon: Fix integer overflow in radeon_cs_parser_init

by Sasha Levin

From: hackyzh002 <hackyzh002(a)gmail.com> [ Upstream commit f828b681d0cd566f86351c0b913e6cb6ed8c7b9c ] The type of size is unsigned, if size is 0x40000000, there will be an integer overflow, size will be zero after size *= sizeof(uint32_t), will cause uninitialized memory to be referenced later Reviewed-by: Christian König <christian.koenig(a)amd.com> Signed-off-by: hackyzh002 <hackyzh002(a)gmail.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/gpu/drm/radeon/radeon_cs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index a78b60b62caf2..87a57e5588a28 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -271,7 +271,8 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) { struct drm_radeon_cs *cs = data; uint64_t *chunk_array_ptr; - unsigned size, i; + u64 size; + unsigned i; u32 ring = RADEON_CS_RING_GFX; s32 priority = 0; -- 2.39.2

1 year, 3 months

6
27
0 0

Drop from 5.15 and older -- clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz

by Marek Vasut

Please drop the following commits from stable 5.10.y and 5.15.y respectively 972acd701b19 ("clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz") a8474506c912 ("clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz") The commit message states 'Cc: stable(a)vger.kernel.org # v5.18+' and the commit should only be applied to Linux 5.18.y and newer, on anything older it breaks PLL configuration due to missing prerequisite patches. Thanks

1 year, 3 months

3
5
0 0

[PATCH 6.1 000/259] 6.1.56-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.1.56 release. There are 259 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Fri, 06 Oct 2023 17:51:12 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.56-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 6.1.56-rc1 Mario Limonciello <mario.limonciello(a)amd.com> ASoC: amd: yc: Fix a non-functional mic on Lenovo 82TL Michal Hocko <mhocko(a)suse.com> mm, memcg: reconsider kmem.limit_in_bytes deprecation Michal Hocko <mhocko(a)suse.com> memcg: drop kmem.limit_in_bytes Jani Nikula <jani.nikula(a)intel.com> drm/meson: fix memory leak on ->hpd_notify callback YuBiao Wang <YuBiao.Wang(a)amd.com> drm/amdkfd: Use gpu_offset for user queue's wptr Greg Ungerer <gerg(a)kernel.org> fs: binfmt_elf_efpic: fix personality for ELF-FDPIC Linus Walleij <linus.walleij(a)linaro.org> power: supply: ab8500: Set typing and props Nicolas Frattaroli <frattaroli.nicolas(a)gmail.com> power: supply: rk817: Add missing module alias Javier Pello <devel(a)otheo.eu> drm/i915/gt: Fix reservation address in ggtt_reserve_guc_top Matthias Schiffer <mschiffer(a)universe-factory.net> ata: libata-sata: increase PMP SRST timeout to 10s Damien Le Moal <dlemoal(a)kernel.org> ata: libata-core: Do not register PM operations for SAS ports Damien Le Moal <dlemoal(a)kernel.org> ata: libata-core: Fix port and device removal Damien Le Moal <dlemoal(a)kernel.org> ata: libata-core: Fix ata_port_request_pm() locking Quang Le <quanglex97(a)gmail.com> fs/smb/client: Reset password pointer to NULL Mika Westerberg <mika.westerberg(a)linux.intel.com> net: thunderbolt: Fix TCPv6 GSO checksum calculation Nick Desaulniers <ndesaulniers(a)google.com> bpf: Fix BTF_ID symbol generation collision in tools/ Jiri Olsa <jolsa(a)kernel.org> bpf: Fix BTF_ID symbol generation collision Jiri Olsa <jolsa(a)kernel.org> bpf: Add override check to kprobe multi link attach Ricardo Ribalda <ribalda(a)chromium.org> media: uvcvideo: Fix OOB read Josef Bacik <josef(a)toxicpanda.com> btrfs: properly report 0 avail for very full file systems Steven Rostedt (Google) <rostedt(a)goodmis.org> ring-buffer: Update "shortest_full" in polling Johannes Weiner <hannes(a)cmpxchg.org> mm: memcontrol: fix GFP_NOFS recursion in memory.high enforcement Rafael Aquini <aquini(a)redhat.com> mm/slab_common: fix slab_caches list corruption after kmem_cache_destroy() Jinjie Ruan <ruanjinjie(a)huawei.com> mm/damon/vaddr-test: fix memory leak in damon_do_test_apply_three_regions() Mikko Rapeli <mikko.rapeli(a)linaro.org> arm64: defconfig: remove CONFIG_COMMON_CLK_NPCM8XX=y Janusz Krzysztofik <janusz.krzysztofik(a)linux.intel.com> drm/tests: Fix incorrect argument in drm_test_mm_insert_range Frederic Weisbecker <frederic(a)kernel.org> timers: Tag (hr)timer softirq as hotplug safe Trond Myklebust <trond.myklebust(a)hammerspace.com> Revert "SUNRPC dont update timeout value on connection reset" Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: fix kdoc warnings after gc rework Joel Fernandes (Google) <joel(a)joelfernandes.org> sched/rt: Fix live lock between select_fallback_rq() and RT push Liam R. Howlett <Liam.Howlett(a)oracle.com> kernel/sched: Modify initial boot task idle setup August Wikerfors <git(a)augustwikerfors.se> ASoC: amd: yc: Fix non-functional mic on Lenovo 82QF and 82UG Heiner Kallweit <hkallweit1(a)gmail.com> i2c: i801: unregister tco_pdev in i801_probe() error path Jens Axboe <axboe(a)kernel.dk> io_uring/fs: remove sqe->rw_flags checking from LINKAT Niklas Cassel <niklas.cassel(a)wdc.com> ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED OPERATION CODES Damien Le Moal <dlemoal(a)kernel.org> ata: libata-scsi: link ata port and scsi device Huacai Chen <chenhuacai(a)kernel.org> LoongArch: numa: Fix high_memory calculation Tiezhu Yang <yangtiezhu(a)loongson.cn> LoongArch: Define relocation types for ABI v2.10 Kailang Yang <kailang(a)realtek.com> ALSA: hda: Disable power save for solving pop issue on Lenovo ThinkCentre M70q Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow rule removal from chain binding Pan Bian <bianpan2016(a)163.com> nilfs2: fix potential use after free in nilfs_gccache_submit_read_data() Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> serial: 8250_port: Check IRQ data before use Daniel Starke <daniel.starke(a)siemens.com> Revert "tty: n_gsm: fix UAF in gsm_cleanup_mux" Ricky WU <ricky_wu(a)realtek.com> misc: rtsx: Fix some platforms can not boot and move the l1ss judgment to probe Paolo Abeni <pabeni(a)redhat.com> mptcp: fix bogus receive window shrinkage with multiple subflows Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86/mmu: Do not filter address spaces in for_each_tdp_mmu_root_yield_safe() Sean Christopherson <seanjc(a)google.com> KVM: x86/mmu: Open code leaf invalidation from mmu_notifier Tom Lendacky <thomas.lendacky(a)amd.com> KVM: SVM: Fix TSC_AUX virtualization setup Paolo Bonzini <pbonzini(a)redhat.com> KVM: SVM: INTERCEPT_RDTSCP is never intercepted anyway Pu Wen <puwen(a)hygon.cn> x86/srso: Add SRSO mitigation for Hygon processors Haitao Huang <haitao.huang(a)linux.intel.com> x86/sgx: Resolves SECS reclaim vs. page fault for EAUG race Nicolin Chen <nicolinc(a)nvidia.com> iommu/arm-smmu-v3: Fix soft lockup triggered by arm_smmu_mm_invalidate_range Roberto Sassu <roberto.sassu(a)huawei.com> smack: Retrieve transmuting information in smack_inode_getsecurity() Roberto Sassu <roberto.sassu(a)huawei.com> smack: Record transmuting in smk_transmuted Irvin Cote <irvin.cote(a)insa-lyon.fr> nvme-pci: always return an ERR_PTR from nvme_pci_alloc_dev Gleb Chesnokov <gleb.chesnokov(a)scst.dev> scsi: qla2xxx: Fix NULL pointer dereference in target mode Sven Eckelmann <sven(a)narfation.org> wifi: ath11k: Don't drop tx_status when peer cannot be found Pratyush Yadav <ptyadav(a)amazon.de> nvme-pci: do not set the NUMA node of device if it has none Christoph Hellwig <hch(a)lst.de> nvme-pci: factor out a nvme_pci_alloc_dev helper Christoph Hellwig <hch(a)lst.de> nvme-pci: factor the iod mempool creation into a helper Arnaldo Carvalho de Melo <acme(a)redhat.com> perf build: Define YYNOMEM as YYNOABORT for bison < 3.81 Thomas Zimmermann <tzimmermann(a)suse.de> fbdev/sh7760fb: Depend on FB=y Huacai Chen <chenhuacai(a)kernel.org> LoongArch: Set all reserved memblocks on Node#0 at initialization Gerhard Engleder <gerhard(a)engleder-embedded.com> tsnep: Fix NAPI polling with budget 0 Gerhard Engleder <gerhard(a)engleder-embedded.com> tsnep: Fix NAPI scheduling Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> net: hsr: Add __packed to struct hsr_sup_tlv. Johnathan Mantey <johnathanx.mantey(a)intel.com> ncsi: Propagate carrier gain/loss events to the NCSI controller Benjamin Gray <bgray(a)linux.ibm.com> powerpc/watchpoints: Annotate atomic context in more places Benjamin Gray <bgray(a)linux.ibm.com> powerpc/watchpoint: Disable pagefaults when getting user instruction Benjamin Gray <bgray(a)linux.ibm.com> powerpc/watchpoints: Disable preemption in thread_change_pc() Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> ASoC: SOF: Intel: MTL: Reduce the DSP init timeout Olga Kornievskaia <kolga(a)netapp.com> NFSv4.1: fix zero value filehandle in post open getattr Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: vb2: frame_vector.c: replace WARN_ONCE with a comment Chancel Liu <chancel.liu(a)nxp.com> ASoC: imx-rpmsg: Set ignore_pmdown_time for dai_link Mike Rapoport (IBM) <rppt(a)kernel.org> memblock tests: fix warning ‘struct seq_file’ declared inside parameter list Mike Rapoport (IBM) <rppt(a)kernel.org> memblock tests: fix warning: "__ALIGN_KERNEL" redefined Richard Fitzgerald <rf(a)opensource.cirrus.com> firmware: cirrus: cs_dsp: Only log list of algorithms in debug build Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: cs42l42: Don't rely on GPIOD_OUT_LOW to set RESET initially low Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: cs42l42: Ensure a reset pulse meets minimum pulse width. Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> ALSA: hda: intel-sdw-acpi: Use u8 type for link index Stanislav Fomichev <sdf(a)google.com> bpf: Clarify error expectations from bpf_clone_redirect Hou Tao <houtao1(a)huawei.com> bpf: Ensure unit_size is matched with slab cache object size Mika Westerberg <mika.westerberg(a)linux.intel.com> spi: intel-pci: Add support for Granite Rapids SPI serial flash Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: fsl: imx-pcm-rpmsg: Add SNDRV_PCM_INFO_BATCH flag Valentin Caron <valentin.caron(a)foss.st.com> spi: stm32: add a delay before SPI disable Han Xu <han.xu(a)nxp.com> spi: nxp-fspi: reset the FLSHxCR1 registers Niklas Cassel <niklas.cassel(a)wdc.com> ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset() Steve French <stfrench(a)microsoft.com> smb3: correct places where ENOTSUPP is used instead of preferred EOPNOTSUPP Michal Grzedzicki <mge(a)meta.com> scsi: pm80xx: Avoid leaking tags when processing OPC_INB_SET_CONTROLLER_CONFIG command Michal Grzedzicki <mge(a)meta.com> scsi: pm80xx: Use phy-specific SAS address when sending PHY_START command Icenowy Zheng <uwu(a)icenowy.me> riscv: errata: fix T-Head dcache.cva encoding David Francis <David.Francis(a)amd.com> drm/amdgpu: Handle null atom context in VBIOS info ioctl Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu/nbio4.3: set proper rmmio_remap.reg_offset for SR-IOV Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu/soc21: don't remap HDP registers for SR-IOV Swapnil Patel <swapnil.patel(a)amd.com> drm/amd/display: Don't check registers, if using AUX BL control Julia Lawall <Julia.Lawall(a)inria.fr> thermal/of: add missing of_node_put() Luke D. Jones <luke(a)ljones.dev> platform/x86: asus-wmi: Support 2023 ROG X16 tablet mode David Thompson <davthompson(a)nvidia.com> platform/mellanox: mlxbf-bootctl: add NET dependency into Kconfig Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> ata: sata_mv: Fix incorrect string length computation in mv_dump_mem() Guangguan Wang <guangguan.wang(a)linux.alibaba.com> net/smc: bugfix for smcr v2 server connect success statistic Steven Rostedt (Google) <rostedt(a)goodmis.org> ring-buffer: Do not attempt to read past "commit" Ricardo B. Marliere <rbmarliere(a)gmail.com> selftests: fix dependency checker script Filipe Manana <fdmanana(a)suse.com> btrfs: assert delayed node locked when removing delayed item Zheng Yejian <zhengyejian1(a)huawei.com> ring-buffer: Avoid softlockup in ring_buffer_resize() Zheng Yejian <zhengyejian1(a)huawei.com> selftests/ftrace: Correctly enable event in instance-event.tc Kiwoong Kim <kwmad.kim(a)samsung.com> scsi: ufs: core: Poll HCS.UCRDY before issuing a UIC command Kiwoong Kim <kwmad.kim(a)samsung.com> scsi: ufs: core: Move __ufshcd_send_uic_cmd() outside host_lock Javed Hasan <jhasan(a)marvell.com> scsi: qedf: Add synchronization between I/O completions and abort Helge Deller <deller(a)gmx.de> parisc: irq: Make irq_stack_union static to avoid sparse warning Helge Deller <deller(a)gmx.de> parisc: drivers: Fix sparse warning Helge Deller <deller(a)gmx.de> parisc: iosapic.c: Fix sparse warnings Helge Deller <deller(a)gmx.de> parisc: sba: Fix compile warning wrt list of SBA devices Nigel Kirkland <nkirkland2304(a)gmail.com> nvme-fc: Prevent null pointer dereference in nvme_fc_io_getuuid() Tobias Schramm <t.schramm(a)manjaro.org> spi: sun6i: fix race between DMA RX transfer completion and RX FIFO drain Tobias Schramm <t.schramm(a)manjaro.org> spi: sun6i: reduce DMA RX transfer width to single byte Daniel Borkmann <daniel(a)iogearbox.net> bpf: Annotate bpf_long_memcpy with data_race Sergey Senozhatsky <senozhatsky(a)chromium.org> dma-debug: don't call __dma_entry_alloc_check_leak() under free_entries_lock Xiubo Li <xiubli(a)redhat.com> ceph: drop messages from MDS when unmounting Sean Christopherson <seanjc(a)google.com> x86/reboot: VMCLEAR active VMCSes before emergency reboot William A. Kennington III <william(a)wkennington.com> i2c: npcm7xx: Fix callback completion ordering Wenhua Lin <Wenhua.Lin(a)unisoc.com> gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip Sudeep Holla <sudeep.holla(a)arm.com> firmware: arm_ffa: Don't set the memory region attributes for MEM_LEND Rob Herring <robh(a)kernel.org> arm64: dts: imx: Add imx8mm-prt8mm.dtb to build Nathan Rossi <nathan.rossi(a)digi.com> soc: imx8m: Enable OCOTP clock for imx8mm before reading registers Michael Ellerman <mpe(a)ellerman.id.au> selftests/powerpc: Fix emit_tests to work with run_kselftest.sh Benjamin Gray <bgray(a)linux.ibm.com> selftests/powerpc: Pass make context to children Benjamin Gray <bgray(a)linux.ibm.com> selftests/powerpc: Use CLEAN macro to fix make warning Chris Morgan <macromorgan(a)hotmail.com> power: supply: rk817: Fix node refcount leak Max Filippov <jcmvbkbc(a)gmail.com> xtensa: boot/lib: fix function prototypes Randy Dunlap <rdunlap(a)infradead.org> xtensa: umulsidi3: fix conditional expression Randy Dunlap <rdunlap(a)infradead.org> xtensa: boot: don't add include-dirs Randy Dunlap <rdunlap(a)infradead.org> xtensa: iss/network: make functions static Max Filippov <jcmvbkbc(a)gmail.com> xtensa: add default definition for XCHAL_HAVE_DIV32 Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> firmware: imx-dsp: Fix an error handling path in imx_dsp_setup_channels() Dan Carpenter <dan.carpenter(a)linaro.org> power: supply: ucs1002: fix error code in ucs1002_get_property() Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Fix SYSC_QUIRK_SWSUP_SIDLE_ACT handling for uart wake-up Tony Lindgren <tony(a)atomide.com> ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot Tony Lindgren <tony(a)atomide.com> ARM: dts: Unify pinctrl-single pin group nodes for omap4 Tony Lindgren <tony(a)atomide.com> ARM: dts: Unify pwm-omap-dmtimer node names Tony Lindgren <tony(a)atomide.com> ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4 Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> ARM: dts: omap: correct indentation Timo Alho <talho(a)nvidia.com> clk: tegra: fix error return case for recalc_rate Zhifeng Tang <zhifeng.tang(a)unisoc.com> clk: sprd: Fix thm_parents incorrect configuration Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com> power: supply: mt6370: Fix missing error code in mt6370_chg_toggle_cfo() Sibi Sankar <quic_sibis(a)quicinc.com> firmware: arm_scmi: Fixup perf power-cost/microwatt support Cristian Marussi <cristian.marussi(a)arm.com> firmware: arm_scmi: Harden perf domain info access Adam Ford <aford173(a)gmail.com> bus: ti-sysc: Fix missing AM35xx SoC matching Julien Panis <jpanis(a)baylibre.com> bus: ti-sysc: Use fsleep() instead of usleep_range() in sysc_reset() Marek Vasut <marex(a)denx.de> drm/bridge: ti-sn65dsi83: Do not generate HFP/HBP/HSA and EOT packet Charles Kearney <charles.kearney(a)hpe.com> spi: spi-gxp: BUG: Correct spi write return value Christoph Hellwig <hch(a)lst.de> MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled Jinjie Ruan <ruanjinjie(a)huawei.com> vfio/mdev: Fix a null-ptr-deref bug for mdev_unregister_parent() Qu Wenruo <wqu(a)suse.com> btrfs: reset destination buffer when read_extent_buffer() gets invalid range Harish Kasiviswanathan <Harish.Kasiviswanathan(a)amd.com> drm/amdkfd: Insert missing TLB flush on GFX10 and later Philip Yang <Philip.Yang(a)amd.com> drm/amdkfd: Flush TLB after unmapping for GFX v9.4.3 Nilesh Javali <njavali(a)marvell.com> scsi: qla2xxx: Use raw_smp_processor_id() instead of smp_processor_id() Shreyas Deodhar <sdeodhar(a)marvell.com> scsi: qla2xxx: Select qpair depending on which CPU post_cmd() gets called Sven Eckelmann <sven(a)narfation.org> wifi: ath11k: Cleanup mac80211 references on failure during tx_complete Pradeep Kumar Chitrapu <quic_pradeepc(a)quicinc.com> wifi: ath11k: fix tx status reporting in encap offload mode Amit Pundir <amit.pundir(a)linaro.org> arm64: dts: qcom: sdm845-db845c: Mark cont splash memory region as reserved Holger Dengler <dengler(a)linux.ibm.com> s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_CLR2SECK2 IOCTL Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: get out of a repeat loop when getting a locked data page Chao Yu <chao(a)kernel.org> f2fs: optimize iteration over sparse directories Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen Paul Cercueil <paul(a)crapouillou.net> ARM: dts: samsung: exynos4210-i9100: Fix LCD screen's physical size Aleksey Nasibulin <alealexpro100(a)ya.ru> ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2 Daniel Scally <dan.scally(a)ideasonboard.com> i2c: xiic: Correct return value check for xiic_reinit() Liang He <windhl(a)126.com> i2c: mux: gpio: Add missing fwnode_handle_put() Xiaoke Wang <xkernel.wang(a)foxmail.com> i2c: mux: demux-pinctrl: check the return value of devm_kstrdup() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> gpio: tb10x: Fix an error handling path in tb10x_gpio_probe() Zhang Xiaoxu <zhangxiaoxu5(a)huawei.com> cifs: Fix UAF in cifs_demultiplex_thread() Ben Wolsieffer <ben.wolsieffer(a)hefring.com> proc: nommu: fix empty /proc/<pid>/maps Ben Wolsieffer <Ben.Wolsieffer(a)hefring.com> proc: nommu: /proc/<pid>/maps: release mmap read lock Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli(a)intel.com> igc: Expose tx-usecs coalesce setting to user Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> octeontx2-pf: Do xdp_do_flush() after redirects. Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> bnxt_en: Flush XDP for bnxt_poll_nitroa0()'s NAPI Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> net: ena: Flush XDP packets on error. Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested() Umesh Nerlige Ramappa <umesh.nerlige.ramappa(a)intel.com> i915/pmu: Move execlist stats initialization to execlist specific setup Jozsef Kadlecsik <kadlec(a)netfilter.org> netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: disable toggling dormant table state more than once Artem Chernyshev <artem.chernyshev(a)red-soft.ru> net: rds: Fix possible NULL-pointer dereference Ziyang Xuan <william.xuanziyang(a)huawei.com> team: fix null-ptr-deref when team device type is changed Eric Dumazet <edumazet(a)google.com> net: bridge: use DEV_STATS_INC() Jie Wang <wangjie125(a)huawei.com> net: hns3: add 5ms delay before clear firmware reset irq source Jijie Shao <shaojijie(a)huawei.com> net: hns3: fix fail to delete tc flower rules during reset issue Jian Shen <shenjian15(a)huawei.com> net: hns3: only enable unicast promisc when mac table full Jie Wang <wangjie125(a)huawei.com> net: hns3: fix GRE checksum offload issue Jie Wang <wangjie125(a)huawei.com> net: hns3: add cmdq check for vf periodic service task Josh Poimboeuf <jpoimboe(a)kernel.org> x86/srso: Fix SBPB enablement for spec_rstack_overflow=off Josh Poimboeuf <jpoimboe(a)kernel.org> x86/srso: Fix srso_show_state() side effect Stephen Boyd <swboyd(a)chromium.org> platform/x86: intel_scu_ipc: Fail IPC send if still busy Stephen Boyd <swboyd(a)chromium.org> platform/x86: intel_scu_ipc: Don't override scu in intel_scu_ipc_dev_simple_command() Stephen Boyd <swboyd(a)chromium.org> platform/x86: intel_scu_ipc: Check status upon timeout in ipc_wait_for_interrupt() Stephen Boyd <swboyd(a)chromium.org> platform/x86: intel_scu_ipc: Check status after timeout in busy_loop() Lukasz Majewski <lukma(a)denx.de> net: hsr: Properly parse HSRv1 supervisor frames. Rik van Riel <riel(a)surriel.com> x86/mm, kexec, ima: Use memblock_free_late() from ima_free_kexec_buffer() Eric Dumazet <edumazet(a)google.com> dccp: fix dccp_v4_err()/dccp_v6_err() again Kajol Jain <kjain(a)linux.ibm.com> powerpc/perf/hv-24x7: Update domain value check Eric Dumazet <edumazet(a)google.com> scsi: iscsi_tcp: restrict to TCP sockets Kyle Zeng <zengyhkyle(a)gmail.com> ipv4: fix null-deref in ipv4_link_failure Vinicius Costa Gomes <vinicius.gomes(a)intel.com> igc: Fix infinite initialization loop with early XDP redirect David Christensen <drc(a)linux.vnet.ibm.com> ionic: fix 16bit math issue when PAGE_SIZE >= 64KB Ilya Leoshkevich <iii(a)linux.ibm.com> netfilter, bpf: Adjust timeouts of non-confirmed CTs in bpf_ct_insert_entry() Ivan Vecera <ivecera(a)redhat.com> i40e: Fix VF VLAN offloading when port VLAN is configured Petr Oros <poros(a)redhat.com> iavf: schedule a request immediately after add/delete vlan Petr Oros <poros(a)redhat.com> iavf: add iavf_schedule_aq_request() helper Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> ASoC: SOF: core: Only call sof_ops_free() on remove if the probe was successful Radoslaw Tyl <radoslawx.tyl(a)intel.com> iavf: do not process adminq tasks when __IAVF_IN_REMOVE_TASK is set Shinas Rasheed <srasheed(a)marvell.com> octeon_ep: fix tx dma unmap len values in SG Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: imx-audmix: Fix return error with devm_clk_get() Chen Ni <nichen(a)iscas.ac.cn> ASoC: hdaudio.c: Add missing check for devm_kstrdup Sasha Neftin <sasha.neftin(a)intel.com> net/core: Fix ETH_P_1588 flow dissector Sabrina Dubroca <sd(a)queasysnail.net> selftests: tls: swap the TX and RX sockets in some tests Florian Westphal <fw(a)strlen.de> netfilter: conntrack: fix extension size table Knyazev Arseniy <poseaydone(a)ya.ru> ALSA: hda/realtek: Splitting the UX3402 into two separate models Hans de Goede <hdegoede(a)redhat.com> ASoC: rt5640: Fix IRQ not being free-ed for HDA jack detect mode Hans de Goede <hdegoede(a)redhat.com> ASoC: rt5640: Revert "Fix sleep in atomic context" Toke Høiland-Jørgensen <toke(a)redhat.com> bpf: Avoid deadlock when using queue and stack maps from NMI Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow element removal on anonymous sets Jerome Brunet <jbrunet(a)baylibre.com> ASoC: meson: spdifin: start hw on dai probe Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: fix memleak when more than 255 elements expired Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_pipapo: call nft_trans_gc_queue_sync() in catchall GC Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: defer gc run if previous batch is still pending Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: use correct lock to protect gc_list Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: GC transaction race with abort path Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: GC transaction race with netns dismantle Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: don't fail inserts if duplicate has expired Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: remove busy mark and gc batch API Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_hash: mark set element as dead when deleting from packet path Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: adapt set backend to use GC transaction API Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: GC transaction API to avoid race with control plane Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: don't skip expired elements during walk Jan Kara <jack(a)suse.cz> ext4: do not let fstrim block system suspend Jan Kara <jack(a)suse.cz> ext4: move setting of trimmed bit into ext4_try_to_trim_range() Kemeng Shi <shikemeng(a)huaweicloud.com> ext4: replace the traditional ternary conditional operator with with max()/min() Filipe Manana <fdmanana(a)suse.com> btrfs: remove BUG() after failure to insert delayed dir index item Filipe Manana <fdmanana(a)suse.com> btrfs: improve error message after failure to add delayed dir index item Mikulas Patocka <mpatocka(a)redhat.com> dm: fix a race condition in retrieve_deps Namhyung Kim <namhyung(a)kernel.org> perf build: Update build rule for generated files Dave Wysochanski <dwysocha(a)redhat.com> netfs: Only call folio_start_fscache() one time for each folio Sakari Ailus <sakari.ailus(a)linux.intel.com> media: via: Use correct dependency for camera sensor drivers Sakari Ailus <sakari.ailus(a)linux.intel.com> media: v4l: Use correct dependency for camera sensor drivers Olga Kornievskaia <kolga(a)netapp.com> NFSv4.1: fix pnfs MDS=DS session trunking Olga Kornievskaia <kolga(a)netapp.com> NFSv4.1: use EXCHGID4_FLAG_USE_PNFS_DS for DS server Trond Myklebust <trond.myklebust(a)hammerspace.com> SUNRPC: Mark the cred for revalidation if the server rejects it Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS/pNFS: Report EINVAL errors from connect() to the server Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: More fixes for nfs_direct_write_reschedule_io() Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: Use the correct commit info in nfs_join_page_group() Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: More O_DIRECT accounting fixes for error paths Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: Fix O_DIRECT locking issues Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: Fix error handling for O_DIRECT write scheduling ------------- Diffstat: Documentation/admin-guide/cgroup-v1/memory.rst | 9 +- Makefile | 4 +- arch/arm/boot/dts/am335x-guardian.dts | 3 +- arch/arm/boot/dts/am3517-evm.dts | 2 +- arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 3 +- arch/arm/boot/dts/exynos4210-i9100.dts | 4 +- arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 2 +- arch/arm/boot/dts/motorola-mapphone-common.dtsi | 48 +-- arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 6 +- arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 6 +- arch/arm/boot/dts/omap3-cm-t3517.dts | 12 +- arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 3 +- arch/arm/boot/dts/omap3-gta04.dtsi | 8 +- arch/arm/boot/dts/omap3-ldp.dts | 2 +- arch/arm/boot/dts/omap3-n900.dts | 40 +-- arch/arm/boot/dts/omap3-zoom3.dts | 44 +-- arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 29 +- arch/arm/boot/dts/omap4-duovero-parlor.dts | 12 +- arch/arm/boot/dts/omap4-duovero.dtsi | 18 +- arch/arm/boot/dts/omap4-kc1.dts | 14 +- arch/arm/boot/dts/omap4-mcpdm.dtsi | 2 +- arch/arm/boot/dts/omap4-panda-common.dtsi | 30 +- arch/arm/boot/dts/omap4-panda-es.dts | 8 +- arch/arm/boot/dts/omap4-sdp.dts | 36 +- arch/arm/boot/dts/omap4-var-om44customboard.dtsi | 24 +- arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi | 6 +- arch/arm/boot/dts/omap4-var-som-om44.dtsi | 22 +- arch/arm/boot/dts/omap443x.dtsi | 1 + arch/arm/boot/dts/omap4460.dtsi | 1 + arch/arm/boot/dts/omap5-cm-t54.dts | 56 +-- .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 8 +- arch/arm/boot/dts/twl6030_omap4.dtsi | 4 +- arch/arm64/boot/dts/freescale/Makefile | 1 + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 9 + arch/arm64/configs/defconfig | 1 - arch/loongarch/include/asm/elf.h | 9 + arch/loongarch/kernel/mem.c | 4 +- arch/loongarch/kernel/module.c | 2 +- arch/loongarch/kernel/numa.c | 2 +- arch/mips/alchemy/devboards/db1000.c | 4 + arch/mips/alchemy/devboards/db1200.c | 6 + arch/mips/alchemy/devboards/db1300.c | 4 + arch/parisc/include/asm/ropes.h | 3 + arch/parisc/kernel/drivers.c | 2 +- arch/parisc/kernel/irq.c | 2 +- arch/powerpc/kernel/hw_breakpoint.c | 16 +- arch/powerpc/kernel/hw_breakpoint_constraints.c | 7 +- arch/powerpc/perf/hv-24x7.c | 2 +- arch/riscv/include/asm/errata_list.h | 4 +- arch/x86/include/asm/kexec.h | 2 - arch/x86/include/asm/reboot.h | 2 + arch/x86/kernel/cpu/bugs.c | 4 +- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/cpu/sgx/encl.c | 30 +- arch/x86/kernel/crash.c | 31 -- arch/x86/kernel/reboot.c | 22 ++ arch/x86/kernel/setup.c | 8 +- arch/x86/kvm/mmu/mmu.c | 8 +- arch/x86/kvm/mmu/tdp_mmu.c | 31 +- arch/x86/kvm/mmu/tdp_mmu.h | 3 +- arch/x86/kvm/svm/sev.c | 34 +- arch/x86/kvm/svm/svm.c | 9 +- arch/x86/kvm/svm/svm.h | 1 + arch/x86/kvm/vmx/vmx.c | 10 +- arch/xtensa/boot/Makefile | 3 +- arch/xtensa/boot/lib/zmem.c | 5 +- arch/xtensa/include/asm/core.h | 4 + arch/xtensa/lib/umulsidi3.S | 4 +- arch/xtensa/platforms/iss/network.c | 4 +- drivers/ata/libata-core.c | 47 ++- drivers/ata/libata-eh.c | 13 +- drivers/ata/libata-scsi.c | 47 ++- drivers/ata/libata-transport.c | 9 +- drivers/ata/libata.h | 2 + drivers/ata/sata_mv.c | 4 +- drivers/bus/ti-sysc.c | 31 +- drivers/char/agp/parisc-agp.c | 2 - drivers/clk/sprd/ums512-clk.c | 2 +- drivers/clk/tegra/clk-bpmp.c | 2 +- drivers/firmware/arm_ffa/driver.c | 16 +- drivers/firmware/arm_scmi/perf.c | 93 +++-- drivers/firmware/cirrus/cs_dsp.c | 34 +- drivers/firmware/imx/imx-dsp.c | 1 + drivers/gpio/gpio-pmic-eic-sprd.c | 1 + drivers/gpio/gpio-tb10x.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 17 +- drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 3 + drivers/gpu/drm/amd/amdgpu/soc21.c | 2 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 5 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 4 +- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 4 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 1 - .../gpu/drm/i915/gt/intel_execlists_submission.c | 2 + drivers/gpu/drm/i915/gt/intel_ggtt.c | 23 +- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 2 + drivers/gpu/drm/tests/drm_mm_test.c | 2 +- drivers/i2c/busses/i2c-i801.c | 1 + drivers/i2c/busses/i2c-npcm7xx.c | 17 +- drivers/i2c/busses/i2c-xiic.c | 2 +- drivers/i2c/muxes/i2c-demux-pinctrl.c | 4 + drivers/i2c/muxes/i2c-mux-gpio.c | 4 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 27 +- drivers/md/dm-core.h | 1 + drivers/md/dm-ioctl.c | 7 +- drivers/md/dm-table.c | 32 +- drivers/media/common/videobuf2/frame_vector.c | 6 +- drivers/media/platform/marvell/Kconfig | 4 +- drivers/media/platform/via/Kconfig | 2 +- drivers/media/usb/em28xx/Kconfig | 4 +- drivers/media/usb/go7007/Kconfig | 2 +- drivers/media/usb/uvc/uvc_ctrl.c | 3 + drivers/misc/cardreader/rts5227.c | 55 +-- drivers/misc/cardreader/rts5228.c | 57 +-- drivers/misc/cardreader/rts5249.c | 56 +-- drivers/misc/cardreader/rts5260.c | 43 +-- drivers/misc/cardreader/rts5261.c | 52 +-- drivers/misc/cardreader/rtsx_pcr.c | 51 ++- drivers/net/ethernet/amazon/ena/ena_netdev.c | 3 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 + drivers/net/ethernet/engleder/tsnep_main.c | 18 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 9 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 13 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 8 +- drivers/net/ethernet/intel/iavf/iavf.h | 2 +- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 2 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 17 +- drivers/net/ethernet/intel/igc/igc_ethtool.c | 31 +- drivers/net/ethernet/intel/igc/igc_main.c | 2 +- .../net/ethernet/marvell/octeon_ep/octep_main.c | 8 +- drivers/net/ethernet/marvell/octeon_ep/octep_tx.c | 8 +- drivers/net/ethernet/marvell/octeon_ep/octep_tx.h | 16 +- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 19 +- drivers/net/ethernet/pensando/ionic/ionic_dev.h | 1 + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 10 +- drivers/net/team/team.c | 10 +- drivers/net/thunderbolt.c | 3 +- drivers/net/wireless/ath/ath11k/dp.h | 4 + drivers/net/wireless/ath/ath11k/dp_tx.c | 39 +- drivers/net/wireless/ath/ath11k/dp_tx.h | 1 + drivers/nvme/host/fc.c | 2 +- drivers/nvme/host/pci.c | 121 ++++--- drivers/parisc/iosapic.c | 4 +- drivers/parisc/iosapic_private.h | 4 +- drivers/platform/mellanox/Kconfig | 1 + drivers/platform/x86/asus-nb-wmi.c | 9 + drivers/platform/x86/intel_scu_ipc.c | 66 ++-- drivers/power/supply/ab8500_btemp.c | 9 +- drivers/power/supply/ab8500_chargalg.c | 2 +- drivers/power/supply/mt6370-charger.c | 2 +- drivers/power/supply/rk817_charger.c | 16 +- drivers/power/supply/ucs1002_power.c | 3 +- drivers/s390/crypto/pkey_api.c | 16 +- drivers/s390/crypto/zcrypt_ep11misc.c | 61 +++- drivers/s390/crypto/zcrypt_ep11misc.h | 3 +- drivers/scsi/iscsi_tcp.c | 4 + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm80xx_hwi.c | 4 +- drivers/scsi/qedf/qedf_io.c | 10 +- drivers/scsi/qedf/qedf_main.c | 7 +- drivers/scsi/qla2xxx/qla_def.h | 3 + drivers/scsi/qla2xxx/qla_init.c | 5 +- drivers/scsi/qla2xxx/qla_inline.h | 58 +++ drivers/scsi/qla2xxx/qla_isr.c | 12 +- drivers/scsi/qla2xxx/qla_nvme.c | 4 + drivers/scsi/qla2xxx/qla_os.c | 6 + drivers/scsi/qla2xxx/qla_target.c | 3 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +- drivers/soc/imx/soc-imx8m.c | 10 + drivers/spi/spi-gxp.c | 2 +- drivers/spi/spi-intel-pci.c | 1 + drivers/spi/spi-nxp-fspi.c | 7 + drivers/spi/spi-stm32.c | 8 + drivers/spi/spi-sun6i.c | 31 +- drivers/thermal/thermal_of.c | 8 +- drivers/tty/n_gsm.c | 4 +- drivers/tty/serial/8250/8250_port.c | 5 +- drivers/ufs/core/ufshcd.c | 13 +- drivers/vfio/mdev/mdev_sysfs.c | 3 +- drivers/video/fbdev/Kconfig | 2 +- fs/binfmt_elf_fdpic.c | 5 +- fs/btrfs/delayed-inode.c | 85 +++-- fs/btrfs/extent_io.c | 8 +- fs/btrfs/super.c | 2 +- fs/ceph/caps.c | 6 +- fs/ceph/mds_client.c | 12 +- fs/ceph/mds_client.h | 11 +- fs/ceph/quota.c | 14 +- fs/ceph/snap.c | 10 +- fs/ceph/super.c | 75 +++- fs/ceph/super.h | 3 + fs/ext4/mballoc.c | 60 ++-- fs/f2fs/data.c | 25 +- fs/f2fs/dir.c | 34 +- fs/f2fs/f2fs.h | 5 +- fs/f2fs/gc.c | 4 +- fs/netfs/buffered_read.c | 6 +- fs/nfs/direct.c | 138 ++++--- fs/nfs/flexfilelayout/flexfilelayout.c | 1 + fs/nfs/nfs4client.c | 9 +- fs/nfs/nfs4proc.c | 10 +- fs/nfs/write.c | 23 +- fs/nilfs2/gcinode.c | 6 +- fs/proc/internal.h | 2 - fs/proc/task_nommu.c | 70 ++-- fs/smb/client/cifsglob.h | 1 + fs/smb/client/fs_context.c | 1 + fs/smb/client/inode.c | 2 +- fs/smb/client/smb2ops.c | 6 +- fs/smb/client/transport.c | 34 +- include/linux/bpf.h | 2 +- include/linux/btf_ids.h | 2 +- include/linux/if_team.h | 2 + include/linux/interrupt.h | 6 +- include/linux/libata.h | 4 +- include/linux/memcontrol.h | 4 +- include/linux/nfs_fs_sb.h | 1 + include/linux/nfs_page.h | 4 +- include/linux/resume_user_mode.h | 2 +- include/linux/seqlock.h | 2 +- include/net/netfilter/nf_tables.h | 127 +++---- include/uapi/linux/bpf.h | 4 +- io_uring/fs.c | 2 +- kernel/bpf/memalloc.c | 33 +- kernel/bpf/queue_stack_maps.c | 21 +- kernel/dma/debug.c | 20 +- kernel/sched/core.c | 2 +- kernel/sched/cpupri.c | 1 + kernel/sched/idle.c | 1 + kernel/trace/bpf_trace.c | 16 + kernel/trace/ring_buffer.c | 10 + mm/damon/vaddr-test.h | 2 + mm/memcontrol.c | 13 +- mm/slab_common.c | 12 +- net/bridge/br_forward.c | 4 +- net/bridge/br_input.c | 4 +- net/core/flow_dissector.c | 2 +- net/dccp/ipv4.c | 9 +- net/dccp/ipv6.c | 9 +- net/hsr/hsr_framereg.c | 4 +- net/hsr/hsr_main.h | 2 +- net/ipv4/route.c | 4 +- net/mptcp/options.c | 5 +- net/ncsi/ncsi-aen.c | 5 + net/netfilter/ipset/ip_set_core.c | 12 +- net/netfilter/nf_conntrack_bpf.c | 2 + net/netfilter/nf_conntrack_extend.c | 4 +- net/netfilter/nf_tables_api.c | 400 +++++++++++++++++---- net/netfilter/nft_set_hash.c | 87 +++-- net/netfilter/nft_set_pipapo.c | 71 ++-- net/netfilter/nft_set_rbtree.c | 161 +++++---- net/rds/rdma_transport.c | 12 +- net/smc/smc_stats.h | 3 +- net/sunrpc/clnt.c | 15 +- security/smack/smack.h | 1 + security/smack/smack_lsm.c | 63 +++- sound/hda/intel-sdw-acpi.c | 8 +- sound/pci/hda/hda_intel.c | 1 + sound/pci/hda/patch_realtek.c | 3 +- sound/soc/amd/yc/acp6x-mach.c | 21 ++ sound/soc/codecs/cs42l42.c | 10 + sound/soc/codecs/rt5640.c | 13 +- sound/soc/fsl/imx-audmix.c | 2 +- sound/soc/fsl/imx-pcm-rpmsg.c | 1 + sound/soc/fsl/imx-rpmsg.c | 8 + sound/soc/intel/avs/boards/hdaudio.c | 3 + sound/soc/meson/axg-spdifin.c | 49 +-- sound/soc/sof/core.c | 3 +- sound/soc/sof/intel/mtl.c | 2 +- sound/soc/sof/intel/mtl.h | 1 - tools/build/Makefile.build | 10 + tools/include/linux/btf_ids.h | 2 +- tools/include/linux/mm.h | 2 - tools/include/linux/seq_file.h | 2 + tools/include/uapi/linux/bpf.h | 4 +- tools/perf/pmu-events/Build | 6 + tools/perf/util/Build | 6 + tools/testing/memblock/tests/basic_api.c | 2 +- tools/testing/memblock/tests/common.h | 1 + .../ftrace/test.d/instances/instance-event.tc | 2 +- tools/testing/selftests/kselftest_deps.sh | 77 +++- tools/testing/selftests/net/tls.c | 8 +- tools/testing/selftests/powerpc/Makefile | 15 +- tools/testing/selftests/powerpc/pmu/Makefile | 40 ++- 285 files changed, 2895 insertions(+), 1583 deletions(-)

1 year, 3 months

16
283
0 0

[PATCH v4] tty/sysrq: replace smp_processor_id() with get_cpu()

by Muhammad Usama Anjum

The smp_processor_id() shouldn't be called from preemptible code. Instead use get_cpu() and put_cpu() which disables preemption in addition to getting the processor id. Enable preemption back after calling schedule_work() to make sure that the work gets scheduled on all cores other than the current core. We want to avoid a scenario where current core's stack trace is printed multiple times and one core's stack trace isn't printed because of scheduling of current task. This fixes the following bug: [ 119.143590] sysrq: Show backtrace of all active CPUs [ 119.143902] BUG: using smp_processor_id() in preemptible [00000000] code: bash/873 [ 119.144586] caller is debug_smp_processor_id+0x20/0x30 [ 119.144827] CPU: 6 PID: 873 Comm: bash Not tainted 5.10.124-dirty #3 [ 119.144861] Hardware name: QEMU QEMU Virtual Machine, BIOS 2023.05-1 07/22/2023 [ 119.145053] Call trace: [ 119.145093] dump_backtrace+0x0/0x1a0 [ 119.145122] show_stack+0x18/0x70 [ 119.145141] dump_stack+0xc4/0x11c [ 119.145159] check_preemption_disabled+0x100/0x110 [ 119.145175] debug_smp_processor_id+0x20/0x30 [ 119.145195] sysrq_handle_showallcpus+0x20/0xc0 [ 119.145211] __handle_sysrq+0x8c/0x1a0 [ 119.145227] write_sysrq_trigger+0x94/0x12c [ 119.145247] proc_reg_write+0xa8/0xe4 [ 119.145266] vfs_write+0xec/0x280 [ 119.145282] ksys_write+0x6c/0x100 [ 119.145298] __arm64_sys_write+0x20/0x30 [ 119.145315] el0_svc_common.constprop.0+0x78/0x1e4 [ 119.145332] do_el0_svc+0x24/0x8c [ 119.145348] el0_svc+0x10/0x20 [ 119.145364] el0_sync_handler+0x134/0x140 [ 119.145381] el0_sync+0x180/0x1c0 Cc: jirislaby(a)kernel.org Cc: stable(a)vger.kernel.org Fixes: 47cab6a722d4 ("debug lockups: Improve lockup detection, fix generic arch fallback") Signed-off-by: Muhammad Usama Anjum <usama.anjum(a)collabora.com> --- Changes since v3: - Update commit message to explain why preemption reenabling must happen after calling schedule_work() Changes since v2: - Add changelog and resend Changes since v1: - Add "Cc: stable(a)vger.kernel.org" tag --- drivers/tty/sysrq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 23198e3f1461a..6b4a28bcf2f5f 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -262,13 +262,14 @@ static void sysrq_handle_showallcpus(u8 key) if (in_hardirq()) regs = get_irq_regs(); - pr_info("CPU%d:\n", smp_processor_id()); + pr_info("CPU%d:\n", get_cpu()); if (regs) show_regs(regs); else show_stack(NULL, NULL, KERN_INFO); schedule_work(&sysrq_showallcpus); + put_cpu(); } } -- 2.40.1

1 year, 3 months

1
0
0 0

[PATCH] ASoC: codecs: wsa-macro: fix uninitialized stack variables with name prefix

by Krzysztof Kozlowski

Driver compares widget name in wsa_macro_spk_boost_event() widget event callback, however it does not handle component's name prefix. This leads to using uninitialized stack variables as registers and register values. Handle gracefully such case. Fixes: 2c4066e5d428 ("ASoC: codecs: lpass-wsa-macro: add dapm widgets and route") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- This is a fix only for uninitialized values case. The fix for including name prefixes will be sent separate, because I think it is not a stable material. Happy to combine patches if needed. --- sound/soc/codecs/lpass-wsa-macro.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index ec6859ec0d38..ea6e3fa7e9e1 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -1685,6 +1685,9 @@ static int wsa_macro_spk_boost_event(struct snd_soc_dapm_widget *w, boost_path_cfg1 = CDC_WSA_RX1_RX_PATH_CFG1; reg = CDC_WSA_RX1_RX_PATH_CTL; reg_mix = CDC_WSA_RX1_RX_PATH_MIX_CTL; + } else { + dev_warn(component->dev, "Incorrect widget name in the driver\n"); + return -EINVAL; } switch (event) { -- 2.34.1

1 year, 3 months

2
1
0 0

[PATCH v3] tty/sysrq: replace smp_processor_id() with get_cpu()

by Muhammad Usama Anjum

The smp_processor_id() shouldn't be called from preemptible code. Instead use get_cpu() and put_cpu() which disables preemption in addition to getting the processor id. This fixes the following bug: [ 119.143590] sysrq: Show backtrace of all active CPUs [ 119.143902] BUG: using smp_processor_id() in preemptible [00000000] code: bash/873 [ 119.144586] caller is debug_smp_processor_id+0x20/0x30 [ 119.144827] CPU: 6 PID: 873 Comm: bash Not tainted 5.10.124-dirty #3 [ 119.144861] Hardware name: QEMU QEMU Virtual Machine, BIOS 2023.05-1 07/22/2023 [ 119.145053] Call trace: [ 119.145093] dump_backtrace+0x0/0x1a0 [ 119.145122] show_stack+0x18/0x70 [ 119.145141] dump_stack+0xc4/0x11c [ 119.145159] check_preemption_disabled+0x100/0x110 [ 119.145175] debug_smp_processor_id+0x20/0x30 [ 119.145195] sysrq_handle_showallcpus+0x20/0xc0 [ 119.145211] __handle_sysrq+0x8c/0x1a0 [ 119.145227] write_sysrq_trigger+0x94/0x12c [ 119.145247] proc_reg_write+0xa8/0xe4 [ 119.145266] vfs_write+0xec/0x280 [ 119.145282] ksys_write+0x6c/0x100 [ 119.145298] __arm64_sys_write+0x20/0x30 [ 119.145315] el0_svc_common.constprop.0+0x78/0x1e4 [ 119.145332] do_el0_svc+0x24/0x8c [ 119.145348] el0_svc+0x10/0x20 [ 119.145364] el0_sync_handler+0x134/0x140 [ 119.145381] el0_sync+0x180/0x1c0 Cc: stable(a)vger.kernel.org Fixes: 47cab6a722d4 ("debug lockups: Improve lockup detection, fix generic arch fallback") Signed-off-by: Muhammad Usama Anjum <usama.anjum(a)collabora.com> --- Changes since v2: - Add changelog and resend Changes since v1: - Add "Cc: stable(a)vger.kernel.org" tag --- drivers/tty/sysrq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 23198e3f1461a..6b4a28bcf2f5f 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -262,13 +262,14 @@ static void sysrq_handle_showallcpus(u8 key) if (in_hardirq()) regs = get_irq_regs(); - pr_info("CPU%d:\n", smp_processor_id()); + pr_info("CPU%d:\n", get_cpu()); if (regs) show_regs(regs); else show_stack(NULL, NULL, KERN_INFO); schedule_work(&sysrq_showallcpus); + put_cpu(); } } -- 2.40.1

1 year, 3 months

3
8
0 0

Re: [PATCH 6.5 000/163] 6.5.7-rc1 review

by Ronald Warsow

Hi Greg 6.5.7-rc1 compiles, boots and runs here on x86_64 (Intel Rocket Lake, i5-11400) Thanks Tested-by: Ronald Warsow <rwarsow(a)gmx.de>

1 year, 3 months

1
0
0 0

[PATCH 4.14.y] drivers core: Use sysfs_emit and sysfs_emit_at for show(device *...) functions

by Harshit Mogalapalli

From: Joe Perches <joe(a)perches.com> commit aa838896d87af561a33ecefea1caa4c15a68bc47 upstream. Convert the various sprintf fmaily calls in sysfs device show functions to sysfs_emit and sysfs_emit_at for PAGE_SIZE buffer safety. Done with: $ spatch -sp-file sysfs_emit_dev.cocci --in-place --max-width=80 . And cocci script: $ cat sysfs_emit_dev.cocci @@ identifier d_show; identifier dev, attr, buf; @@ ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf) { <... return - sprintf(buf, + sysfs_emit(buf, ...); ...> } @@ identifier d_show; identifier dev, attr, buf; @@ ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf) { <... return - snprintf(buf, PAGE_SIZE, + sysfs_emit(buf, ...); ...> } @@ identifier d_show; identifier dev, attr, buf; @@ ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf) { <... return - scnprintf(buf, PAGE_SIZE, + sysfs_emit(buf, ...); ...> } @@ identifier d_show; identifier dev, attr, buf; expression chr; @@ ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf) { <... return - strcpy(buf, chr); + sysfs_emit(buf, chr); ...> } @@ identifier d_show; identifier dev, attr, buf; identifier len; @@ ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf) { <... len = - sprintf(buf, + sysfs_emit(buf, ...); ...> return len; } @@ identifier d_show; identifier dev, attr, buf; identifier len; @@ ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf) { <... len = - snprintf(buf, PAGE_SIZE, + sysfs_emit(buf, ...); ...> return len; } @@ identifier d_show; identifier dev, attr, buf; identifier len; @@ ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf) { <... len = - scnprintf(buf, PAGE_SIZE, + sysfs_emit(buf, ...); ...> return len; } @@ identifier d_show; identifier dev, attr, buf; identifier len; @@ ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf) { <... - len += scnprintf(buf + len, PAGE_SIZE - len, + len += sysfs_emit_at(buf, len, ...); ...> return len; } @@ identifier d_show; identifier dev, attr, buf; expression chr; @@ ssize_t d_show(struct device *dev, struct device_attribute *attr, char *buf) { ... - strcpy(buf, chr); - return strlen(buf); + return sysfs_emit(buf, chr); } Signed-off-by: Joe Perches <joe(a)perches.com> Link: https://lore.kernel.org/r/3d033c33056d88bbe34d4ddb62afd05ee166ab9a.16002859… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> [Harshit: backport to 4.14.y -- regenerated the diff with the help of coccinelle script in driver/base/ directory.] Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com> --- Only compile tested. This fixes CVE-2022-20166. It is not clear whether the CVE was assigned for a demonstrated issue or just a theoretical one. In any case it's a good defensive measure against future patches that may introduce a real issue if they assume this patch is already there. --- drivers/base/arch_topology.c | 3 +- drivers/base/cacheinfo.c | 18 ++++++------ drivers/base/core.c | 8 ++--- drivers/base/cpu.c | 26 ++++++++--------- drivers/base/firmware_class.c | 2 +- drivers/base/memory.c | 24 +++++++-------- drivers/base/node.c | 26 ++++++++--------- drivers/base/platform.c | 2 +- drivers/base/power/sysfs.c | 55 ++++++++++++++++++----------------- drivers/base/soc.c | 8 ++--- 10 files changed, 87 insertions(+), 85 deletions(-) diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 3da53cc6cf2b..4b965f562d0b 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -41,7 +41,8 @@ static ssize_t cpu_capacity_show(struct device *dev, { struct cpu *cpu = container_of(dev, struct cpu, dev); - return sprintf(buf, "%lu\n", topology_get_cpu_scale(NULL, cpu->dev.id)); + return sysfs_emit(buf, "%lu\n", + topology_get_cpu_scale(NULL, cpu->dev.id)); } static ssize_t cpu_capacity_store(struct device *dev, diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c index e405ea3ca8d8..1d4969b0478f 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -388,7 +388,7 @@ static ssize_t size_show(struct device *dev, { struct cacheinfo *this_leaf = dev_get_drvdata(dev); - return sprintf(buf, "%uK\n", this_leaf->size >> 10); + return sysfs_emit(buf, "%uK\n", this_leaf->size >> 10); } static ssize_t shared_cpumap_show_func(struct device *dev, bool list, char *buf) @@ -418,11 +418,11 @@ static ssize_t type_show(struct device *dev, switch (this_leaf->type) { case CACHE_TYPE_DATA: - return sprintf(buf, "Data\n"); + return sysfs_emit(buf, "Data\n"); case CACHE_TYPE_INST: - return sprintf(buf, "Instruction\n"); + return sysfs_emit(buf, "Instruction\n"); case CACHE_TYPE_UNIFIED: - return sprintf(buf, "Unified\n"); + return sysfs_emit(buf, "Unified\n"); default: return -EINVAL; } @@ -436,11 +436,11 @@ static ssize_t allocation_policy_show(struct device *dev, int n = 0; if ((ci_attr & CACHE_READ_ALLOCATE) && (ci_attr & CACHE_WRITE_ALLOCATE)) - n = sprintf(buf, "ReadWriteAllocate\n"); + n = sysfs_emit(buf, "ReadWriteAllocate\n"); else if (ci_attr & CACHE_READ_ALLOCATE) - n = sprintf(buf, "ReadAllocate\n"); + n = sysfs_emit(buf, "ReadAllocate\n"); else if (ci_attr & CACHE_WRITE_ALLOCATE) - n = sprintf(buf, "WriteAllocate\n"); + n = sysfs_emit(buf, "WriteAllocate\n"); return n; } @@ -452,9 +452,9 @@ static ssize_t write_policy_show(struct device *dev, int n = 0; if (ci_attr & CACHE_WRITE_THROUGH) - n = sprintf(buf, "WriteThrough\n"); + n = sysfs_emit(buf, "WriteThrough\n"); else if (ci_attr & CACHE_WRITE_BACK) - n = sprintf(buf, "WriteBack\n"); + n = sysfs_emit(buf, "WriteBack\n"); return n; } diff --git a/drivers/base/core.c b/drivers/base/core.c index e834087448a4..4f30ab4c3d95 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -766,7 +766,7 @@ ssize_t device_show_ulong(struct device *dev, char *buf) { struct dev_ext_attribute *ea = to_ext_attr(attr); - return snprintf(buf, PAGE_SIZE, "%lx\n", *(unsigned long *)(ea->var)); + return sysfs_emit(buf, "%lx\n", *(unsigned long *)(ea->var)); } EXPORT_SYMBOL_GPL(device_show_ulong); @@ -791,7 +791,7 @@ ssize_t device_show_int(struct device *dev, { struct dev_ext_attribute *ea = to_ext_attr(attr); - return snprintf(buf, PAGE_SIZE, "%d\n", *(int *)(ea->var)); + return sysfs_emit(buf, "%d\n", *(int *)(ea->var)); } EXPORT_SYMBOL_GPL(device_show_int); @@ -812,7 +812,7 @@ ssize_t device_show_bool(struct device *dev, struct device_attribute *attr, { struct dev_ext_attribute *ea = to_ext_attr(attr); - return snprintf(buf, PAGE_SIZE, "%d\n", *(bool *)(ea->var)); + return sysfs_emit(buf, "%d\n", *(bool *)(ea->var)); } EXPORT_SYMBOL_GPL(device_show_bool); @@ -1036,7 +1036,7 @@ static ssize_t online_show(struct device *dev, struct device_attribute *attr, device_lock(dev); val = !dev->offline; device_unlock(dev); - return sprintf(buf, "%u\n", val); + return sysfs_emit(buf, "%u\n", val); } static ssize_t online_store(struct device *dev, struct device_attribute *attr, diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index c9463c30b812..f602b2215026 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -154,7 +154,7 @@ static ssize_t show_crash_notes(struct device *dev, struct device_attribute *att * operation should be safe. No locking required. */ addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpunum)); - rc = sprintf(buf, "%Lx\n", addr); + rc = sysfs_emit(buf, "%Lx\n", addr); return rc; } static DEVICE_ATTR(crash_notes, 0400, show_crash_notes, NULL); @@ -165,7 +165,7 @@ static ssize_t show_crash_notes_size(struct device *dev, { ssize_t rc; - rc = sprintf(buf, "%zu\n", sizeof(note_buf_t)); + rc = sysfs_emit(buf, "%zu\n", sizeof(note_buf_t)); return rc; } static DEVICE_ATTR(crash_notes_size, 0400, show_crash_notes_size, NULL); @@ -318,8 +318,8 @@ static ssize_t print_cpu_modalias(struct device *dev, ssize_t n; u32 i; - n = sprintf(buf, "cpu:type:" CPU_FEATURE_TYPEFMT ":feature:", - CPU_FEATURE_TYPEVAL); + n = sysfs_emit(buf, "cpu:type:" CPU_FEATURE_TYPEFMT ":feature:", + CPU_FEATURE_TYPEVAL); for (i = 0; i < MAX_CPU_FEATURES; i++) if (cpu_have_feature(i)) { @@ -506,56 +506,56 @@ static void __init cpu_dev_register_generic(void) ssize_t __weak cpu_show_meltdown(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "Not affected\n"); + return sysfs_emit(buf, "Not affected\n"); } ssize_t __weak cpu_show_spectre_v1(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "Not affected\n"); + return sysfs_emit(buf, "Not affected\n"); } ssize_t __weak cpu_show_spectre_v2(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "Not affected\n"); + return sysfs_emit(buf, "Not affected\n"); } ssize_t __weak cpu_show_spec_store_bypass(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "Not affected\n"); + return sysfs_emit(buf, "Not affected\n"); } ssize_t __weak cpu_show_l1tf(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "Not affected\n"); + return sysfs_emit(buf, "Not affected\n"); } ssize_t __weak cpu_show_mds(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "Not affected\n"); + return sysfs_emit(buf, "Not affected\n"); } ssize_t __weak cpu_show_tsx_async_abort(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "Not affected\n"); + return sysfs_emit(buf, "Not affected\n"); } ssize_t __weak cpu_show_itlb_multihit(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "Not affected\n"); + return sysfs_emit(buf, "Not affected\n"); } ssize_t __weak cpu_show_srbds(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "Not affected\n"); + return sysfs_emit(buf, "Not affected\n"); } ssize_t __weak cpu_show_mmio_stale_data(struct device *dev, diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 4b57cf5bc81d..7cb90e4ac4a6 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -698,7 +698,7 @@ static ssize_t firmware_loading_show(struct device *dev, loading = fw_state_is_loading(&fw_priv->buf->fw_st); mutex_unlock(&fw_lock); - return sprintf(buf, "%d\n", loading); + return sysfs_emit(buf, "%d\n", loading); } /* Some architectures don't have PAGE_KERNEL_RO */ diff --git a/drivers/base/memory.c b/drivers/base/memory.c index fe1557aa9b10..39359fb9146b 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -116,7 +116,7 @@ static ssize_t show_mem_start_phys_index(struct device *dev, unsigned long phys_index; phys_index = mem->start_section_nr / sections_per_block; - return sprintf(buf, "%08lx\n", phys_index); + return sysfs_emit(buf, "%08lx\n", phys_index); } /* @@ -140,7 +140,7 @@ static ssize_t show_mem_removable(struct device *dev, } out: - return sprintf(buf, "%d\n", ret); + return sysfs_emit(buf, "%d\n", ret); } /* @@ -158,17 +158,17 @@ static ssize_t show_mem_state(struct device *dev, */ switch (mem->state) { case MEM_ONLINE: - len = sprintf(buf, "online\n"); + len = sysfs_emit(buf, "online\n"); break; case MEM_OFFLINE: - len = sprintf(buf, "offline\n"); + len = sysfs_emit(buf, "offline\n"); break; case MEM_GOING_OFFLINE: - len = sprintf(buf, "going-offline\n"); + len = sysfs_emit(buf, "going-offline\n"); break; default: - len = sprintf(buf, "ERROR-UNKNOWN-%ld\n", - mem->state); + len = sysfs_emit(buf, "ERROR-UNKNOWN-%ld\n", + mem->state); WARN_ON(1); break; } @@ -385,7 +385,7 @@ static ssize_t show_phys_device(struct device *dev, struct device_attribute *attr, char *buf) { struct memory_block *mem = to_memory_block(dev); - return sprintf(buf, "%d\n", mem->phys_device); + return sysfs_emit(buf, "%d\n", mem->phys_device); } #ifdef CONFIG_MEMORY_HOTREMOVE @@ -417,7 +417,7 @@ static ssize_t show_valid_zones(struct device *dev, * This can happen e.g. for ZONE_DMA and ZONE_DMA32 */ if (!test_pages_in_a_zone(start_pfn, start_pfn + nr_pages, &valid_start_pfn, &valid_end_pfn)) - return sprintf(buf, "none\n"); + return sysfs_emit(buf, "none\n"); start_pfn = valid_start_pfn; nr_pages = valid_end_pfn - start_pfn; @@ -459,7 +459,7 @@ static ssize_t print_block_size(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "%lx\n", get_memory_block_size()); + return sysfs_emit(buf, "%lx\n", get_memory_block_size()); } static DEVICE_ATTR(block_size_bytes, 0444, print_block_size, NULL); @@ -473,9 +473,9 @@ show_auto_online_blocks(struct device *dev, struct device_attribute *attr, char *buf) { if (memhp_auto_online) - return sprintf(buf, "online\n"); + return sysfs_emit(buf, "online\n"); else - return sprintf(buf, "offline\n"); + return sysfs_emit(buf, "offline\n"); } static ssize_t diff --git a/drivers/base/node.c b/drivers/base/node.c index 57eef6b24448..a547867c2094 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -162,19 +162,19 @@ static DEVICE_ATTR(meminfo, S_IRUGO, node_read_meminfo, NULL); static ssize_t node_read_numastat(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, - "numa_hit %lu\n" - "numa_miss %lu\n" - "numa_foreign %lu\n" - "interleave_hit %lu\n" - "local_node %lu\n" - "other_node %lu\n", - sum_zone_numa_state(dev->id, NUMA_HIT), - sum_zone_numa_state(dev->id, NUMA_MISS), - sum_zone_numa_state(dev->id, NUMA_FOREIGN), - sum_zone_numa_state(dev->id, NUMA_INTERLEAVE_HIT), - sum_zone_numa_state(dev->id, NUMA_LOCAL), - sum_zone_numa_state(dev->id, NUMA_OTHER)); + return sysfs_emit(buf, + "numa_hit %lu\n" + "numa_miss %lu\n" + "numa_foreign %lu\n" + "interleave_hit %lu\n" + "local_node %lu\n" + "other_node %lu\n", + sum_zone_numa_state(dev->id, NUMA_HIT), + sum_zone_numa_state(dev->id, NUMA_MISS), + sum_zone_numa_state(dev->id, NUMA_FOREIGN), + sum_zone_numa_state(dev->id, NUMA_INTERLEAVE_HIT), + sum_zone_numa_state(dev->id, NUMA_LOCAL), + sum_zone_numa_state(dev->id, NUMA_OTHER)); } static DEVICE_ATTR(numastat, S_IRUGO, node_read_numastat, NULL); diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 0ee3cab88f70..d0847c17d725 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -909,7 +909,7 @@ static ssize_t driver_override_show(struct device *dev, ssize_t len; device_lock(dev); - len = sprintf(buf, "%s\n", pdev->driver_override); + len = sysfs_emit(buf, "%s\n", pdev->driver_override); device_unlock(dev); return len; } diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c index 156ab57bca77..b660446321c3 100644 --- a/drivers/base/power/sysfs.c +++ b/drivers/base/power/sysfs.c @@ -101,7 +101,7 @@ static const char ctrl_on[] = "on"; static ssize_t control_show(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "%s\n", + return sysfs_emit(buf, "%s\n", dev->power.runtime_auto ? ctrl_auto : ctrl_on); } @@ -133,7 +133,8 @@ static ssize_t rtpm_active_time_show(struct device *dev, int ret; spin_lock_irq(&dev->power.lock); update_pm_runtime_accounting(dev); - ret = sprintf(buf, "%i\n", jiffies_to_msecs(dev->power.active_jiffies)); + ret = sysfs_emit(buf, "%i\n", + jiffies_to_msecs(dev->power.active_jiffies)); spin_unlock_irq(&dev->power.lock); return ret; } @@ -146,8 +147,8 @@ static ssize_t rtpm_suspended_time_show(struct device *dev, int ret; spin_lock_irq(&dev->power.lock); update_pm_runtime_accounting(dev); - ret = sprintf(buf, "%i\n", - jiffies_to_msecs(dev->power.suspended_jiffies)); + ret = sysfs_emit(buf, "%i\n", + jiffies_to_msecs(dev->power.suspended_jiffies)); spin_unlock_irq(&dev->power.lock); return ret; } @@ -181,7 +182,7 @@ static ssize_t rtpm_status_show(struct device *dev, return -EIO; } } - return sprintf(buf, p); + return sysfs_emit(buf, p); } static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL); @@ -191,7 +192,7 @@ static ssize_t autosuspend_delay_ms_show(struct device *dev, { if (!dev->power.use_autosuspend) return -EIO; - return sprintf(buf, "%d\n", dev->power.autosuspend_delay); + return sysfs_emit(buf, "%d\n", dev->power.autosuspend_delay); } static ssize_t autosuspend_delay_ms_store(struct device *dev, @@ -218,7 +219,7 @@ static ssize_t pm_qos_resume_latency_show(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "%d\n", dev_pm_qos_requested_resume_latency(dev)); + return sysfs_emit(buf, "%d\n", dev_pm_qos_requested_resume_latency(dev)); } static ssize_t pm_qos_resume_latency_store(struct device *dev, @@ -249,11 +250,11 @@ static ssize_t pm_qos_latency_tolerance_show(struct device *dev, s32 value = dev_pm_qos_get_user_latency_tolerance(dev); if (value < 0) - return sprintf(buf, "auto\n"); + return sysfs_emit(buf, "auto\n"); else if (value == PM_QOS_LATENCY_ANY) - return sprintf(buf, "any\n"); + return sysfs_emit(buf, "any\n"); - return sprintf(buf, "%d\n", value); + return sysfs_emit(buf, "%d\n", value); } static ssize_t pm_qos_latency_tolerance_store(struct device *dev, @@ -286,8 +287,8 @@ static ssize_t pm_qos_no_power_off_show(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "%d\n", !!(dev_pm_qos_requested_flags(dev) - & PM_QOS_FLAG_NO_POWER_OFF)); + return sysfs_emit(buf, "%d\n", !!(dev_pm_qos_requested_flags(dev) + & PM_QOS_FLAG_NO_POWER_OFF)); } static ssize_t pm_qos_no_power_off_store(struct device *dev, @@ -313,8 +314,8 @@ static ssize_t pm_qos_remote_wakeup_show(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "%d\n", !!(dev_pm_qos_requested_flags(dev) - & PM_QOS_FLAG_REMOTE_WAKEUP)); + return sysfs_emit(buf, "%d\n", !!(dev_pm_qos_requested_flags(dev) + & PM_QOS_FLAG_REMOTE_WAKEUP)); } static ssize_t pm_qos_remote_wakeup_store(struct device *dev, @@ -343,9 +344,9 @@ static const char _disabled[] = "disabled"; static ssize_t wake_show(struct device * dev, struct device_attribute *attr, char * buf) { - return sprintf(buf, "%s\n", device_can_wakeup(dev) - ? (device_may_wakeup(dev) ? _enabled : _disabled) - : ""); + return sysfs_emit(buf, "%s\n", device_can_wakeup(dev) + ? (device_may_wakeup(dev) ? _enabled : _disabled) + : ""); } static ssize_t @@ -538,26 +539,26 @@ static DEVICE_ATTR(wakeup_prevent_sleep_time_ms, 0444, static ssize_t rtpm_usagecount_show(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "%d\n", atomic_read(&dev->power.usage_count)); + return sysfs_emit(buf, "%d\n", atomic_read(&dev->power.usage_count)); } static ssize_t rtpm_children_show(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "%d\n", dev->power.ignore_children ? - 0 : atomic_read(&dev->power.child_count)); + return sysfs_emit(buf, "%d\n", dev->power.ignore_children ? + 0 : atomic_read(&dev->power.child_count)); } static ssize_t rtpm_enabled_show(struct device *dev, struct device_attribute *attr, char *buf) { if ((dev->power.disable_depth) && (dev->power.runtime_auto == false)) - return sprintf(buf, "disabled & forbidden\n"); + return sysfs_emit(buf, "disabled & forbidden\n"); else if (dev->power.disable_depth) - return sprintf(buf, "disabled\n"); + return sysfs_emit(buf, "disabled\n"); else if (dev->power.runtime_auto == false) - return sprintf(buf, "forbidden\n"); - return sprintf(buf, "enabled\n"); + return sysfs_emit(buf, "forbidden\n"); + return sysfs_emit(buf, "enabled\n"); } static DEVICE_ATTR(runtime_usage, 0444, rtpm_usagecount_show, NULL); @@ -568,9 +569,9 @@ static DEVICE_ATTR(runtime_enabled, 0444, rtpm_enabled_show, NULL); static ssize_t async_show(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "%s\n", - device_async_suspend_enabled(dev) ? - _enabled : _disabled); + return sysfs_emit(buf, "%s\n", + device_async_suspend_enabled(dev) ? + _enabled : _disabled); } static ssize_t async_store(struct device *dev, struct device_attribute *attr, diff --git a/drivers/base/soc.c b/drivers/base/soc.c index 1242b2d2e01a..0e7ab127c5c4 100644 --- a/drivers/base/soc.c +++ b/drivers/base/soc.c @@ -72,13 +72,13 @@ static ssize_t soc_info_get(struct device *dev, struct soc_device *soc_dev = container_of(dev, struct soc_device, dev); if (attr == &dev_attr_machine) - return sprintf(buf, "%s\n", soc_dev->attr->machine); + return sysfs_emit(buf, "%s\n", soc_dev->attr->machine); if (attr == &dev_attr_family) - return sprintf(buf, "%s\n", soc_dev->attr->family); + return sysfs_emit(buf, "%s\n", soc_dev->attr->family); if (attr == &dev_attr_revision) - return sprintf(buf, "%s\n", soc_dev->attr->revision); + return sysfs_emit(buf, "%s\n", soc_dev->attr->revision); if (attr == &dev_attr_soc_id) - return sprintf(buf, "%s\n", soc_dev->attr->soc_id); + return sysfs_emit(buf, "%s\n", soc_dev->attr->soc_id); return -EINVAL; -- 2.38.1

1 year, 3 months

3
2
0 0

FAILED: patch "[PATCH] parisc: Restore __ldcw_align for PA-RISC 2.0 processors" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 914988e099fc658436fbd7b8f240160c352b6552 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023100802-occupant-unsalted-d02b@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 914988e099fc ("parisc: Restore __ldcw_align for PA-RISC 2.0 processors") 15e64ef6520e ("parisc: Add lightweight spinlock checks") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 914988e099fc658436fbd7b8f240160c352b6552 Mon Sep 17 00:00:00 2001 From: John David Anglin <dave(a)parisc-linux.org> Date: Tue, 19 Sep 2023 17:51:40 +0000 Subject: [PATCH] parisc: Restore __ldcw_align for PA-RISC 2.0 processors Back in 2005, Kyle McMartin removed the 16-byte alignment for ldcw semaphores on PA 2.0 machines (CONFIG_PA20). This broke spinlocks on pre PA8800 processors. The main symptom was random faults in mmap'd memory (e.g., gcc compilations, etc). Unfortunately, the errata for this ldcw change is lost. The issue is the 16-byte alignment required for ldcw semaphore instructions can only be reduced to natural alignment when the ldcw operation can be handled coherently in cache. Only PA8800 and PA8900 processors actually support doing the operation in cache. Aligning the spinlock dynamically adds two integer instructions to each spinlock. Tested on rp3440, c8000 and a500. Signed-off-by: John David Anglin <dave.anglin(a)bell.net> Link: https://lore.kernel.org/linux-parisc/6b332788-2227-127f-ba6d-55e99ecf4ed8@b… Link: https://lore.kernel.org/linux-parisc/20050609050702.GB4641@roadwarrior.mcma… Cc: stable(a)vger.kernel.org Signed-off-by: Helge Deller <deller(a)gmx.de> diff --git a/arch/parisc/include/asm/ldcw.h b/arch/parisc/include/asm/ldcw.h index 6d28b5514699..ee9e071859b2 100644 --- a/arch/parisc/include/asm/ldcw.h +++ b/arch/parisc/include/asm/ldcw.h @@ -2,39 +2,42 @@ #ifndef __PARISC_LDCW_H #define __PARISC_LDCW_H -#ifndef CONFIG_PA20 /* Because kmalloc only guarantees 8-byte alignment for kmalloc'd data, and GCC only guarantees 8-byte alignment for stack locals, we can't be assured of 16-byte alignment for atomic lock data even if we specify "__attribute ((aligned(16)))" in the type declaration. So, we use a struct containing an array of four ints for the atomic lock type and dynamically select the 16-byte aligned int from the array - for the semaphore. */ + for the semaphore. */ + +/* From: "Jim Hull" <jim.hull of hp.com> + I've attached a summary of the change, but basically, for PA 2.0, as + long as the ",CO" (coherent operation) completer is implemented, then the + 16-byte alignment requirement for ldcw and ldcd is relaxed, and instead + they only require "natural" alignment (4-byte for ldcw, 8-byte for + ldcd). + + Although the cache control hint is accepted by all PA 2.0 processors, + it is only implemented on PA8800/PA8900 CPUs. Prior PA8X00 CPUs still + require 16-byte alignment. If the address is unaligned, the operation + of the instruction is undefined. The ldcw instruction does not generate + unaligned data reference traps so misaligned accesses are not detected. + This hid the problem for years. So, restore the 16-byte alignment dropped + by Kyle McMartin in "Remove __ldcw_align for PA-RISC 2.0 processors". */ #define __PA_LDCW_ALIGNMENT 16 -#define __PA_LDCW_ALIGN_ORDER 4 #define __ldcw_align(a) ({ \ unsigned long __ret = (unsigned long) &(a)->lock[0]; \ __ret = (__ret + __PA_LDCW_ALIGNMENT - 1) \ & ~(__PA_LDCW_ALIGNMENT - 1); \ (volatile unsigned int *) __ret; \ }) -#define __LDCW "ldcw" -#else /*CONFIG_PA20*/ -/* From: "Jim Hull" <jim.hull of hp.com> - I've attached a summary of the change, but basically, for PA 2.0, as - long as the ",CO" (coherent operation) completer is specified, then the - 16-byte alignment requirement for ldcw and ldcd is relaxed, and instead - they only require "natural" alignment (4-byte for ldcw, 8-byte for - ldcd). */ - -#define __PA_LDCW_ALIGNMENT 4 -#define __PA_LDCW_ALIGN_ORDER 2 -#define __ldcw_align(a) (&(a)->slock) +#ifdef CONFIG_PA20 #define __LDCW "ldcw,co" - -#endif /*!CONFIG_PA20*/ +#else +#define __LDCW "ldcw" +#endif /* LDCW, the only atomic read-write operation PA-RISC has. *sigh*. We don't explicitly expose that "*a" may be written as reload diff --git a/arch/parisc/include/asm/spinlock_types.h b/arch/parisc/include/asm/spinlock_types.h index efd06a897c6a..7b986b09dba8 100644 --- a/arch/parisc/include/asm/spinlock_types.h +++ b/arch/parisc/include/asm/spinlock_types.h @@ -9,15 +9,10 @@ #ifndef __ASSEMBLY__ typedef struct { -#ifdef CONFIG_PA20 - volatile unsigned int slock; -# define __ARCH_SPIN_LOCK_UNLOCKED { __ARCH_SPIN_LOCK_UNLOCKED_VAL } -#else volatile unsigned int lock[4]; # define __ARCH_SPIN_LOCK_UNLOCKED \ { { __ARCH_SPIN_LOCK_UNLOCKED_VAL, __ARCH_SPIN_LOCK_UNLOCKED_VAL, \ __ARCH_SPIN_LOCK_UNLOCKED_VAL, __ARCH_SPIN_LOCK_UNLOCKED_VAL } } -#endif } arch_spinlock_t;

1 year, 3 months

3
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2023