June 2021 - Linux-stable-mirror

[PATCH] tracing: Correct the length check which causes memory corruption

by Liangyan

We've suffered from severe kernel crashes due to memory corruption on our production environment, like, Call Trace: [1640542.554277] general protection fault: 0000 [#1] SMP PTI [1640542.554856] CPU: 17 PID: 26996 Comm: python Kdump: loaded Tainted:G [1640542.556629] RIP: 0010:kmem_cache_alloc+0x90/0x190 [1640542.559074] RSP: 0018:ffffb16faa597df8 EFLAGS: 00010286 [1640542.559587] RAX: 0000000000000000 RBX: 0000000000400200 RCX: 0000000006e931bf [1640542.560323] RDX: 0000000006e931be RSI: 0000000000400200 RDI: ffff9a45ff004300 [1640542.560996] RBP: 0000000000400200 R08: 0000000000023420 R09: 0000000000000000 [1640542.561670] R10: 0000000000000000 R11: 0000000000000000 R12: ffffffff9a20608d [1640542.562366] R13: ffff9a45ff004300 R14: ffff9a45ff004300 R15: 696c662f65636976 [1640542.563128] FS: 00007f45d7c6f740(0000) GS:ffff9a45ff840000(0000) knlGS:0000000000000000 [1640542.563937] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [1640542.564557] CR2: 00007f45d71311a0 CR3: 000000189d63e004 CR4: 00000000003606e0 [1640542.565279] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [1640542.566069] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [1640542.566742] Call Trace: [1640542.567009] anon_vma_clone+0x5d/0x170 [1640542.567417] __split_vma+0x91/0x1a0 [1640542.567777] do_munmap+0x2c6/0x320 [1640542.568128] vm_munmap+0x54/0x70 [1640542.569990] __x64_sys_munmap+0x22/0x30 [1640542.572005] do_syscall_64+0x5b/0x1b0 [1640542.573724] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [1640542.575642] RIP: 0033:0x7f45d6e61e27 James Wang has reproduced it stably on the latest 4.19 LTS. After some debugging, we finally proved that it's due to ftrace buffer out-of-bound access using a debug tool as follows: [ 86.775200] BUG: Out-of-bounds write at addr 0xffff88aefe8b7000 [ 86.780806] no_context+0xdf/0x3c0 [ 86.784327] __do_page_fault+0x252/0x470 [ 86.788367] do_page_fault+0x32/0x140 [ 86.792145] page_fault+0x1e/0x30 [ 86.795576] strncpy_from_unsafe+0x66/0xb0 [ 86.799789] fetch_memory_string+0x25/0x40 [ 86.804002] fetch_deref_string+0x51/0x60 [ 86.808134] kprobe_trace_func+0x32d/0x3a0 [ 86.812347] kprobe_dispatcher+0x45/0x50 [ 86.816385] kprobe_ftrace_handler+0x90/0xf0 [ 86.820779] ftrace_ops_assist_func+0xa1/0x140 [ 86.825340] 0xffffffffc00750bf [ 86.828603] do_sys_open+0x5/0x1f0 [ 86.832124] do_syscall_64+0x5b/0x1b0 [ 86.835900] entry_SYSCALL_64_after_hwframe+0x44/0xa9 commit b220c049d519 ("tracing: Check length before giving out the filter buffer") adds length check to protect trace data overflow introduced in 0fc1b09ff1ff, seems that this fix can't prevent overflow entirely, the length check should also take the sizeof entry->array[0] into account, since this array[0] is filled the length of trace data and occupy addtional space and risk overflow. Cc: stable(a)vger.kernel.org Fixes: b220c049d519 ("tracing: Check length before giving out the filter buffer") Signed-off-by: Liangyan <liangyan.peng(a)linux.alibaba.com> Reviewed-by: Xunlei Pang <xlpang(a)linux.alibaba.com> Reviewed-by: yinbinbin <yinbinbin(a)alibabacloud.com> Reviewed-by: Wetp Zhang <wetp.zy(a)linux.alibaba.com> Tested-by: James Wang <jnwang(a)linux.alibaba.com> Cc: Xunlei Pang <xlpang(a)linux.alibaba.com> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index a21ef9cd2aae..9299057feb56 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2736,7 +2736,7 @@ trace_event_buffer_lock_reserve(struct trace_buffer **current_rb, (entry = this_cpu_read(trace_buffered_event))) { /* Try to use the per cpu buffer first */ val = this_cpu_inc_return(trace_buffered_event_cnt); - if ((len < (PAGE_SIZE - sizeof(*entry))) && val == 1) { + if ((len < (PAGE_SIZE - sizeof(*entry) - sizeof(entry->array[0]))) && val == 1) { trace_event_setup(entry, type, trace_ctx); entry->array[0] = len; return entry; -- 2.14.4.44.g2045bb6

3 years, 9 months

4
8
0 0

[PATCHv2 1/4] clk: agilex/stratix10: remove noc_clk

by Dinh Nguyen

Early documentation had a noc_clk, but in reality, it's just the noc_free_clk. Remove the noc_clk clock and just use the noc_free_clk. Fixes: 80c6b7a0894f ("clk: socfpga: agilex: add clock driver for the Agilex platform") Cc: stable(a)vger.kernel.org Signed-off-by: Dinh Nguyen <dinguyen(a)kernel.org> --- drivers/clk/socfpga/clk-agilex.c | 32 +++++++++++++++----------------- drivers/clk/socfpga/clk-s10.c | 32 +++++++++++++++----------------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/drivers/clk/socfpga/clk-agilex.c b/drivers/clk/socfpga/clk-agilex.c index 92a6d740a799..5b8131542218 100644 --- a/drivers/clk/socfpga/clk-agilex.c +++ b/drivers/clk/socfpga/clk-agilex.c @@ -222,11 +222,9 @@ static const struct stratix10_perip_cnt_clock agilex_main_perip_cnt_clks[] = { { AGILEX_MPU_FREE_CLK, "mpu_free_clk", NULL, mpu_free_mux, ARRAY_SIZE(mpu_free_mux), 0, 0x3C, 0, 0, 0}, { AGILEX_NOC_FREE_CLK, "noc_free_clk", NULL, noc_free_mux, ARRAY_SIZE(noc_free_mux), - 0, 0x40, 0, 0, 1}, - { AGILEX_L4_SYS_FREE_CLK, "l4_sys_free_clk", "noc_free_clk", NULL, 1, 0, - 0, 4, 0, 0}, - { AGILEX_NOC_CLK, "noc_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), - 0, 0, 0, 0x30, 1}, + 0, 0x40, 0, 0, 0}, + { AGILEX_L4_SYS_FREE_CLK, "l4_sys_free_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, + 0, 4, 0x30, 1}, { AGILEX_EMAC_A_FREE_CLK, "emaca_free_clk", NULL, emaca_free_mux, ARRAY_SIZE(emaca_free_mux), 0, 0xD4, 0, 0x88, 0}, { AGILEX_EMAC_B_FREE_CLK, "emacb_free_clk", NULL, emacb_free_mux, ARRAY_SIZE(emacb_free_mux), @@ -252,24 +250,24 @@ static const struct stratix10_gate_clock agilex_gate_clks[] = { 0, 0, 0, 0, 0, 0, 4}, { AGILEX_MPU_CCU_CLK, "mpu_ccu_clk", "mpu_clk", NULL, 1, 0, 0x24, 0, 0, 0, 0, 0, 0, 2}, - { AGILEX_L4_MAIN_CLK, "l4_main_clk", "noc_clk", NULL, 1, 0, 0x24, - 1, 0x44, 0, 2, 0, 0, 0}, - { AGILEX_L4_MP_CLK, "l4_mp_clk", "noc_clk", NULL, 1, 0, 0x24, - 2, 0x44, 8, 2, 0, 0, 0}, + { AGILEX_L4_MAIN_CLK, "l4_main_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x24, + 1, 0x44, 0, 2, 0x30, 1, 0}, + { AGILEX_L4_MP_CLK, "l4_mp_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x24, + 2, 0x44, 8, 2, 0x30, 1, 0}, /* * The l4_sp_clk feeds a 100 MHz clock to various peripherals, one of them * being the SP timers, thus cannot get gated. */ - { AGILEX_L4_SP_CLK, "l4_sp_clk", "noc_clk", NULL, 1, CLK_IS_CRITICAL, 0x24, - 3, 0x44, 16, 2, 0, 0, 0}, - { AGILEX_CS_AT_CLK, "cs_at_clk", "noc_clk", NULL, 1, 0, 0x24, - 4, 0x44, 24, 2, 0, 0, 0}, - { AGILEX_CS_TRACE_CLK, "cs_trace_clk", "noc_clk", NULL, 1, 0, 0x24, - 4, 0x44, 26, 2, 0, 0, 0}, + { AGILEX_L4_SP_CLK, "l4_sp_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), CLK_IS_CRITICAL, 0x24, + 3, 0x44, 16, 2, 0x30, 1, 0}, + { AGILEX_CS_AT_CLK, "cs_at_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x24, + 4, 0x44, 24, 2, 0x30, 1, 0}, + { AGILEX_CS_TRACE_CLK, "cs_trace_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x24, + 4, 0x44, 26, 2, 0x30, 1, 0}, { AGILEX_CS_PDBG_CLK, "cs_pdbg_clk", "cs_at_clk", NULL, 1, 0, 0x24, 4, 0x44, 28, 1, 0, 0, 0}, - { AGILEX_CS_TIMER_CLK, "cs_timer_clk", "noc_clk", NULL, 1, 0, 0x24, - 5, 0, 0, 0, 0, 0, 0}, + { AGILEX_CS_TIMER_CLK, "cs_timer_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x24, + 5, 0, 0, 0, 0x30, 1, 0}, { AGILEX_S2F_USER0_CLK, "s2f_user0_clk", NULL, s2f_usr0_mux, ARRAY_SIZE(s2f_usr0_mux), 0, 0x24, 6, 0, 0, 0, 0, 0, 0}, { AGILEX_EMAC0_CLK, "emac0_clk", NULL, emac_mux, ARRAY_SIZE(emac_mux), 0, 0x7C, diff --git a/drivers/clk/socfpga/clk-s10.c b/drivers/clk/socfpga/clk-s10.c index f0bd77138ecb..0199cffe4d77 100644 --- a/drivers/clk/socfpga/clk-s10.c +++ b/drivers/clk/socfpga/clk-s10.c @@ -167,7 +167,7 @@ static const struct stratix10_perip_cnt_clock s10_main_perip_cnt_clks[] = { { STRATIX10_MPU_FREE_CLK, "mpu_free_clk", NULL, mpu_free_mux, ARRAY_SIZE(mpu_free_mux), 0, 0x48, 0, 0, 0}, { STRATIX10_NOC_FREE_CLK, "noc_free_clk", NULL, noc_free_mux, ARRAY_SIZE(noc_free_mux), - 0, 0x4C, 0, 0, 0}, + 0, 0x4C, 0, 0x3C, 1}, { STRATIX10_MAIN_EMACA_CLK, "main_emaca_clk", "main_noc_base_clk", NULL, 1, 0, 0x50, 0, 0, 0}, { STRATIX10_MAIN_EMACB_CLK, "main_emacb_clk", "main_noc_base_clk", NULL, 1, 0, @@ -200,10 +200,8 @@ static const struct stratix10_perip_cnt_clock s10_main_perip_cnt_clks[] = { 0, 0xD4, 0, 0, 0}, { STRATIX10_PERI_PSI_REF_CLK, "peri_psi_ref_clk", "peri_noc_base_clk", NULL, 1, 0, 0xD8, 0, 0, 0}, - { STRATIX10_L4_SYS_FREE_CLK, "l4_sys_free_clk", "noc_free_clk", NULL, 1, 0, - 0, 4, 0, 0}, - { STRATIX10_NOC_CLK, "noc_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), - 0, 0, 0, 0x3C, 1}, + { STRATIX10_L4_SYS_FREE_CLK, "l4_sys_free_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, + 0, 4, 0x3C, 1}, { STRATIX10_EMAC_A_FREE_CLK, "emaca_free_clk", NULL, emaca_free_mux, ARRAY_SIZE(emaca_free_mux), 0, 0, 2, 0xB0, 0}, { STRATIX10_EMAC_B_FREE_CLK, "emacb_free_clk", NULL, emacb_free_mux, ARRAY_SIZE(emacb_free_mux), @@ -227,20 +225,20 @@ static const struct stratix10_gate_clock s10_gate_clks[] = { 0, 0, 0, 0, 0, 0, 4}, { STRATIX10_MPU_L2RAM_CLK, "mpu_l2ram_clk", "mpu_clk", NULL, 1, 0, 0x30, 0, 0, 0, 0, 0, 0, 2}, - { STRATIX10_L4_MAIN_CLK, "l4_main_clk", "noc_clk", NULL, 1, 0, 0x30, - 1, 0x70, 0, 2, 0, 0, 0}, - { STRATIX10_L4_MP_CLK, "l4_mp_clk", "noc_clk", NULL, 1, 0, 0x30, - 2, 0x70, 8, 2, 0, 0, 0}, - { STRATIX10_L4_SP_CLK, "l4_sp_clk", "noc_clk", NULL, 1, CLK_IS_CRITICAL, 0x30, - 3, 0x70, 16, 2, 0, 0, 0}, - { STRATIX10_CS_AT_CLK, "cs_at_clk", "noc_clk", NULL, 1, 0, 0x30, - 4, 0x70, 24, 2, 0, 0, 0}, - { STRATIX10_CS_TRACE_CLK, "cs_trace_clk", "noc_clk", NULL, 1, 0, 0x30, - 4, 0x70, 26, 2, 0, 0, 0}, + { STRATIX10_L4_MAIN_CLK, "l4_main_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x30, + 1, 0x70, 0, 2, 0x3C, 1, 0}, + { STRATIX10_L4_MP_CLK, "l4_mp_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x30, + 2, 0x70, 8, 2, 0x3C, 1, 0}, + { STRATIX10_L4_SP_CLK, "l4_sp_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), CLK_IS_CRITICAL, 0x30, + 3, 0x70, 16, 2, 0x3C, 1, 0}, + { STRATIX10_CS_AT_CLK, "cs_at_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x30, + 4, 0x70, 24, 2, 0x3C, 1, 0}, + { STRATIX10_CS_TRACE_CLK, "cs_trace_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x30, + 4, 0x70, 26, 2, 0x3C, 1, 0}, { STRATIX10_CS_PDBG_CLK, "cs_pdbg_clk", "cs_at_clk", NULL, 1, 0, 0x30, 4, 0x70, 28, 1, 0, 0, 0}, - { STRATIX10_CS_TIMER_CLK, "cs_timer_clk", "noc_clk", NULL, 1, 0, 0x30, - 5, 0, 0, 0, 0, 0, 0}, + { STRATIX10_CS_TIMER_CLK, "cs_timer_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x30, + 5, 0, 0, 0, 0x3C, 1, 0}, { STRATIX10_S2F_USER0_CLK, "s2f_user0_clk", NULL, s2f_usr0_mux, ARRAY_SIZE(s2f_usr0_mux), 0, 0x30, 6, 0, 0, 0, 0, 0, 0}, { STRATIX10_EMAC0_CLK, "emac0_clk", NULL, emac_mux, ARRAY_SIZE(emac_mux), 0, 0xA4, -- 2.25.1

3 years, 9 months

2
4
0 0

[PATCH 5.12 000/161] 5.12.10-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.12.10 release. There are 161 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 Thu, 10 Jun 2021 17:59:18 +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/v5.x/stable-review/patch-5.12.10-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.12.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.12.10-rc1 David Ahern <dsahern(a)kernel.org> neighbour: allow NUD_NOARP entries to be forced GCed Roger Pau Monne <roger.pau(a)citrix.com> xen-netback: take a reference to the RX task thread Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: missing error reporting for not selected expressions Jiashuo Liang <liangjs(a)pku.edu.cn> x86/fault: Don't send SIGSEGV twice on SEGV_PKUERR Roja Rani Yarubandi <rojay(a)codeaurora.org> i2c: qcom-geni: Suspend and resume the bus during SYSTEM_SLEEP_PM ops Maciej Falkowski <maciej.falkowski9(a)gmail.com> ARM: OMAP1: isp1301-omap: Add missing gpiod_add_lookup_table function Zenghui Yu <yuzenghui(a)huawei.com> KVM: arm64: Resolve all pending PC updates before immediate exit Marc Zyngier <maz(a)kernel.org> KVM: arm64: Commit pending PC adjustemnts before returning to userspace Vitaly Kuznetsov <vkuznets(a)redhat.com> x86/kvm: Disable all PV features on crash Vitaly Kuznetsov <vkuznets(a)redhat.com> x86/kvm: Disable kvmclock on all CPUs on shutdown Vitaly Kuznetsov <vkuznets(a)redhat.com> x86/kvm: Teardown PV features on boot CPU as well Sean Christopherson <seanjc(a)google.com> KVM: SVM: Truncate GPR value for DR and CR accesses in !64-bit mode Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dpu: always use mdp device to scale bandwidth Mina Almasry <almasrymina(a)google.com> mm, hugetlb: fix simple resv_huge_pages underflow on UFFDIO_COPY Filipe Manana <fdmanana(a)suse.com> btrfs: fix deadlock when cloning inline extents and low on available space Josef Bacik <josef(a)toxicpanda.com> btrfs: abort in rename_exchange if we fail to insert the second ref Josef Bacik <josef(a)toxicpanda.com> btrfs: fixup error handling in fixup_inode_link_counts Josef Bacik <josef(a)toxicpanda.com> btrfs: check error value from btrfs_update_inode in tree log Filipe Manana <fdmanana(a)suse.com> btrfs: fix fsync failure and transaction abort after writes to prealloc extents Josef Bacik <josef(a)toxicpanda.com> btrfs: return errors from btrfs_del_csums in cleanup_ref_head Josef Bacik <josef(a)toxicpanda.com> btrfs: fix error handling in btrfs_del_csums Josef Bacik <josef(a)toxicpanda.com> btrfs: mark ordered extent and inode with error if we fail to finish Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/kprobes: Fix validation of prefixed instructions across page boundary Borislav Petkov <bp(a)suse.de> x86/thermal: Fix LVT thermal setup for SMI delivery mode Thomas Gleixner <tglx(a)linutronix.de> x86/apic: Mark _all_ legacy interrupts when IO/APIC is missing Nirmoy Das <nirmoy.das(a)amd.com> drm/amdgpu: make sure we unpin the UVD BO Luben Tuikov <luben.tuikov(a)amd.com> drm/amdgpu: Don't query CE and UE errors Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect Nicholas Piggin <npiggin(a)gmail.com> KVM: PPC: Book3S HV: Save host FSCR in the P7/8 path Pu Wen <puwen(a)hygon.cn> x86/sev: Check SME/SEV support in CPUID first Borislav Petkov <bp(a)suse.de> dmaengine: idxd: Use cpu_feature_enabled() Thomas Gleixner <tglx(a)linutronix.de> x86/cpufeatures: Force disable X86_FEATURE_ENQCMD and remove update_pasid() James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix failure to transmit ABTS on FC link Ding Hui <dinghui(a)sangfor.com.cn> mm/page_alloc: fix counting of free pages after take off from buddy Gerald Schaefer <gerald.schaefer(a)linux.ibm.com> mm/debug_vm_pgtable: fix alignment for pmd/pud_advanced_tests() Junxiao Bi <junxiao.bi(a)oracle.com> ocfs2: fix data corruption by fallocate Mark Rutland <mark.rutland(a)arm.com> pid: take a reference when initializing `cad_pid` Marco Elver <elver(a)google.com> kfence: use TASK_IDLE when awaiting allocation Marco Elver <elver(a)google.com> kfence: maximize allocation wait timeout duration Thomas Bogendoerfer <tsbogend(a)alpha.franken.de> Revert "MIPS: make userspace mapping young by default" Phil Elwell <phil(a)raspberrypi.com> usb: dwc2: Fix build in periphal-only mode Ritesh Harjani <riteshh(a)linux.ibm.com> ext4: fix accessing uninit percpu counter variable with fast_commit Phillip Potter <phil(a)philpotter.co.uk> ext4: fix memory leak in ext4_mb_init_backend on error path. Harshad Shirwadkar <harshadshirwadkar(a)gmail.com> ext4: fix fast commit alignment issues Ye Bin <yebin10(a)huawei.com> ext4: fix bug on in ext4_es_cache_extent as ext4_split_extent_at failed Alexey Makhalov <amakhalov(a)vmware.com> ext4: fix memory leak in ext4_fill_super Marek Vasut <marex(a)denx.de> ARM: dts: imx6q-dhcom: Add PU,VDD1P1,VDD2P5 regulators Michal Vokáč <michal.vokac(a)ysoft.com> ARM: dts: imx6dl-yapp4: Fix RGMII connection to QCA8334 switch Hui Wang <hui.wang(a)canonical.com> ALSA: hda: update the power_state during the direct-complete Carlos M <carlos.marr.pz(a)gmail.com> ALSA: hda: Fix for mute key LED for HP Pavilion 15-CK0xx Takashi Iwai <tiwai(a)suse.de> ALSA: timer: Fix master timer notification Bob Peterson <rpeterso(a)redhat.com> gfs2: fix scheduling while atomic bug in glocks Ahelenia Ziemiańska <nabijaczleweli(a)nabijaczleweli.xyz> HID: multitouch: require Finger field to mark Win8 reports as MT Johan Hovold <johan(a)kernel.org> HID: magicmouse: fix NULL-deref on disconnect Johnny Chuang <johnny.chuang.emc(a)gmail.com> HID: i2c-hid: Skip ELAN power-on command after reset Pavel Skripkin <paskripkin(a)gmail.com> net: caif: fix memory leak in cfusbl_device_notify Pavel Skripkin <paskripkin(a)gmail.com> net: caif: fix memory leak in caif_device_notify Pavel Skripkin <paskripkin(a)gmail.com> net: caif: add proper error handling Pavel Skripkin <paskripkin(a)gmail.com> net: caif: added cfserl_release function Jason A. Donenfeld <Jason(a)zx2c4.com> wireguard: allowedips: free empty intermediate nodes when removing single node Jason A. Donenfeld <Jason(a)zx2c4.com> wireguard: allowedips: allocate nodes in kmem_cache Jason A. Donenfeld <Jason(a)zx2c4.com> wireguard: allowedips: remove nodes in O(1) Jason A. Donenfeld <Jason(a)zx2c4.com> wireguard: allowedips: initialize list head in selftest Jason A. Donenfeld <Jason(a)zx2c4.com> wireguard: selftests: make sure rp_filter is disabled on vethc Jason A. Donenfeld <Jason(a)zx2c4.com> wireguard: selftests: remove old conntrack kconfig value Jason A. Donenfeld <Jason(a)zx2c4.com> wireguard: use synchronize_net rather than synchronize_rcu Jason A. Donenfeld <Jason(a)zx2c4.com> wireguard: peer: allocate in kmem_cache Jason A. Donenfeld <Jason(a)zx2c4.com> wireguard: do not use -O3 Lin Ma <linma(a)zju.edu.cn> Bluetooth: use correct lock to prevent UAF of hdev object Lin Ma <linma(a)zju.edu.cn> Bluetooth: fix the erroneous flush_work() order James Zhu <James.Zhu(a)amd.com> drm/amdgpu/jpeg3: add cancel_delayed_work_sync before power gate James Zhu <James.Zhu(a)amd.com> drm/amdgpu/jpeg2.5: add cancel_delayed_work_sync before power gate James Zhu <James.Zhu(a)amd.com> drm/amdgpu/vcn3: add cancel_delayed_work_sync before power gate Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fix ltout double free on completion race Jens Axboe <axboe(a)kernel.dk> io_uring: wrap io_kiocb reference count manipulation in helpers Pavel Begunkov <asml.silence(a)gmail.com> io_uring: use better types for cflags Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fix link timeout refs Simon Ser <contact(a)emersion.fr> amdgpu: fix GEM obj leak in amdgpu_display_user_framebuffer_create Ilya Dryomov <idryomov(a)gmail.com> libceph: don't set global_id until we get an auth ticket Jisheng Zhang <jszhang(a)kernel.org> riscv: vdso: fix and clean-up Makefile Johan Hovold <johan(a)kernel.org> serial: stm32: fix threaded interrupt handling Hoang Le <hoang.h.le(a)dektech.com.au> tipc: fix unique bearer names sanity check Hoang Le <hoang.h.le(a)dektech.com.au> tipc: add extack messages for bearer/media failure Jerome Brunet <jbrunet(a)baylibre.com> arm64: meson: select COMMON_CLK Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Fix flakey idling of uarts and stop using swsup_sidle_act Geert Uytterhoeven <geert+renesas(a)glider.be> ARM: dts: imx: emcon-avari: Fix nxp,pca8574 #gpio-cells Fabio Estevam <festevam(a)gmail.com> ARM: dts: imx7d-pico: Fix the 'tuning-step' property Fabio Estevam <festevam(a)gmail.com> ARM: dts: imx7d-meerkat96: Fix the 'tuning-step' property Michael Walle <michael(a)walle.cc> arm64: dts: freescale: sl28: var1: fix RGMII clock and voltage Michael Walle <michael(a)walle.cc> arm64: dts: freescale: sl28: var4: fix RGMII clock and voltage Lucas Stach <l.stach(a)pengutronix.de> arm64: dts: zii-ultra: fix 12V_MAIN voltage Lucas Stach <l.stach(a)pengutronix.de> arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance Michael Walle <michael(a)walle.cc> arm64: dts: ls1028a: fix memory node Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Fix am335x resume hang for usb otg module Jens Wiklander <jens.wiklander(a)linaro.org> optee: use export_uuid() to copy client UUID Vignesh Raghavendra <vigneshr(a)ti.com> arm64: dts: ti: j7200-main: Mark Main NAVSS as dma-coherent Magnus Karlsson <magnus.karlsson(a)intel.com> ixgbe: add correct exception tracing for XDP Magnus Karlsson <magnus.karlsson(a)intel.com> ixgbe: optimize for XDP_REDIRECT in xsk path Magnus Karlsson <magnus.karlsson(a)intel.com> ice: add correct exception tracing for XDP Magnus Karlsson <magnus.karlsson(a)intel.com> ice: optimize for XDP_REDIRECT in xsk path Magnus Karlsson <magnus.karlsson(a)intel.com> i40e: add correct exception tracing for XDP Magnus Karlsson <magnus.karlsson(a)intel.com> i40e: optimize for XDP_REDIRECT in xsk path Rahul Lakkireddy <rahul.lakkireddy(a)chelsio.com> cxgb4: avoid link re-train during TC-MQPRIO configuration Yunjian Wang <wangyunjian(a)huawei.com> sch_htb: fix refcount leak in htb_parent_to_leaf_offload Roja Rani Yarubandi <rojay(a)codeaurora.org> i2c: qcom-geni: Add shutdown callback for i2c Dave Ertman <david.m.ertman(a)intel.com> ice: Allow all LLDP packets from PF to Tx Paul Greenwalt <paul.greenwalt(a)intel.com> ice: report supported and advertised autoneg using PHY capabilities Haiyue Wang <haiyue.wang(a)intel.com> ice: handle the VF VSI rebuild failure Brett Creeley <brett.creeley(a)intel.com> ice: Fix VFR issues for AVF drivers that expect ATQLEN cleared Brett Creeley <brett.creeley(a)intel.com> ice: Fix allowing VF to request more/less queues via virtchnl Coco Li <lixiaoyan(a)google.com> ipv6: Fix KASAN: slab-out-of-bounds Read in fib6_nh_flush_exceptions Rahul Lakkireddy <rahul.lakkireddy(a)chelsio.com> cxgb4: fix regression with HASH tc prio value update Maciej Fijalkowski <maciej.fijalkowski(a)intel.com> ice: track AF_XDP ZC enabled queues in bitmap Magnus Karlsson <magnus.karlsson(a)intel.com> ixgbevf: add correct exception tracing for XDP Magnus Karlsson <magnus.karlsson(a)intel.com> igb: add correct exception tracing for XDP Kurt Kanzenbach <kurt(a)linutronix.de> igb: Fix XDP with PTP enabled Wei Yongjun <weiyongjun1(a)huawei.com> ieee802154: fix error return code in ieee802154_llsec_getparams() Zhen Lei <thunder.leizhen(a)huawei.com> ieee802154: fix error return code in ieee802154_add_iface() Daniel Borkmann <daniel(a)iogearbox.net> bpf, lockdown, audit: Fix buggy SELinux lockdown permission checks Zhihao Cheng <chengzhihao1(a)huawei.com> drm/i915/selftests: Fix return value check in live_breadcrumbs_smoketest() Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_ct: skip expectations for confirmed conntrack Max Gurtovoy <mgurtovoy(a)nvidia.com> nvmet: fix freeing unallocated p2pmem Yevgeny Kliteynik <kliteyn(a)nvidia.com> net/mlx5: DR, Create multi-destination flow table with level less than 64 Roi Dayan <roid(a)nvidia.com> net/mlx5e: Fix adding encap rules to slow path Roi Dayan <roid(a)nvidia.com> net/mlx5e: Check for needed capability for cvlan matching Moshe Shemesh <moshe(a)nvidia.com> net/mlx5: Check firmware sync reset requested is set before trying to abort it Aya Levin <ayal(a)nvidia.com> net/mlx5e: Fix incompatible casting Maxim Mikityanskiy <maximmi(a)nvidia.com> net/tls: Fix use-after-free after the TLS device goes down and up Maxim Mikityanskiy <maximmi(a)nvidia.com> net/tls: Replace TLS_RX_SYNC_RUNNING with RCU Alexander Aring <aahringo(a)redhat.com> net: sock: fix in-kernel mark setting Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: tag_8021q: fix the VLAN IDs used for encoding sub-VLANs Li Huafei <lihuafei1(a)huawei.com> perf probe: Fix NULL pointer dereference in convert_variable_location() Erik Kaneda <erik.kaneda(a)intel.com> ACPICA: Clean up context mutex during object deletion Sagi Grimberg <sagi(a)grimberg.me> nvme-rdma: fix in-casule data send for chained sgls Paolo Abeni <pabeni(a)redhat.com> mptcp: do not reset MP_CAPABLE subflow on mapping errors Paolo Abeni <pabeni(a)redhat.com> mptcp: always parse mptcp options for MPC reqsk Paolo Abeni <pabeni(a)redhat.com> mptcp: fix sk_forward_memory corruption on retransmission Ariel Levkovich <lariel(a)nvidia.com> net/sched: act_ct: Fix ct template allocation for zone 0 Paul Blakey <paulb(a)nvidia.com> net/sched: act_ct: Offload connections with commit action Parav Pandit <parav(a)nvidia.com> devlink: Correct VIRTUAL port to not have phys_port attributes Javier Martinez Canillas <javierm(a)redhat.com> kbuild: Quote OBJCOPY var to avoid a pahole call break the build Arnd Bergmann <arnd(a)arndb.de> HID: i2c-hid: fix format string mismatch Basavaraj Natikar <Basavaraj.Natikar(a)amd.com> HID: amd_sfh: Fix memory leak in amd_sfh_work Zhen Lei <thunder.leizhen(a)huawei.com> HID: pidff: fix error return code in hid_pidff_init() Tom Rix <trix(a)redhat.com> HID: logitech-hidpp: initialize level variable Julian Anastasov <ja(a)ssi.bg> ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service Max Gurtovoy <mgurtovoy(a)nvidia.com> vfio/platform: fix module_put call in error flow Wei Yongjun <weiyongjun1(a)huawei.com> samples: vfio-mdev: fix error handing in mdpy_fb_probe() Randy Dunlap <rdunlap(a)infradead.org> vfio/pci: zap_vma_ptes() needs MMU Zhen Lei <thunder.leizhen(a)huawei.com> vfio/pci: Fix error return code in vfio_ecap_init() Rasmus Villemoes <linux(a)rasmusvillemoes.dk> efi: cper: fix snprintf() use in cper_dimm_err_location() Dan Carpenter <dan.carpenter(a)oracle.com> efi/libstub: prevent read overflow in find_file_option() Heiner Kallweit <hkallweit1(a)gmail.com> efi: Allow EFI_MEMORY_XP and EFI_MEMORY_RO both to be cleared Changbin Du <changbin.du(a)intel.com> efi/fdt: fix panic when no valid fdt found Florian Westphal <fw(a)strlen.de> netfilter: conntrack: unregister ipv4 sockopts on error unwind Grant Peltier <grantpeltier93(a)gmail.com> hwmon: (pmbus/isl68137) remove READ_TEMPERATURE_3 for RAA228228 Armin Wolf <W_Armin(a)gmx.de> hwmon: (dell-smm-hwmon) Fix index values Lorenzo Bianconi <lorenzo(a)kernel.org> mt76: mt76x0e: fix device hang during suspend/resume Lorenzo Bianconi <lorenzo(a)kernel.org> mt76: mt7921: fix possible AOOB issue in mt7921_mcu_tx_rate_report Lorenzo Bianconi <lorenzo(a)kernel.org> mt76: mt7921: add rcu section in mt7921_mcu_tx_rate_report ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 6 +- arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 12 ++ arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi | 2 +- arch/arm/boot/dts/imx7d-meerkat96.dts | 2 +- arch/arm/boot/dts/imx7d-pico.dtsi | 2 +- arch/arm/mach-omap1/board-h2.c | 4 +- arch/arm64/Kconfig.platforms | 1 + .../freescale/fsl-ls1028a-kontron-sl28-var1.dts | 3 +- .../freescale/fsl-ls1028a-kontron-sl28-var4.dts | 5 +- arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 4 +- .../boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts | 10 +- .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 23 +-- arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 2 + arch/arm64/include/asm/kvm_asm.h | 1 + arch/arm64/kvm/arm.c | 20 ++- arch/arm64/kvm/hyp/exception.c | 4 +- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 8 + arch/mips/mm/cache.c | 30 ++-- arch/powerpc/kernel/kprobes.c | 4 +- arch/powerpc/kvm/book3s_hv.c | 1 - arch/powerpc/kvm/book3s_hv_rmhandlers.S | 7 + arch/riscv/kernel/vdso/Makefile | 4 +- arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/disabled-features.h | 7 +- arch/x86/include/asm/fpu/api.h | 6 +- arch/x86/include/asm/fpu/internal.h | 7 - arch/x86/include/asm/kvm_para.h | 10 +- arch/x86/include/asm/thermal.h | 4 +- arch/x86/kernel/apic/apic.c | 1 + arch/x86/kernel/apic/vector.c | 20 +++ arch/x86/kernel/fpu/xstate.c | 57 ------- arch/x86/kernel/kvm.c | 92 +++++++--- arch/x86/kernel/kvmclock.c | 26 +-- arch/x86/kernel/setup.c | 9 + arch/x86/kvm/svm/svm.c | 8 +- arch/x86/mm/fault.c | 4 +- arch/x86/mm/mem_encrypt_identity.c | 11 +- drivers/acpi/acpica/utdelete.c | 8 + drivers/bus/ti-sysc.c | 57 ++++++- drivers/dma/idxd/init.c | 4 +- drivers/firmware/efi/cper.c | 4 +- drivers/firmware/efi/fdtparams.c | 3 + drivers/firmware/efi/libstub/file.c | 2 +- drivers/firmware/efi/memattr.c | 5 - drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 16 -- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 1 + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 4 +- drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 1 + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 5 +- drivers/gpu/drm/i915/selftests/i915_request.c | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 51 +----- drivers/hid/amd-sfh-hid/amd_sfh_client.c | 1 + drivers/hid/hid-logitech-hidpp.c | 1 + drivers/hid/hid-magicmouse.c | 2 +- drivers/hid/hid-multitouch.c | 10 +- drivers/hid/i2c-hid/i2c-hid-core.c | 13 +- drivers/hid/usbhid/hid-pidff.c | 1 + drivers/hwmon/dell-smm-hwmon.c | 4 +- drivers/hwmon/pmbus/isl68137.c | 4 +- drivers/i2c/busses/i2c-qcom-geni.c | 21 ++- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 - drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 +- .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 14 +- .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c | 9 +- drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 7 +- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 15 +- drivers/net/ethernet/intel/ice/ice.h | 8 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 51 +----- drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 1 + drivers/net/ethernet/intel/ice/ice_lib.c | 12 ++ drivers/net/ethernet/intel/ice/ice_txrx.c | 17 +- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 19 ++- drivers/net/ethernet/intel/ice/ice_xsk.c | 19 ++- drivers/net/ethernet/intel/igb/igb.h | 2 +- drivers/net/ethernet/intel/igb/igb_main.c | 55 +++--- drivers/net/ethernet/intel/igb/igb_ptp.c | 23 ++- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 16 +- drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 21 ++- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 3 + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 9 + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 3 + .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 2 +- .../ethernet/mellanox/mlx5/core/lib/fs_chains.h | 5 + .../ethernet/mellanox/mlx5/core/steering/dr_fw.c | 3 +- drivers/net/wireguard/Makefile | 3 +- drivers/net/wireguard/allowedips.c | 189 +++++++++++---------- drivers/net/wireguard/allowedips.h | 14 +- drivers/net/wireguard/main.c | 17 +- drivers/net/wireguard/peer.c | 27 ++- drivers/net/wireguard/peer.h | 3 + drivers/net/wireguard/selftest/allowedips.c | 165 +++++++++--------- drivers/net/wireguard/socket.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 81 ++++++++- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 24 ++- drivers/net/xen-netback/interface.c | 6 + drivers/nvme/host/rdma.c | 5 +- drivers/nvme/target/core.c | 33 ++-- drivers/scsi/lpfc/lpfc_sli.c | 4 +- drivers/tee/optee/call.c | 6 +- drivers/tee/optee/optee_msg.h | 6 +- drivers/thermal/intel/therm_throt.c | 15 +- drivers/tty/serial/stm32-usart.c | 22 +-- drivers/usb/dwc2/core_intr.c | 4 + drivers/vfio/pci/Kconfig | 1 + drivers/vfio/pci/vfio_pci_config.c | 2 +- drivers/vfio/platform/vfio_platform_common.c | 2 +- fs/btrfs/extent-tree.c | 2 +- fs/btrfs/file-item.c | 108 +++++++++--- fs/btrfs/inode.c | 19 ++- fs/btrfs/reflink.c | 38 +++-- fs/btrfs/tree-log.c | 21 ++- fs/ext4/extents.c | 43 ++--- fs/ext4/fast_commit.c | 170 +++++++++--------- fs/ext4/fast_commit.h | 19 --- fs/ext4/ialloc.c | 6 +- fs/ext4/mballoc.c | 2 +- fs/ext4/super.c | 11 +- fs/gfs2/glock.c | 2 + fs/io_uring.c | 66 ++++--- fs/ocfs2/file.c | 55 +++++- include/linux/mlx5/mlx5_ifc.h | 2 + include/linux/pgtable.h | 8 + include/linux/platform_data/ti-sysc.h | 1 + include/net/caif/caif_dev.h | 2 +- include/net/caif/cfcnfg.h | 2 +- include/net/caif/cfserl.h | 1 + include/net/tls.h | 10 +- init/main.c | 2 +- kernel/bpf/helpers.c | 7 +- kernel/trace/bpf_trace.c | 32 ++-- mm/debug_vm_pgtable.c | 4 +- mm/hugetlb.c | 14 +- mm/kfence/core.c | 12 +- mm/memory.c | 4 + mm/page_alloc.c | 2 + net/bluetooth/hci_core.c | 7 +- net/bluetooth/hci_sock.c | 4 +- net/caif/caif_dev.c | 13 +- net/caif/caif_usb.c | 14 +- net/caif/cfcnfg.c | 16 +- net/caif/cfserl.c | 5 + net/ceph/auth.c | 36 ++-- net/core/devlink.c | 4 +- net/core/neighbour.c | 1 + net/core/sock.c | 16 +- net/dsa/tag_8021q.c | 2 +- net/ieee802154/nl-mac.c | 4 +- net/ieee802154/nl-phy.c | 4 +- net/ipv6/route.c | 8 +- net/mptcp/protocol.c | 16 +- net/mptcp/subflow.c | 76 ++++----- net/netfilter/ipvs/ip_vs_ctl.c | 2 +- net/netfilter/nf_conntrack_proto.c | 2 +- net/netfilter/nf_tables_api.c | 4 +- net/netfilter/nfnetlink_cthelper.c | 8 +- net/netfilter/nft_ct.c | 2 +- net/nfc/llcp_sock.c | 2 + net/sched/act_ct.c | 10 +- net/sched/sch_htb.c | 8 +- net/tipc/bearer.c | 94 +++++++--- net/tls/tls_device.c | 60 +++++-- net/tls/tls_device_fallback.c | 7 + net/tls/tls_main.c | 1 + samples/vfio-mdev/mdpy-fb.c | 13 +- scripts/Makefile.modfinal | 2 +- scripts/link-vmlinux.sh | 2 +- sound/core/timer.c | 3 +- sound/pci/hda/hda_codec.c | 5 + sound/pci/hda/patch_realtek.c | 1 + tools/perf/util/dwarf-aux.c | 8 +- tools/perf/util/probe-finder.c | 3 + tools/testing/selftests/wireguard/netns.sh | 1 + .../testing/selftests/wireguard/qemu/kernel.config | 1 - 179 files changed, 1677 insertions(+), 1069 deletions(-)

3 years, 9 months

10
171
0 0

[PATCH] ARCv2: save ABI registers across signal handling

by Vineet Gupta

ARCv2 has some configuration dependent registers (r30, r58, r59) which could be targetted by the compiler. To keep the ABI stable, these were unconditionally part of the glibc ABI (sysdeps/unix/sysv/linux/arc/sys/ucontext.h:mcontext_t) however we missed populating them (by saving/restoring them across signal handling). This patch fixes the issue by - adding arcv2 ABI regs to kernel struct sigcontext - populating them during signal handling Change to struct sigcontext might seem like a glibc ABI change (although it primarily uses ucontext_t:mcontext_t) but the fact is - it has only been extended (existing fields are not touched) - the old sigcontext was ABI incomplete to begin with anyways Fixes: https://github.com/foss-for-synopsys-dwc-arc-processors/linux/issues/53 Cc: <stable(a)vger.kernel.org> Reported-by: Vladimir Isaev <isaev(a)synopsys.com> Signed-off-by: Vineet Gupta <vgupta(a)synopsys.com> --- arch/arc/include/uapi/asm/sigcontext.h | 1 + arch/arc/kernel/signal.c | 29 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/arch/arc/include/uapi/asm/sigcontext.h b/arch/arc/include/uapi/asm/sigcontext.h index 95f8a4380e11..7a5449dfcb29 100644 --- a/arch/arc/include/uapi/asm/sigcontext.h +++ b/arch/arc/include/uapi/asm/sigcontext.h @@ -18,6 +18,7 @@ */ struct sigcontext { struct user_regs_struct regs; + struct user_regs_arcv2 v2abi; }; #endif /* _ASM_ARC_SIGCONTEXT_H */ diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c index b3ccb9e5ffe4..534b3d9bafc8 100644 --- a/arch/arc/kernel/signal.c +++ b/arch/arc/kernel/signal.c @@ -94,6 +94,21 @@ stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs, err = __copy_to_user(&(sf->uc.uc_mcontext.regs.scratch), &uregs.scratch, sizeof(sf->uc.uc_mcontext.regs.scratch)); + + if (is_isa_arcv2()) { + struct user_regs_arcv2 v2abi; + + v2abi.r30 = regs->r30; +#ifdef CONFIG_ARC_HAS_ACCL_REGS + v2abi.r58 = regs->r58; + v2abi.r59 = regs->r59; +#else + v2abi.r58 = v2abi.r59 = 0; +#endif + err |= __copy_to_user(&(sf->uc.uc_mcontext.v2abi), &v2abi, + sizeof(sf->uc.uc_mcontext.v2abi)); + } + err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t)); return err ? -EFAULT : 0; @@ -109,6 +124,20 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf) err |= __copy_from_user(&uregs.scratch, &(sf->uc.uc_mcontext.regs.scratch), sizeof(sf->uc.uc_mcontext.regs.scratch)); + + if (is_isa_arcv2()) { + struct user_regs_arcv2 v2abi; + + err |= __copy_from_user(&v2abi, &(sf->uc.uc_mcontext.v2abi), + sizeof(sf->uc.uc_mcontext.v2abi)); + + regs->r30 = v2abi.r30; +#ifdef CONFIG_ARC_HAS_ACCL_REGS + regs->r58 = v2abi.r58; + regs->r59 = v2abi.r59; +#endif + } + if (err) return -EFAULT; -- 2.25.1

3 years, 9 months

1
0
0 0

[PATCH 1/4] clk: agilex/stratix10: remove noc_clk

by Dinh Nguyen

Early documentation had a noc_clk, but in reality, it's just the noc_free_clk. Remove the noc_clk clock and just use the noc_free_clk. Fixes: 80c6b7a0894f ("clk: socfpga: agilex: add clock driver for the Agilex platform") Signed-off-by: Dinh Nguyen <dinguyen(a)kernel.org> --- drivers/clk/socfpga/clk-agilex.c | 32 +++++++++++++++----------------- drivers/clk/socfpga/clk-s10.c | 32 +++++++++++++++----------------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/drivers/clk/socfpga/clk-agilex.c b/drivers/clk/socfpga/clk-agilex.c index 92a6d740a799..5b8131542218 100644 --- a/drivers/clk/socfpga/clk-agilex.c +++ b/drivers/clk/socfpga/clk-agilex.c @@ -222,11 +222,9 @@ static const struct stratix10_perip_cnt_clock agilex_main_perip_cnt_clks[] = { { AGILEX_MPU_FREE_CLK, "mpu_free_clk", NULL, mpu_free_mux, ARRAY_SIZE(mpu_free_mux), 0, 0x3C, 0, 0, 0}, { AGILEX_NOC_FREE_CLK, "noc_free_clk", NULL, noc_free_mux, ARRAY_SIZE(noc_free_mux), - 0, 0x40, 0, 0, 1}, - { AGILEX_L4_SYS_FREE_CLK, "l4_sys_free_clk", "noc_free_clk", NULL, 1, 0, - 0, 4, 0, 0}, - { AGILEX_NOC_CLK, "noc_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), - 0, 0, 0, 0x30, 1}, + 0, 0x40, 0, 0, 0}, + { AGILEX_L4_SYS_FREE_CLK, "l4_sys_free_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, + 0, 4, 0x30, 1}, { AGILEX_EMAC_A_FREE_CLK, "emaca_free_clk", NULL, emaca_free_mux, ARRAY_SIZE(emaca_free_mux), 0, 0xD4, 0, 0x88, 0}, { AGILEX_EMAC_B_FREE_CLK, "emacb_free_clk", NULL, emacb_free_mux, ARRAY_SIZE(emacb_free_mux), @@ -252,24 +250,24 @@ static const struct stratix10_gate_clock agilex_gate_clks[] = { 0, 0, 0, 0, 0, 0, 4}, { AGILEX_MPU_CCU_CLK, "mpu_ccu_clk", "mpu_clk", NULL, 1, 0, 0x24, 0, 0, 0, 0, 0, 0, 2}, - { AGILEX_L4_MAIN_CLK, "l4_main_clk", "noc_clk", NULL, 1, 0, 0x24, - 1, 0x44, 0, 2, 0, 0, 0}, - { AGILEX_L4_MP_CLK, "l4_mp_clk", "noc_clk", NULL, 1, 0, 0x24, - 2, 0x44, 8, 2, 0, 0, 0}, + { AGILEX_L4_MAIN_CLK, "l4_main_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x24, + 1, 0x44, 0, 2, 0x30, 1, 0}, + { AGILEX_L4_MP_CLK, "l4_mp_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x24, + 2, 0x44, 8, 2, 0x30, 1, 0}, /* * The l4_sp_clk feeds a 100 MHz clock to various peripherals, one of them * being the SP timers, thus cannot get gated. */ - { AGILEX_L4_SP_CLK, "l4_sp_clk", "noc_clk", NULL, 1, CLK_IS_CRITICAL, 0x24, - 3, 0x44, 16, 2, 0, 0, 0}, - { AGILEX_CS_AT_CLK, "cs_at_clk", "noc_clk", NULL, 1, 0, 0x24, - 4, 0x44, 24, 2, 0, 0, 0}, - { AGILEX_CS_TRACE_CLK, "cs_trace_clk", "noc_clk", NULL, 1, 0, 0x24, - 4, 0x44, 26, 2, 0, 0, 0}, + { AGILEX_L4_SP_CLK, "l4_sp_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), CLK_IS_CRITICAL, 0x24, + 3, 0x44, 16, 2, 0x30, 1, 0}, + { AGILEX_CS_AT_CLK, "cs_at_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x24, + 4, 0x44, 24, 2, 0x30, 1, 0}, + { AGILEX_CS_TRACE_CLK, "cs_trace_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x24, + 4, 0x44, 26, 2, 0x30, 1, 0}, { AGILEX_CS_PDBG_CLK, "cs_pdbg_clk", "cs_at_clk", NULL, 1, 0, 0x24, 4, 0x44, 28, 1, 0, 0, 0}, - { AGILEX_CS_TIMER_CLK, "cs_timer_clk", "noc_clk", NULL, 1, 0, 0x24, - 5, 0, 0, 0, 0, 0, 0}, + { AGILEX_CS_TIMER_CLK, "cs_timer_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x24, + 5, 0, 0, 0, 0x30, 1, 0}, { AGILEX_S2F_USER0_CLK, "s2f_user0_clk", NULL, s2f_usr0_mux, ARRAY_SIZE(s2f_usr0_mux), 0, 0x24, 6, 0, 0, 0, 0, 0, 0}, { AGILEX_EMAC0_CLK, "emac0_clk", NULL, emac_mux, ARRAY_SIZE(emac_mux), 0, 0x7C, diff --git a/drivers/clk/socfpga/clk-s10.c b/drivers/clk/socfpga/clk-s10.c index f0bd77138ecb..0199cffe4d77 100644 --- a/drivers/clk/socfpga/clk-s10.c +++ b/drivers/clk/socfpga/clk-s10.c @@ -167,7 +167,7 @@ static const struct stratix10_perip_cnt_clock s10_main_perip_cnt_clks[] = { { STRATIX10_MPU_FREE_CLK, "mpu_free_clk", NULL, mpu_free_mux, ARRAY_SIZE(mpu_free_mux), 0, 0x48, 0, 0, 0}, { STRATIX10_NOC_FREE_CLK, "noc_free_clk", NULL, noc_free_mux, ARRAY_SIZE(noc_free_mux), - 0, 0x4C, 0, 0, 0}, + 0, 0x4C, 0, 0x3C, 1}, { STRATIX10_MAIN_EMACA_CLK, "main_emaca_clk", "main_noc_base_clk", NULL, 1, 0, 0x50, 0, 0, 0}, { STRATIX10_MAIN_EMACB_CLK, "main_emacb_clk", "main_noc_base_clk", NULL, 1, 0, @@ -200,10 +200,8 @@ static const struct stratix10_perip_cnt_clock s10_main_perip_cnt_clks[] = { 0, 0xD4, 0, 0, 0}, { STRATIX10_PERI_PSI_REF_CLK, "peri_psi_ref_clk", "peri_noc_base_clk", NULL, 1, 0, 0xD8, 0, 0, 0}, - { STRATIX10_L4_SYS_FREE_CLK, "l4_sys_free_clk", "noc_free_clk", NULL, 1, 0, - 0, 4, 0, 0}, - { STRATIX10_NOC_CLK, "noc_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), - 0, 0, 0, 0x3C, 1}, + { STRATIX10_L4_SYS_FREE_CLK, "l4_sys_free_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, + 0, 4, 0x3C, 1}, { STRATIX10_EMAC_A_FREE_CLK, "emaca_free_clk", NULL, emaca_free_mux, ARRAY_SIZE(emaca_free_mux), 0, 0, 2, 0xB0, 0}, { STRATIX10_EMAC_B_FREE_CLK, "emacb_free_clk", NULL, emacb_free_mux, ARRAY_SIZE(emacb_free_mux), @@ -227,20 +225,20 @@ static const struct stratix10_gate_clock s10_gate_clks[] = { 0, 0, 0, 0, 0, 0, 4}, { STRATIX10_MPU_L2RAM_CLK, "mpu_l2ram_clk", "mpu_clk", NULL, 1, 0, 0x30, 0, 0, 0, 0, 0, 0, 2}, - { STRATIX10_L4_MAIN_CLK, "l4_main_clk", "noc_clk", NULL, 1, 0, 0x30, - 1, 0x70, 0, 2, 0, 0, 0}, - { STRATIX10_L4_MP_CLK, "l4_mp_clk", "noc_clk", NULL, 1, 0, 0x30, - 2, 0x70, 8, 2, 0, 0, 0}, - { STRATIX10_L4_SP_CLK, "l4_sp_clk", "noc_clk", NULL, 1, CLK_IS_CRITICAL, 0x30, - 3, 0x70, 16, 2, 0, 0, 0}, - { STRATIX10_CS_AT_CLK, "cs_at_clk", "noc_clk", NULL, 1, 0, 0x30, - 4, 0x70, 24, 2, 0, 0, 0}, - { STRATIX10_CS_TRACE_CLK, "cs_trace_clk", "noc_clk", NULL, 1, 0, 0x30, - 4, 0x70, 26, 2, 0, 0, 0}, + { STRATIX10_L4_MAIN_CLK, "l4_main_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x30, + 1, 0x70, 0, 2, 0x3C, 1, 0}, + { STRATIX10_L4_MP_CLK, "l4_mp_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x30, + 2, 0x70, 8, 2, 0x3C, 1, 0}, + { STRATIX10_L4_SP_CLK, "l4_sp_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), CLK_IS_CRITICAL, 0x30, + 3, 0x70, 16, 2, 0x3C, 1, 0}, + { STRATIX10_CS_AT_CLK, "cs_at_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x30, + 4, 0x70, 24, 2, 0x3C, 1, 0}, + { STRATIX10_CS_TRACE_CLK, "cs_trace_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x30, + 4, 0x70, 26, 2, 0x3C, 1, 0}, { STRATIX10_CS_PDBG_CLK, "cs_pdbg_clk", "cs_at_clk", NULL, 1, 0, 0x30, 4, 0x70, 28, 1, 0, 0, 0}, - { STRATIX10_CS_TIMER_CLK, "cs_timer_clk", "noc_clk", NULL, 1, 0, 0x30, - 5, 0, 0, 0, 0, 0, 0}, + { STRATIX10_CS_TIMER_CLK, "cs_timer_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), 0, 0x30, + 5, 0, 0, 0, 0x3C, 1, 0}, { STRATIX10_S2F_USER0_CLK, "s2f_user0_clk", NULL, s2f_usr0_mux, ARRAY_SIZE(s2f_usr0_mux), 0, 0x30, 6, 0, 0, 0, 0, 0, 0}, { STRATIX10_EMAC0_CLK, "emac0_clk", NULL, emac_mux, ARRAY_SIZE(emac_mux), 0, 0xA4, -- 2.25.1

3 years, 9 months

2
7
0 0

[PATCH v3] tpm: Replace WARN_ONCE() with dev_err_once() in tpm_tis_status()

by Jarkko Sakkinen

Do not tear down the system when getting invalid status from a TPM chip. This can happen when panic-on-warn is used. Instead, introduce TPM_TIS_INVALID_STATUS bitflag and use it to trigger once the error reporting per chip. In addition, print out the value of TPM_STS for improved forensics. Link: https://lore.kernel.org/keyrings/YKzlTR1AzUigShtZ@kroah.com/ Fixes: 55707d531af6 ("tpm_tis: Add a check for invalid status") Cc: stable(a)vger.kernel.org Cc: Hans de Goede <hdegoede(a)redhat.com> Cc: Greg KH <greg(a)kroah.com> Signed-off-by: Jarkko Sakkinen <jarkko(a)kernel.org> --- v3: * torn -> tear * A per chip flag TPM_TIS_INVALID_STATUS. v2: Dump also stack only once. drivers/char/tpm/tpm_tis_core.c | 25 ++++++++++++++++++------- drivers/char/tpm/tpm_tis_core.h | 3 ++- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index 55b9d3965ae1..69579efb247b 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -196,13 +196,24 @@ static u8 tpm_tis_status(struct tpm_chip *chip) return 0; if (unlikely((status & TPM_STS_READ_ZERO) != 0)) { - /* - * If this trips, the chances are the read is - * returning 0xff because the locality hasn't been - * acquired. Usually because tpm_try_get_ops() hasn't - * been called before doing a TPM operation. - */ - WARN_ONCE(1, "TPM returned invalid status\n"); + if (!test_and_set_bit(TPM_TIS_INVALID_STATUS, &priv->flags)) { + /* + * If this trips, the chances are the read is + * returning 0xff because the locality hasn't been + * acquired. Usually because tpm_try_get_ops() hasn't + * been called before doing a TPM operation. + */ + dev_err(&chip->dev, "invalid TPM_STS.x 0x%02x, dumping stack for forensics\n", + status); + + /* + * Dump stack for forensics, as invalid TPM_STS.x could be + * potentially triggered by impaired tpm_try_get_ops() or + * tpm_find_get_ops(). + */ + dump_stack(); + } + return 0; } diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h index 9b2d32a59f67..b2a3c6c72882 100644 --- a/drivers/char/tpm/tpm_tis_core.h +++ b/drivers/char/tpm/tpm_tis_core.h @@ -83,6 +83,7 @@ enum tis_defaults { enum tpm_tis_flags { TPM_TIS_ITPM_WORKAROUND = BIT(0), + TPM_TIS_INVALID_STATUS = BIT(1), }; struct tpm_tis_data { @@ -90,7 +91,7 @@ struct tpm_tis_data { int locality; int irq; bool irq_tested; - unsigned int flags; + unsigned long flags; void __iomem *ilb_base_addr; u16 clkrun_enabled; wait_queue_head_t int_queue; -- 2.31.1

3 years, 9 months

2
1
0 0

[PATCH 4.14 00/47] 4.14.236-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.236 release. There are 47 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 Thu, 10 Jun 2021 17:59:18 +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/v4.x/stable-review/patch-4.14.236-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.236-rc1 Jan Beulich <jbeulich(a)suse.com> xen-pciback: redo VF placement in the virtual topology Cheng Jian <cj.chengjian(a)huawei.com> sched/fair: Optimize select_idle_cpu Sean Christopherson <seanjc(a)google.com> KVM: SVM: Truncate GPR value for DR and CR accesses in !64-bit mode Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Remove the setting of dev_port. Daniel Borkmann <daniel(a)iogearbox.net> bpf: No need to simulate speculative domain for immediates Daniel Borkmann <daniel(a)iogearbox.net> bpf: Fix mask direction swap upon off reg sign change Daniel Borkmann <daniel(a)iogearbox.net> bpf: Wrap aux data inside bpf_sanitize_info container Daniel Borkmann <daniel(a)iogearbox.net> bpf: Fix leakage of uninitialized bpf stack under speculation Alexei Starovoitov <ast(a)kernel.org> selftests/bpf: make 'dubious pointer arithmetic' test useful Alexei Starovoitov <ast(a)fb.com> selftests/bpf: fix test_align Alexei Starovoitov <ast(a)kernel.org> bpf/verifier: disallow pointer subtraction Alexei Starovoitov <ast(a)kernel.org> bpf: do not allow root to mangle valid pointers Daniel Borkmann <daniel(a)iogearbox.net> bpf: Update selftests to reflect new error states Daniel Borkmann <daniel(a)iogearbox.net> bpf: Tighten speculative pointer arithmetic mask Daniel Borkmann <daniel(a)iogearbox.net> bpf: Move sanitize_val_alu out of op switch Daniel Borkmann <daniel(a)iogearbox.net> bpf: Refactor and streamline bounds check into helper Daniel Borkmann <daniel(a)iogearbox.net> bpf: Improve verifier error messages for users Daniel Borkmann <daniel(a)iogearbox.net> bpf: Rework ptr_limit into alu_limit and add common error path Daniel Borkmann <daniel(a)iogearbox.net> bpf: Ensure off_reg has no mixed signed bounds for all types Daniel Borkmann <daniel(a)iogearbox.net> bpf: Move off_reg into sanitize_ptr_alu Piotr Krysiuk <piotras(a)gmail.com> bpf, selftests: Fix up some test_verifier cases for unprivileged Mina Almasry <almasrymina(a)google.com> mm, hugetlb: fix simple resv_huge_pages underflow on UFFDIO_COPY Josef Bacik <josef(a)toxicpanda.com> btrfs: fixup error handling in fixup_inode_link_counts Josef Bacik <josef(a)toxicpanda.com> btrfs: fix error handling in btrfs_del_csums Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect Junxiao Bi <junxiao.bi(a)oracle.com> ocfs2: fix data corruption by fallocate Mark Rutland <mark.rutland(a)arm.com> pid: take a reference when initializing `cad_pid` Ye Bin <yebin10(a)huawei.com> ext4: fix bug on in ext4_es_cache_extent as ext4_split_extent_at failed Takashi Iwai <tiwai(a)suse.de> ALSA: timer: Fix master timer notification Pavel Skripkin <paskripkin(a)gmail.com> net: caif: fix memory leak in cfusbl_device_notify Pavel Skripkin <paskripkin(a)gmail.com> net: caif: fix memory leak in caif_device_notify Pavel Skripkin <paskripkin(a)gmail.com> net: caif: add proper error handling Pavel Skripkin <paskripkin(a)gmail.com> net: caif: added cfserl_release function Lin Ma <linma(a)zju.edu.cn> Bluetooth: use correct lock to prevent UAF of hdev object Lin Ma <linma(a)zju.edu.cn> Bluetooth: fix the erroneous flush_work() order Wei Yongjun <weiyongjun1(a)huawei.com> ieee802154: fix error return code in ieee802154_llsec_getparams() Zhen Lei <thunder.leizhen(a)huawei.com> ieee802154: fix error return code in ieee802154_add_iface() Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches Arnd Bergmann <arnd(a)arndb.de> HID: i2c-hid: fix format string mismatch Zhen Lei <thunder.leizhen(a)huawei.com> HID: pidff: fix error return code in hid_pidff_init() Julian Anastasov <ja(a)ssi.bg> ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service Max Gurtovoy <mgurtovoy(a)nvidia.com> vfio/platform: fix module_put call in error flow Randy Dunlap <rdunlap(a)infradead.org> vfio/pci: zap_vma_ptes() needs MMU Zhen Lei <thunder.leizhen(a)huawei.com> vfio/pci: Fix error return code in vfio_ecap_init() Rasmus Villemoes <linux(a)rasmusvillemoes.dk> efi: cper: fix snprintf() use in cper_dimm_err_location() Heiner Kallweit <hkallweit1(a)gmail.com> efi: Allow EFI_MEMORY_XP and EFI_MEMORY_RO both to be cleared Grant Grundler <grundler(a)chromium.org> net: usb: cdc_ncm: don't spew notifications ------------- Diffstat: Makefile | 4 +- arch/x86/kvm/svm.c | 8 +- drivers/firmware/efi/cper.c | 4 +- drivers/firmware/efi/memattr.c | 5 - drivers/hid/i2c-hid/i2c-hid-core.c | 4 +- drivers/hid/usbhid/hid-pidff.c | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 - drivers/net/usb/cdc_ncm.c | 12 +- drivers/vfio/pci/Kconfig | 1 + drivers/vfio/pci/vfio_pci_config.c | 2 +- drivers/vfio/platform/vfio_platform_common.c | 2 +- drivers/xen/xen-pciback/vpci.c | 14 +- fs/btrfs/file-item.c | 10 +- fs/btrfs/tree-log.c | 13 +- fs/ext4/extents.c | 43 ++-- fs/ocfs2/file.c | 55 +++- include/linux/bpf_verifier.h | 5 +- include/linux/usb/usbnet.h | 2 + include/net/caif/caif_dev.h | 2 +- include/net/caif/cfcnfg.h | 2 +- include/net/caif/cfserl.h | 1 + init/main.c | 2 +- kernel/bpf/verifier.c | 369 ++++++++++++++++----------- kernel/sched/fair.c | 7 +- mm/hugetlb.c | 14 +- net/bluetooth/hci_core.c | 7 +- net/bluetooth/hci_sock.c | 4 +- net/caif/caif_dev.c | 13 +- net/caif/caif_usb.c | 14 +- net/caif/cfcnfg.c | 16 +- net/caif/cfserl.c | 5 + net/ieee802154/nl-mac.c | 4 +- net/ieee802154/nl-phy.c | 4 +- net/netfilter/ipvs/ip_vs_ctl.c | 2 +- net/netfilter/nfnetlink_cthelper.c | 8 +- net/nfc/llcp_sock.c | 2 + sound/core/timer.c | 3 +- tools/testing/selftests/bpf/test_align.c | 26 +- tools/testing/selftests/bpf/test_verifier.c | 114 +++++---- 39 files changed, 501 insertions(+), 304 deletions(-)

3 years, 9 months

4
50
0 0

[PATCH 4.9 00/29] 4.9.272-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.272 release. There are 29 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 Thu, 10 Jun 2021 17:59:18 +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/v4.x/stable-review/patch-4.9.272-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.272-rc1 Jan Beulich <jbeulich(a)suse.com> xen-pciback: redo VF placement in the virtual topology Michael Weiser <michael.weiser(a)gmx.de> arm64: Remove unimplemented syscall log message Sean Christopherson <seanjc(a)google.com> KVM: SVM: Truncate GPR value for DR and CR accesses in !64-bit mode Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Remove the setting of dev_port. Josef Bacik <josef(a)toxicpanda.com> btrfs: fixup error handling in fixup_inode_link_counts Josef Bacik <josef(a)toxicpanda.com> btrfs: fix error handling in btrfs_del_csums Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect Junxiao Bi <junxiao.bi(a)oracle.com> ocfs2: fix data corruption by fallocate Mark Rutland <mark.rutland(a)arm.com> pid: take a reference when initializing `cad_pid` Ye Bin <yebin10(a)huawei.com> ext4: fix bug on in ext4_es_cache_extent as ext4_split_extent_at failed Takashi Iwai <tiwai(a)suse.de> ALSA: timer: Fix master timer notification Pavel Skripkin <paskripkin(a)gmail.com> net: caif: fix memory leak in cfusbl_device_notify Pavel Skripkin <paskripkin(a)gmail.com> net: caif: fix memory leak in caif_device_notify Pavel Skripkin <paskripkin(a)gmail.com> net: caif: add proper error handling Pavel Skripkin <paskripkin(a)gmail.com> net: caif: added cfserl_release function Lin Ma <linma(a)zju.edu.cn> Bluetooth: use correct lock to prevent UAF of hdev object Lin Ma <linma(a)zju.edu.cn> Bluetooth: fix the erroneous flush_work() order Wei Yongjun <weiyongjun1(a)huawei.com> ieee802154: fix error return code in ieee802154_llsec_getparams() Zhen Lei <thunder.leizhen(a)huawei.com> ieee802154: fix error return code in ieee802154_add_iface() Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches Arnd Bergmann <arnd(a)arndb.de> HID: i2c-hid: fix format string mismatch Zhen Lei <thunder.leizhen(a)huawei.com> HID: pidff: fix error return code in hid_pidff_init() Julian Anastasov <ja(a)ssi.bg> ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service Max Gurtovoy <mgurtovoy(a)nvidia.com> vfio/platform: fix module_put call in error flow Randy Dunlap <rdunlap(a)infradead.org> vfio/pci: zap_vma_ptes() needs MMU Zhen Lei <thunder.leizhen(a)huawei.com> vfio/pci: Fix error return code in vfio_ecap_init() Rasmus Villemoes <linux(a)rasmusvillemoes.dk> efi: cper: fix snprintf() use in cper_dimm_err_location() Heiner Kallweit <hkallweit1(a)gmail.com> efi: Allow EFI_MEMORY_XP and EFI_MEMORY_RO both to be cleared Grant Grundler <grundler(a)chromium.org> net: usb: cdc_ncm: don't spew notifications ------------- Diffstat: Makefile | 4 +- arch/arm64/kernel/traps.c | 8 ---- arch/x86/kvm/svm.c | 8 ++-- drivers/firmware/efi/cper.c | 4 +- drivers/firmware/efi/memattr.c | 5 --- drivers/hid/i2c-hid/i2c-hid-core.c | 4 +- drivers/hid/usbhid/hid-pidff.c | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 - drivers/net/usb/cdc_ncm.c | 12 +++++- drivers/vfio/pci/Kconfig | 1 + drivers/vfio/pci/vfio_pci_config.c | 2 +- drivers/vfio/platform/vfio_platform_common.c | 2 +- drivers/xen/xen-pciback/vpci.c | 14 ++++--- fs/btrfs/file-item.c | 10 ++--- fs/btrfs/tree-log.c | 13 ++++--- fs/ext4/extents.c | 43 ++++++++++++---------- fs/ocfs2/file.c | 55 +++++++++++++++++++++++++--- include/linux/usb/usbnet.h | 2 + include/net/caif/caif_dev.h | 2 +- include/net/caif/cfcnfg.h | 2 +- include/net/caif/cfserl.h | 1 + init/main.c | 2 +- net/bluetooth/hci_core.c | 7 +++- net/bluetooth/hci_sock.c | 4 +- net/caif/caif_dev.c | 13 +++++-- net/caif/caif_usb.c | 14 ++++++- net/caif/cfcnfg.c | 16 +++++--- net/caif/cfserl.c | 5 +++ net/ieee802154/nl-mac.c | 4 +- net/ieee802154/nl-phy.c | 4 +- net/netfilter/ipvs/ip_vs_ctl.c | 2 +- net/netfilter/nfnetlink_cthelper.c | 8 +++- net/nfc/llcp_sock.c | 2 + sound/core/timer.c | 3 +- 34 files changed, 186 insertions(+), 92 deletions(-)

3 years, 9 months

6
34
0 0

[PATCH 4.4 00/23] 4.4.272-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.4.272 release. There are 23 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 Thu, 10 Jun 2021 17:59:18 +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/v4.x/stable-review/patch-4.4.272-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.4.272-rc1 Jan Beulich <jbeulich(a)suse.com> xen-pciback: redo VF placement in the virtual topology Michael Weiser <michael.weiser(a)gmx.de> arm64: Remove unimplemented syscall log message Sean Christopherson <seanjc(a)google.com> KVM: SVM: Truncate GPR value for DR and CR accesses in !64-bit mode Josef Bacik <josef(a)toxicpanda.com> btrfs: fixup error handling in fixup_inode_link_counts Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect Junxiao Bi <junxiao.bi(a)oracle.com> ocfs2: fix data corruption by fallocate Mark Rutland <mark.rutland(a)arm.com> pid: take a reference when initializing `cad_pid` Ye Bin <yebin10(a)huawei.com> ext4: fix bug on in ext4_es_cache_extent as ext4_split_extent_at failed Takashi Iwai <tiwai(a)suse.de> ALSA: timer: Fix master timer notification Pavel Skripkin <paskripkin(a)gmail.com> net: caif: fix memory leak in cfusbl_device_notify Pavel Skripkin <paskripkin(a)gmail.com> net: caif: fix memory leak in caif_device_notify Pavel Skripkin <paskripkin(a)gmail.com> net: caif: add proper error handling Pavel Skripkin <paskripkin(a)gmail.com> net: caif: added cfserl_release function Lin Ma <linma(a)zju.edu.cn> Bluetooth: use correct lock to prevent UAF of hdev object Lin Ma <linma(a)zju.edu.cn> Bluetooth: fix the erroneous flush_work() order Wei Yongjun <weiyongjun1(a)huawei.com> ieee802154: fix error return code in ieee802154_llsec_getparams() Zhen Lei <thunder.leizhen(a)huawei.com> ieee802154: fix error return code in ieee802154_add_iface() Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches Zhen Lei <thunder.leizhen(a)huawei.com> HID: pidff: fix error return code in hid_pidff_init() Julian Anastasov <ja(a)ssi.bg> ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service Max Gurtovoy <mgurtovoy(a)nvidia.com> vfio/platform: fix module_put call in error flow Zhen Lei <thunder.leizhen(a)huawei.com> vfio/pci: Fix error return code in vfio_ecap_init() Rasmus Villemoes <linux(a)rasmusvillemoes.dk> efi: cper: fix snprintf() use in cper_dimm_err_location() ------------- Diffstat: Makefile | 4 +- arch/arm64/kernel/traps.c | 8 ---- arch/x86/kvm/svm.c | 8 ++-- drivers/firmware/efi/cper.c | 4 +- drivers/hid/usbhid/hid-pidff.c | 1 + drivers/vfio/pci/vfio_pci_config.c | 2 +- drivers/vfio/platform/vfio_platform_common.c | 2 +- drivers/xen/xen-pciback/vpci.c | 14 ++++--- fs/btrfs/tree-log.c | 13 ++++--- fs/ext4/extents.c | 43 ++++++++++++---------- fs/ocfs2/file.c | 55 +++++++++++++++++++++++++--- include/net/caif/caif_dev.h | 2 +- include/net/caif/cfcnfg.h | 2 +- include/net/caif/cfserl.h | 1 + init/main.c | 2 +- net/bluetooth/hci_core.c | 7 +++- net/bluetooth/hci_sock.c | 4 +- net/caif/caif_dev.c | 13 +++++-- net/caif/caif_usb.c | 14 ++++++- net/caif/cfcnfg.c | 16 +++++--- net/caif/cfserl.c | 5 +++ net/ieee802154/nl-mac.c | 4 +- net/ieee802154/nl-phy.c | 4 +- net/netfilter/ipvs/ip_vs_ctl.c | 2 +- net/netfilter/nfnetlink_cthelper.c | 8 +++- net/nfc/llcp_sock.c | 2 + sound/core/timer.c | 3 +- 27 files changed, 165 insertions(+), 78 deletions(-)

3 years, 9 months

6
28
0 0

patch "misc: rtsx: separate aspm mode into MODE_REG and MODE_CFG" added to char-misc-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled misc: rtsx: separate aspm mode into MODE_REG and MODE_CFG to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 3df4fce739e2b263120f528c5e0fe6b2f8937b5b Mon Sep 17 00:00:00 2001 From: Ricky Wu <ricky_wu(a)realtek.com> Date: Mon, 7 Jun 2021 18:16:34 +0800 Subject: misc: rtsx: separate aspm mode into MODE_REG and MODE_CFG aspm (Active State Power Management) rtsx_comm_set_aspm: this function is for driver to make sure not enter power saving when processing of init and card_detcct ASPM_MODE_CFG: 8411 5209 5227 5229 5249 5250 Change back to use original way to control aspm ASPM_MODE_REG: 5227A 524A 5250A 5260 5261 5228 Keep the new way to control aspm Fixes: 121e9c6b5c4c ("misc: rtsx: modify and fix init_hw function") Reported-by: Chris Chiu <chris.chiu(a)canonical.com> Tested-by: Gordon Lack <gordon.lack(a)dsl.pipex.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Ricky Wu <ricky_wu(a)realtek.com> Link: https://lore.kernel.org/r/20210607101634.4948-1-ricky_wu@realtek.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/misc/cardreader/rtl8411.c | 1 + drivers/misc/cardreader/rts5209.c | 1 + drivers/misc/cardreader/rts5227.c | 2 ++ drivers/misc/cardreader/rts5228.c | 1 + drivers/misc/cardreader/rts5229.c | 1 + drivers/misc/cardreader/rts5249.c | 3 ++ drivers/misc/cardreader/rts5260.c | 1 + drivers/misc/cardreader/rts5261.c | 1 + drivers/misc/cardreader/rtsx_pcr.c | 44 +++++++++++++++++++++--------- include/linux/rtsx_pci.h | 2 ++ 10 files changed, 44 insertions(+), 13 deletions(-) diff --git a/drivers/misc/cardreader/rtl8411.c b/drivers/misc/cardreader/rtl8411.c index a07674ed0596..4c5621b17a6f 100644 --- a/drivers/misc/cardreader/rtl8411.c +++ b/drivers/misc/cardreader/rtl8411.c @@ -468,6 +468,7 @@ static void rtl8411_init_common_params(struct rtsx_pcr *pcr) pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B; pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D; pcr->aspm_en = ASPM_L1_EN; + pcr->aspm_mode = ASPM_MODE_CFG; pcr->tx_initial_phase = SET_CLOCK_PHASE(23, 7, 14); pcr->rx_initial_phase = SET_CLOCK_PHASE(4, 3, 10); pcr->ic_version = rtl8411_get_ic_version(pcr); diff --git a/drivers/misc/cardreader/rts5209.c b/drivers/misc/cardreader/rts5209.c index 39a6a7ecc32e..29f5414072bf 100644 --- a/drivers/misc/cardreader/rts5209.c +++ b/drivers/misc/cardreader/rts5209.c @@ -255,6 +255,7 @@ void rts5209_init_params(struct rtsx_pcr *pcr) pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B; pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D; pcr->aspm_en = ASPM_L1_EN; + pcr->aspm_mode = ASPM_MODE_CFG; pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 16); pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5); diff --git a/drivers/misc/cardreader/rts5227.c b/drivers/misc/cardreader/rts5227.c index 8200af22b529..4bcfbc9afbac 100644 --- a/drivers/misc/cardreader/rts5227.c +++ b/drivers/misc/cardreader/rts5227.c @@ -358,6 +358,7 @@ void rts5227_init_params(struct rtsx_pcr *pcr) pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B; pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B; pcr->aspm_en = ASPM_L1_EN; + pcr->aspm_mode = ASPM_MODE_CFG; pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 15); pcr->rx_initial_phase = SET_CLOCK_PHASE(30, 7, 7); @@ -483,6 +484,7 @@ void rts522a_init_params(struct rtsx_pcr *pcr) rts5227_init_params(pcr); pcr->ops = &rts522a_pcr_ops; + pcr->aspm_mode = ASPM_MODE_REG; pcr->tx_initial_phase = SET_CLOCK_PHASE(20, 20, 11); pcr->reg_pm_ctrl3 = RTS522A_PM_CTRL3; diff --git a/drivers/misc/cardreader/rts5228.c b/drivers/misc/cardreader/rts5228.c index 781a86def59a..ffc128278613 100644 --- a/drivers/misc/cardreader/rts5228.c +++ b/drivers/misc/cardreader/rts5228.c @@ -718,6 +718,7 @@ void rts5228_init_params(struct rtsx_pcr *pcr) pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B; pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B; pcr->aspm_en = ASPM_L1_EN; + pcr->aspm_mode = ASPM_MODE_REG; pcr->tx_initial_phase = SET_CLOCK_PHASE(28, 27, 11); pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5); diff --git a/drivers/misc/cardreader/rts5229.c b/drivers/misc/cardreader/rts5229.c index 89e6f124ca5c..c748eaf1ec1f 100644 --- a/drivers/misc/cardreader/rts5229.c +++ b/drivers/misc/cardreader/rts5229.c @@ -246,6 +246,7 @@ void rts5229_init_params(struct rtsx_pcr *pcr) pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B; pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D; pcr->aspm_en = ASPM_L1_EN; + pcr->aspm_mode = ASPM_MODE_CFG; pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 15); pcr->rx_initial_phase = SET_CLOCK_PHASE(30, 6, 6); diff --git a/drivers/misc/cardreader/rts5249.c b/drivers/misc/cardreader/rts5249.c index b2676e7f5027..53f3a1f45c4a 100644 --- a/drivers/misc/cardreader/rts5249.c +++ b/drivers/misc/cardreader/rts5249.c @@ -566,6 +566,7 @@ void rts5249_init_params(struct rtsx_pcr *pcr) pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B; pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B; pcr->aspm_en = ASPM_L1_EN; + pcr->aspm_mode = ASPM_MODE_CFG; pcr->tx_initial_phase = SET_CLOCK_PHASE(1, 29, 16); pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5); @@ -729,6 +730,7 @@ static const struct pcr_ops rts524a_pcr_ops = { void rts524a_init_params(struct rtsx_pcr *pcr) { rts5249_init_params(pcr); + pcr->aspm_mode = ASPM_MODE_REG; pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 29, 11); pcr->option.ltr_l1off_sspwrgate = LTR_L1OFF_SSPWRGATE_5250_DEF; pcr->option.ltr_l1off_snooze_sspwrgate = @@ -845,6 +847,7 @@ static const struct pcr_ops rts525a_pcr_ops = { void rts525a_init_params(struct rtsx_pcr *pcr) { rts5249_init_params(pcr); + pcr->aspm_mode = ASPM_MODE_REG; pcr->tx_initial_phase = SET_CLOCK_PHASE(25, 29, 11); pcr->option.ltr_l1off_sspwrgate = LTR_L1OFF_SSPWRGATE_5250_DEF; pcr->option.ltr_l1off_snooze_sspwrgate = diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c index 080a7d67a8e1..9b42b20a3e5a 100644 --- a/drivers/misc/cardreader/rts5260.c +++ b/drivers/misc/cardreader/rts5260.c @@ -628,6 +628,7 @@ void rts5260_init_params(struct rtsx_pcr *pcr) pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B; pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B; pcr->aspm_en = ASPM_L1_EN; + pcr->aspm_mode = ASPM_MODE_REG; pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 29, 11); pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5); diff --git a/drivers/misc/cardreader/rts5261.c b/drivers/misc/cardreader/rts5261.c index 6c64dade8e1a..1fd4e0e50730 100644 --- a/drivers/misc/cardreader/rts5261.c +++ b/drivers/misc/cardreader/rts5261.c @@ -783,6 +783,7 @@ void rts5261_init_params(struct rtsx_pcr *pcr) pcr->sd30_drive_sel_1v8 = 0x00; pcr->sd30_drive_sel_3v3 = 0x00; pcr->aspm_en = ASPM_L1_EN; + pcr->aspm_mode = ASPM_MODE_REG; pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 11); pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5); diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c index 273311184669..baf83594a01d 100644 --- a/drivers/misc/cardreader/rtsx_pcr.c +++ b/drivers/misc/cardreader/rtsx_pcr.c @@ -85,12 +85,18 @@ static void rtsx_comm_set_aspm(struct rtsx_pcr *pcr, bool enable) if (pcr->aspm_enabled == enable) return; - if (pcr->aspm_en & 0x02) - rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, FORCE_ASPM_CTL0 | - FORCE_ASPM_CTL1, enable ? 0 : FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1); - else - rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, FORCE_ASPM_CTL0 | - FORCE_ASPM_CTL1, FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1); + if (pcr->aspm_mode == ASPM_MODE_CFG) { + pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL, + PCI_EXP_LNKCTL_ASPMC, + enable ? pcr->aspm_en : 0); + } else if (pcr->aspm_mode == ASPM_MODE_REG) { + if (pcr->aspm_en & 0x02) + rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, FORCE_ASPM_CTL0 | + FORCE_ASPM_CTL1, enable ? 0 : FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1); + else + rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, FORCE_ASPM_CTL0 | + FORCE_ASPM_CTL1, FORCE_ASPM_CTL0 | FORCE_ASPM_CTL1); + } if (!enable && (pcr->aspm_en & 0x02)) mdelay(10); @@ -1394,7 +1400,8 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr) return err; } - rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0x30, 0x30); + if (pcr->aspm_mode == ASPM_MODE_REG) + rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0x30, 0x30); /* No CD interrupt if probing driver with card inserted. * So we need to initialize pcr->card_exist here. @@ -1410,6 +1417,8 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr) static int rtsx_pci_init_chip(struct rtsx_pcr *pcr) { int err; + u16 cfg_val; + u8 val; spin_lock_init(&pcr->lock); mutex_init(&pcr->pcr_mutex); @@ -1477,6 +1486,21 @@ static int rtsx_pci_init_chip(struct rtsx_pcr *pcr) if (!pcr->slots) return -ENOMEM; + if (pcr->aspm_mode == ASPM_MODE_CFG) { + pcie_capability_read_word(pcr->pci, PCI_EXP_LNKCTL, &cfg_val); + if (cfg_val & PCI_EXP_LNKCTL_ASPM_L1) + pcr->aspm_enabled = true; + else + pcr->aspm_enabled = false; + + } else if (pcr->aspm_mode == ASPM_MODE_REG) { + rtsx_pci_read_register(pcr, ASPM_FORCE_CTL, &val); + if (val & FORCE_ASPM_CTL0 && val & FORCE_ASPM_CTL1) + pcr->aspm_enabled = false; + else + pcr->aspm_enabled = true; + } + if (pcr->ops->fetch_vendor_settings) pcr->ops->fetch_vendor_settings(pcr); @@ -1506,7 +1530,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, struct pcr_handle *handle; u32 base, len; int ret, i, bar = 0; - u8 val; dev_dbg(&(pcidev->dev), ": Realtek PCI-E Card Reader found at %s [%04x:%04x] (rev %x)\n", @@ -1572,11 +1595,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->host_cmds_addr = pcr->rtsx_resv_buf_addr; pcr->host_sg_tbl_ptr = pcr->rtsx_resv_buf + HOST_CMDS_BUF_LEN; pcr->host_sg_tbl_addr = pcr->rtsx_resv_buf_addr + HOST_CMDS_BUF_LEN; - rtsx_pci_read_register(pcr, ASPM_FORCE_CTL, &val); - if (val & FORCE_ASPM_CTL0 && val & FORCE_ASPM_CTL1) - pcr->aspm_enabled = false; - else - pcr->aspm_enabled = true; pcr->card_inserted = 0; pcr->card_removed = 0; INIT_DELAYED_WORK(&pcr->carddet_work, rtsx_pci_card_detect); diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h index 6f155f99aa16..4ab7bfc675f1 100644 --- a/include/linux/rtsx_pci.h +++ b/include/linux/rtsx_pci.h @@ -1109,6 +1109,7 @@ struct pcr_ops { }; enum PDEV_STAT {PDEV_STAT_IDLE, PDEV_STAT_RUN}; +enum ASPM_MODE {ASPM_MODE_CFG, ASPM_MODE_REG}; #define ASPM_L1_1_EN BIT(0) #define ASPM_L1_2_EN BIT(1) @@ -1234,6 +1235,7 @@ struct rtsx_pcr { u8 card_drive_sel; #define ASPM_L1_EN 0x02 u8 aspm_en; + enum ASPM_MODE aspm_mode; bool aspm_enabled; #define PCR_MS_PMOS (1 << 0) -- 2.32.0

3 years, 9 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror June 2021