From: David Collins To: Stephen Boyd , CC: David Collins , , Abel Vesa , "Dan Carpenter" , Neil Armstrong Subject: [PATCH] spmi: pmic-arb: use correct node when adding irq domain Date: Wed, 3 Jul 2024 15:11:57 -0700 Message-ID: <20240703221157.3640361-1-quic_collinsd@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267242 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Pass a pointer to the SPMI bus subnode instead of the top- level PMIC arbiter node when calling irq_domain_add_tree(). This ensures that consumer IRQ mappings can be found successfully at runtime. Here is an example of a consumer device probe deferral that happens without this fix in place: [ 18.197271] platform c42d000.spmi:qcom,pmk8550@0:pon_hlos@1300:pwrkey: deferred probe pending: pm8941-pwrkey: IRQ index 0 not found [ 18.197275] platform c42d000.spmi:qcom,pmk8550@0:pon_hlos@1300:resin: deferred probe pending: pm8941-pwrkey: IRQ index 0 not found Fixes: 02922ccbb330 ("spmi: pmic-arb: Register controller for bus instead of arbiter") Fixes: 979987371739 ("spmi: pmic-arb: Add multi bus support") Signed-off-by: David Collins --- drivers/spmi/spmi-pmic-arb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index 791cdc160c51..e6a4bf3abb1f 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -1737,8 +1737,7 @@ static int spmi_pmic_arb_bus_init(struct platform_device *pdev, dev_dbg(&pdev->dev, "adding irq domain for bus %d\n", bus_index); - bus->domain = irq_domain_add_tree(dev->of_node, - &pmic_arb_irq_domain_ops, bus); + bus->domain = irq_domain_add_tree(node, &pmic_arb_irq_domain_ops, bus); if (!bus->domain) { dev_err(&pdev->dev, "unable to create irq_domain\n"); return -ENOMEM; -- 2.25.1 . From: David Collins To: Stephen Boyd , CC: David Collins , , Abel Vesa , "Dan Carpenter" , Neil Armstrong Subject: [PATCH] spmi: pmic-arb: add missing newline in dev_err format strings Date: Wed, 3 Jul 2024 15:12:48 -0700 Message-ID: <20240703221248.3640490-1-quic_collinsd@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267243 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail dev_err() format strings should end with '\n'. Several such format strings in the spmi-pmic-arb driver are missing it. Add newlines where needed. Fixes: 02922ccbb330 ("spmi: pmic-arb: Register controller for bus instead of arbiter") Signed-off-by: David Collins --- drivers/spmi/spmi-pmic-arb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index 791cdc160c51..c408ded0c00f 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -398,7 +398,7 @@ static int pmic_arb_fmt_read_cmd(struct spmi_pmic_arb_bus *bus, u8 opc, u8 sid, *offset = rc; if (bc >= PMIC_ARB_MAX_TRANS_BYTES) { - dev_err(&bus->spmic->dev, "pmic-arb supports 1..%d bytes per trans, but:%zu requested", + dev_err(&bus->spmic->dev, "pmic-arb supports 1..%d bytes per trans, but:%zu requested\n", PMIC_ARB_MAX_TRANS_BYTES, len); return -EINVAL; } @@ -477,7 +477,7 @@ static int pmic_arb_fmt_write_cmd(struct spmi_pmic_arb_bus *bus, u8 opc, *offset = rc; if (bc >= PMIC_ARB_MAX_TRANS_BYTES) { - dev_err(&bus->spmic->dev, "pmic-arb supports 1..%d bytes per trans, but:%zu requested", + dev_err(&bus->spmic->dev, "pmic-arb supports 1..%d bytes per trans, but:%zu requested\n", PMIC_ARB_MAX_TRANS_BYTES, len); return -EINVAL; } @@ -1702,7 +1702,7 @@ static int spmi_pmic_arb_bus_init(struct platform_device *pdev, index = of_property_match_string(node, "reg-names", "cnfg"); if (index < 0) { - dev_err(dev, "cnfg reg region missing"); + dev_err(dev, "cnfg reg region missing\n"); return -EINVAL; } @@ -1712,7 +1712,7 @@ static int spmi_pmic_arb_bus_init(struct platform_device *pdev, index = of_property_match_string(node, "reg-names", "intr"); if (index < 0) { - dev_err(dev, "intr reg region missing"); + dev_err(dev, "intr reg region missing\n"); return -EINVAL; } -- 2.25.1 . Date: Wed, 3 Jul 2024 15:15:20 -0700 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Message-ID: <20240703221520.4108464-1-surenb@google.com> Subject: [PATCH 1/1] sched.h: always_inline alloc_tag_{save|restore} to fix modpost warnings From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, kent.overstreet@linux.dev, linux-kernel@vger.kernel.org, surenb@google.com, kernel test robot Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267244 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Mark alloc_tag_{save|restore} as always_inline to fix the following modpost warnings: WARNING: modpost: vmlinux: section mismatch in reference: alloc_tag_save+0x1c (section: .text.unlikely) -> initcall_level_names (section: .init.data) WARNING: modpost: vmlinux: section mismatch in reference: alloc_tag_restore+0x3c (section: .text.unlikely) -> initcall_level_names (section: .init.data) Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202407032306.gi9nZsBi-lkp@intel.com/ Signed-off-by: Suren Baghdasaryan Cc: Kent Overstreet --- include/linux/sched.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 61591ac6eab6..a5f4b48fca18 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2192,13 +2192,13 @@ static inline int sched_core_idle_cpu(int cpu) { return idle_cpu(cpu); } extern void sched_set_stop_task(int cpu, struct task_struct *stop); #ifdef CONFIG_MEM_ALLOC_PROFILING -static inline struct alloc_tag *alloc_tag_save(struct alloc_tag *tag) +static __always_inline struct alloc_tag *alloc_tag_save(struct alloc_tag *tag) { swap(current->alloc_tag, tag); return tag; } -static inline void alloc_tag_restore(struct alloc_tag *tag, struct alloc_tag *old) +static __always_inline void alloc_tag_restore(struct alloc_tag *tag, struct alloc_tag *old) { #ifdef CONFIG_MEM_ALLOC_PROFILING_DEBUG WARN(current->alloc_tag != tag, "current->alloc_tag was changed:\n"); base-commit: 795c58e4c7fc6163d8fb9f2baa86cfe898fa4b19 -- 2.45.2.803.g4e1b14247a-goog . X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Wed, 03 Jul 2024 15:24:25 -0700 Message-ID: <000000000000f368c9061c5f4a28@google.com> Subject: [syzbot] [bluetooth?] KASAN: slab-use-after-free Read in l2cap_recv_acldata From: syzbot To: johan.hedberg@gmail.com, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, luiz.dentz@gmail.com, marcel@holtmann.org, syzkaller-bugs@googlegroups.com Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267254 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-bluetooth Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, syzbot found the following issue on: HEAD commit: de0a9f448633 Merge tag 'riscv-for-linus-6.10-rc6' of git:/.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=1161e12a980000 kernel config: https://syzkaller.appspot.com/x/.config?x=67463c0717b8d4ca dashboard link: https://syzkaller.appspot.com/bug?extid=165ba199a4fe7118b2de compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40 Unfortunately, I don't have any reproducer for this issue yet. Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/be1f2c9340c9/disk-de0a9f44.raw.xz vmlinux: https://storage.googleapis.com/syzbot-assets/e4c96e2040e3/vmlinux-de0a9f44.xz kernel image: https://storage.googleapis.com/syzbot-assets/eb52b0488fbe/bzImage-de0a9f44.xz IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+165ba199a4fe7118b2de@syzkaller.appspotmail.com Bluetooth: Unexpected start frame (len 7) ================================================================== BUG: KASAN: slab-use-after-free in l2cap_recv_reset net/bluetooth/l2cap_core.c:7469 [inline] BUG: KASAN: slab-use-after-free in l2cap_recv_acldata+0x325/0x1550 net/bluetooth/l2cap_core.c:7493 Read of size 8 at addr ffff8880202c10c8 by task kworker/u9:5/5096 CPU: 1 PID: 5096 Comm: kworker/u9:5 Not tainted 6.10.0-rc5-syzkaller-00253-gde0a9f448633 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 06/07/2024 Workqueue: hci2 hci_rx_work Call Trace: __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:114 print_address_description mm/kasan/report.c:377 [inline] print_report+0x169/0x550 mm/kasan/report.c:488 kasan_report+0x143/0x180 mm/kasan/report.c:601 l2cap_recv_reset net/bluetooth/l2cap_core.c:7469 [inline] l2cap_recv_acldata+0x325/0x1550 net/bluetooth/l2cap_core.c:7493 hci_acldata_packet net/bluetooth/hci_core.c:3842 [inline] hci_rx_work+0x50f/0xca0 net/bluetooth/hci_core.c:4079 process_one_work kernel/workqueue.c:3248 [inline] process_scheduled_works+0xa2c/0x1830 kernel/workqueue.c:3329 worker_thread+0x86d/0xd50 kernel/workqueue.c:3409 kthread+0x2f0/0x390 kernel/kthread.c:389 ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 Allocated by task 5089: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x3f/0x80 mm/kasan/common.c:68 poison_kmalloc_redzone mm/kasan/common.c:370 [inline] __kasan_kmalloc+0x98/0xb0 mm/kasan/common.c:387 kasan_kmalloc include/linux/kasan.h:211 [inline] kmalloc_trace_noprof+0x19c/0x2c0 mm/slub.c:4154 kmalloc_noprof include/linux/slab.h:660 [inline] kzalloc_noprof include/linux/slab.h:778 [inline] l2cap_conn_add+0xa9/0x8e0 net/bluetooth/l2cap_core.c:6864 l2cap_connect_cfm+0x136/0x1220 net/bluetooth/l2cap_core.c:7241 hci_connect_cfm+0xa2/0x150 include/net/bluetooth/hci_core.h:1970 le_conn_complete_evt+0xd3e/0x12e0 net/bluetooth/hci_event.c:5761 hci_le_conn_complete_evt+0x18c/0x420 net/bluetooth/hci_event.c:5787 hci_event_func net/bluetooth/hci_event.c:7414 [inline] hci_event_packet+0xa53/0x1540 net/bluetooth/hci_event.c:7469 hci_rx_work+0x3e8/0xca0 net/bluetooth/hci_core.c:4074 process_one_work kernel/workqueue.c:3248 [inline] process_scheduled_works+0xa2c/0x1830 kernel/workqueue.c:3329 worker_thread+0x86d/0xd50 kernel/workqueue.c:3409 kthread+0x2f0/0x390 kernel/kthread.c:389 ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 Freed by task 4477: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x3f/0x80 mm/kasan/common.c:68 kasan_save_free_info+0x40/0x50 mm/kasan/generic.c:579 poison_slab_object+0xe0/0x150 mm/kasan/common.c:240 __kasan_slab_free+0x37/0x60 mm/kasan/common.c:256 kasan_slab_free include/linux/kasan.h:184 [inline] slab_free_hook mm/slub.c:2196 [inline] slab_free mm/slub.c:4438 [inline] kfree+0x149/0x360 mm/slub.c:4559 l2cap_connect_cfm+0x11f/0x1220 net/bluetooth/l2cap_core.c:7237 hci_connect_cfm include/net/bluetooth/hci_core.h:1970 [inline] hci_conn_failed+0x1f6/0x340 net/bluetooth/hci_conn.c:1257 hci_abort_conn_sync+0x583/0xde0 net/bluetooth/hci_sync.c:5450 hci_cmd_sync_work+0x22b/0x400 net/bluetooth/hci_sync.c:310 process_one_work kernel/workqueue.c:3248 [inline] process_scheduled_works+0xa2c/0x1830 kernel/workqueue.c:3329 worker_thread+0x86d/0xd50 kernel/workqueue.c:3409 kthread+0x2f0/0x390 kernel/kthread.c:389 ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 Last potentially related work creation: kasan_save_stack+0x3f/0x60 mm/kasan/common.c:47 __kasan_record_aux_stack+0xac/0xc0 mm/kasan/generic.c:541 insert_work+0x3e/0x330 kernel/workqueue.c:2208 __queue_work+0xaf2/0xee0 kernel/workqueue.c:2364 queue_work_on+0x1c2/0x380 kernel/workqueue.c:2411 queue_work include/linux/workqueue.h:621 [inline] l2cap_conn_ready net/bluetooth/l2cap_core.c:1640 [inline] l2cap_connect_cfm+0xec2/0x1220 net/bluetooth/l2cap_core.c:7282 hci_connect_cfm+0xa2/0x150 include/net/bluetooth/hci_core.h:1970 le_conn_complete_evt+0xd3e/0x12e0 net/bluetooth/hci_event.c:5761 hci_le_conn_complete_evt+0x18c/0x420 net/bluetooth/hci_event.c:5787 hci_event_func net/bluetooth/hci_event.c:7414 [inline] hci_event_packet+0xa53/0x1540 net/bluetooth/hci_event.c:7469 hci_rx_work+0x3e8/0xca0 net/bluetooth/hci_core.c:4074 process_one_work kernel/workqueue.c:3248 [inline] process_scheduled_works+0xa2c/0x1830 kernel/workqueue.c:3329 worker_thread+0x86d/0xd50 kernel/workqueue.c:3409 kthread+0x2f0/0x390 kernel/kthread.c:389 ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 The buggy address belongs to the object at ffff8880202c1000 which belongs to the cache kmalloc-1k of size 1024 The buggy address is located 200 bytes inside of freed 1024-byte region [ffff8880202c1000, ffff8880202c1400) The buggy address belongs to the physical page: page: refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x202c0 head: order:3 mapcount:0 entire_mapcount:0 nr_pages_mapped:0 pincount:0 flags: 0xfff00000000040(head|node=0|zone=1|lastcpupid=0x7ff) page_type: 0xffffefff(slab) raw: 00fff00000000040 ffff888015041dc0 ffffea0001de3000 dead000000000002 raw: 0000000000000000 0000000000100010 00000001ffffefff 0000000000000000 head: 00fff00000000040 ffff888015041dc0 ffffea0001de3000 dead000000000002 head: 0000000000000000 0000000000100010 00000001ffffefff 0000000000000000 head: 00fff00000000003 ffffea000080b001 ffffffffffffffff 0000000000000000 head: 0000000000000008 0000000000000000 00000000ffffffff 0000000000000000 page dumped because: kasan: bad access detected page_owner tracks the page as allocated page last allocated via order 3, migratetype Unmovable, gfp_mask 0x152820(GFP_ATOMIC|__GFP_NOWARN|__GFP_NORETRY|__GFP_COMP|__GFP_HARDWALL), pid 2480, tgid 2480 (kworker/u8:7), ts 97857353301, free_ts 95178990419 set_page_owner include/linux/page_owner.h:32 [inline] post_alloc_hook+0x1f3/0x230 mm/page_alloc.c:1473 prep_new_page mm/page_alloc.c:1481 [inline] get_page_from_freelist+0x2e4c/0x2f10 mm/page_alloc.c:3425 __alloc_pages_noprof+0x256/0x6c0 mm/page_alloc.c:4683 __alloc_pages_node_noprof include/linux/gfp.h:269 [inline] alloc_pages_node_noprof include/linux/gfp.h:296 [inline] alloc_slab_page+0x5f/0x120 mm/slub.c:2265 allocate_slab+0x5a/0x2f0 mm/slub.c:2428 new_slab mm/slub.c:2481 [inline] ___slab_alloc+0xcd1/0x14b0 mm/slub.c:3667 __slab_alloc+0x58/0xa0 mm/slub.c:3757 __slab_alloc_node mm/slub.c:3810 [inline] slab_alloc_node mm/slub.c:3990 [inline] __do_kmalloc_node mm/slub.c:4122 [inline] __kmalloc_noprof+0x257/0x400 mm/slub.c:4136 kmalloc_noprof include/linux/slab.h:664 [inline] kzalloc_noprof include/linux/slab.h:778 [inline] ieee802_11_parse_elems_full+0xd5/0x2870 net/mac80211/parse.c:880 ieee802_11_parse_elems_crc net/mac80211/ieee80211_i.h:2332 [inline] ieee802_11_parse_elems net/mac80211/ieee80211_i.h:2339 [inline] ieee80211_rx_mgmt_probe_beacon net/mac80211/ibss.c:1574 [inline] ieee80211_ibss_rx_queued_mgmt+0x4c8/0x2d70 net/mac80211/ibss.c:1605 ieee80211_iface_process_skb net/mac80211/iface.c:1603 [inline] ieee80211_iface_work+0x8a3/0xf10 net/mac80211/iface.c:1657 cfg80211_wiphy_work+0x221/0x260 net/wireless/core.c:437 process_one_work kernel/workqueue.c:3248 [inline] process_scheduled_works+0xa2c/0x1830 kernel/workqueue.c:3329 worker_thread+0x86d/0xd50 kernel/workqueue.c:3409 kthread+0x2f0/0x390 kernel/kthread.c:389 ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147 page last free pid 9 tgid 9 stack trace: reset_page_owner include/linux/page_owner.h:25 [inline] free_pages_prepare mm/page_alloc.c:1093 [inline] free_unref_page+0xd19/0xea0 mm/page_alloc.c:2588 __slab_free+0x31b/0x3d0 mm/slub.c:4349 qlink_free mm/kasan/quarantine.c:163 [inline] qlist_free_all+0x9e/0x140 mm/kasan/quarantine.c:179 kasan_quarantine_reduce+0x14f/0x170 mm/kasan/quarantine.c:286 __kasan_slab_alloc+0x23/0x80 mm/kasan/common.c:322 kasan_slab_alloc include/linux/kasan.h:201 [inline] slab_post_alloc_hook mm/slub.c:3940 [inline] slab_alloc_node mm/slub.c:4002 [inline] kmalloc_trace_noprof+0x132/0x2c0 mm/slub.c:4149 kmalloc_noprof include/linux/slab.h:660 [inline] kzalloc_noprof include/linux/slab.h:778 [inline] nsim_fib6_rt_create drivers/net/netdevsim/fib.c:547 [inline] nsim_fib6_rt_insert drivers/net/netdevsim/fib.c:752 [inline] nsim_fib6_event drivers/net/netdevsim/fib.c:856 [inline] nsim_fib_event drivers/net/netdevsim/fib.c:889 [inline] nsim_fib_event_work+0x19c2/0x4130 drivers/net/netdevsim/fib.c:1492 process_one_work kernel/workqueue.c:3248 [inline] process_scheduled_works+0xa2c/0x1830 kernel/workqueue.c:3329 worker_thread+0x86d/0xd50 kernel/workqueue.c:3409 kthread+0x2f0/0x390 kernel/kthread.c:389 ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 Memory state around the buggy address: ffff8880202c0f80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc ffff8880202c1000: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb >ffff8880202c1080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff8880202c1100: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff8880202c1180: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ================================================================== --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. If the report is already addressed, let syzbot know by replying with: #syz fix: exact-commit-title If you want to overwrite report's subsystems, reply with: #syz set subsystems: new-subsystem (See the list of subsystem names on the web dashboard) If the report is a duplicate of another one, reply with: #syz dup: exact-subject-of-another-report If you want to undo deduplication, reply with: #syz undup . From: Beau Belgrave To: rostedt@goodmis.org, mhiramat@kernel.org, corbet@lwn.net Cc: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH] Documentation: Document user_events ioctl code Date: Wed, 3 Jul 2024 22:25:01 +0000 Message-Id: <20240703222501.1547-1-beaub@linux.microsoft.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267255 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-doc,org.kernel.vger.linux-trace-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The user events trace subsystem uses the 0x2A/'*' code for ioctls. These are published via the uapi/linux/user_events.h header file. Add a line indicating user events as the owner of the 0x2A/'*' code and the current sequence numbers that are in use (00-02). Signed-off-by: Beau Belgrave --- Documentation/userspace-api/ioctl/ioctl-number.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst index a141e8e65c5d..191609fe4593 100644 --- a/Documentation/userspace-api/ioctl/ioctl-number.rst +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -97,6 +97,8 @@ Code Seq# Include File Comments '%' 00-0F include/uapi/linux/stm.h System Trace Module subsystem '&' 00-07 drivers/firewire/nosy-user.h +'*' 00-02 uapi/linux/user_events.h User Events Subsystem + '1' 00-1F linux/timepps.h PPS kit from Ulrich Windl '2' 01-04 linux/i2o.h -- 2.34.1 . From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers , Kan Liang Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, KP Singh , Song Liu , bpf@vger.kernel.org, Stephane Eranian Subject: [PATCHSET v3 0/8] perf record: Use a pinned BPF program for filter Date: Wed, 3 Jul 2024 15:30:27 -0700 Message-ID: <20240703223035.2024586-1-namhyung@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267257 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.bpf,org.kernel.vger.linux-perf-users Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, This is to support the unprivileged BPF filter for profiling per-task events. Until now only root (or any user with CAP_BPF) can use the filter and we cannot add a new unprivileged BPF program types. After talking with the BPF folks at LSF/MM/BPF 2024, I was told that this is the way to go. Finally I managed to make it working with pinned BPF objects. :) v3 changes) * rebased onto latest perf-tools-next v2 changes) * rebased onto Ian's UID/GID (non-sample data based) filter term change * support separate lost counts for each use case * update the test case to allow normal users (if supported) This only supports the per-task mode for normal users and root still uses its own instance of the same BPF program - not shared with other users. But it requires the one-time setup (by root) before using it by normal users like below. $ sudo perf record --setup-filter pin This will load the BPF program and maps and pin them in the BPF-fs. Then normal users can use the filter. $ perf record -o- -e cycles:u --filter 'period < 10000' perf test -w noploop | perf script -i- [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.011 MB - ] perf 759982 448227.214189: 1 cycles:u: 7f153719f4d0 _start+0x0 (/usr/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2) perf 759982 448227.214195: 1 cycles:u: 7f153719f4d0 _start+0x0 (/usr/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2) perf 759982 448227.214196: 7 cycles:u: 7f153719f4d0 _start+0x0 (/usr/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2) perf 759982 448227.214196: 223 cycles:u: 7f153719f4d0 _start+0x0 (/usr/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2) perf 759982 448227.214198: 9475 cycles:u: ffffffff8ee012a0 [unknown] ([unknown]) perf 759982 448227.548608: 1 cycles:u: 559a9f03c81c noploop+0x5c (/home/namhyung/linux/tools/perf/perf) perf 759982 448227.548611: 1 cycles:u: 559a9f03c81c noploop+0x5c (/home/namhyung/linux/tools/perf/perf) perf 759982 448227.548612: 12 cycles:u: 559a9f03c81c noploop+0x5c (/home/namhyung/linux/tools/perf/perf) perf 759982 448227.548613: 466 cycles:u: 559a9f03c81c noploop+0x5c (/home/namhyung/linux/tools/perf/perf) It's also possible to unload (and unpin, of course) using this command: $ sudo perf record --setup-filter unpin The code is avaiable in 'perf/pinned-filter-v3' branch at git://git.kernel.org/pub/scm/linux/kernel/git/namhyung/linux-perf.git Thanks, Namhyung Namhyung Kim (8): perf bpf-filter: Make filters map a single entry hashmap perf bpf-filter: Pass 'target' to perf_bpf_filter__prepare() perf bpf-filter: Split per-task filter use case perf bpf-filter: Support pin/unpin BPF object perf bpf-filter: Support separate lost counts for each filter perf record: Fix a potential error handling issue perf record: Add --setup-filter option perf test: Update sample filtering test tools/perf/Documentation/perf-record.txt | 5 + tools/perf/builtin-record.c | 23 +- tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 2 +- tools/perf/tests/shell/record_bpf_filter.sh | 13 +- tools/perf/util/bpf-filter.c | 406 +++++++++++++++++-- tools/perf/util/bpf-filter.h | 19 +- tools/perf/util/bpf_skel/sample-filter.h | 2 + tools/perf/util/bpf_skel/sample_filter.bpf.c | 75 +++- tools/perf/util/evlist.c | 5 +- tools/perf/util/evlist.h | 4 +- 12 files changed, 483 insertions(+), 75 deletions(-) -- 2.45.2.803.g4e1b14247a-goog . From: Frank Li Subject: [PATCH 0/2] usb: dwc3: Add cache type configuration support for freescale layerscape Date: Wed, 03 Jul 2024 19:06:53 -0400 Message-Id: <20240703-dwc-v1-0-9cbc93d49180@nxp.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Felipe Balbi , Thinh Nguyen Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, Frank Li , Ran Wang , Jun Li X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267287 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-usb Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail There are several attempt to upstream this code in past year. The first attempt: https://lore.kernel.org/linux-usb/20191121095356.GB7503@b29397-desktop/ cache type is dwc core setting, not glue layer. So It'd better change in dwc core instead of glue layer code. The second attempt: https://lore.kernel.org/linux-usb/20240123170206.3702413-1-Frank.Li@nxp.com/#t DT team think there are not variable for property 'snps,dat-wr-reqinfo'. And suggest use vendor compatible string. This is third attempt: Compared with first attempt: - reduce compatible string to one 'fsl,ls-dwc3' because all setting are the same. - move update burst type code into dwc3_set_incr_burst_type(). and check compatible string 'fsl,ls-dwc3'. - Using bit field help macro. Signed-off-by: Frank Li --- Ran Wang (2): dt-bindings: usb: Add chip-specific compatible string 'fsl,ls-dwc3' usb: dwc3: Set cache type to 'snoop' for freescale layerscape chip Documentation/devicetree/bindings/usb/snps,dwc3.yaml | 1 + drivers/usb/dwc3/core.c | 12 ++++++++++++ drivers/usb/dwc3/core.h | 4 ++++ 3 files changed, 17 insertions(+) --- base-commit: 0b58e108042b0ed28a71cd7edf5175999955b233 change-id: 20240703-dwc-5be3e378ddbe Best regards, --- Frank Li . From: Tim Merrifield To: "Kirill A . Shutemov" , Dave Hansen , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H . Peter Anvin" , Xin Li , Tim Merrifield , Ard Biesheuvel , Kai Huang , Kevin Loughlin , Thomas Zimmermann , Rick Edgecombe , Kees Cook , Mike Rapoport , Brian Gerst , linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, Ajay Kaher , Alexey Makhalov , Broadcom internal kernel review list , virtualization@lists.linux.dev, alex.james@broadcom.com, doug.covelli@broadcom.com, jeffrey.sheldon@broadcom.com Subject: [PATCH 0/2] Support userspace hypercalls for TDX Date: Wed, 3 Jul 2024 23:35:59 +0000 Message-Id: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267299 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.linux-coco,dev.linux.lists.virtualization Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail VMCALL and VMMCALL instructions are used by x86 guests to request services from the host VMM. Both VMCALL and VMMCALL are not restricted to CPL 0. This allows userspace software like open-vm-tools to communicate directly with the VMM. In the context of confidential VMs, direct communication with the host may violate the security model. Existing binaries that make use of hypercalls and are not hardened against malicious hypervisors can become a possible attack surface. For this reason, user-level VMCALLs are not currently forwarded to the host on TDX VMs. This breaks any user-level software that use these instructions. But if user-level software is aware of the risks and has been hardened to address any known violations of the security model, then it seems reasonable to allow hypercalls from this process to proceed. This patchset introduces a new x86 process control flag to address this concern. By setting the TIF_COCO_USER_HCALL thread information flag, the process opts in to user-level hypercalls. When TDX is enabled, the VMCALL will #VE and control will be transferred to a hypervisor-specific hypercall handler (similar to how things work today for SEV with sev_es_hcall_prepare/sev_es_hcall_finish). The flag has no effect on non-TDX VMs. Other confidential computing technologies could use this flag to provide limited access to user-level hypercalls. Tim Merrifield (2): x86/tdx: Add prctl to allow userlevel TDX hypercalls x86/vmware: VMware support for TDX userspace hypercalls arch/x86/coco/tdx/tdx.c | 18 +++++++++++ arch/x86/include/asm/thread_info.h | 2 ++ arch/x86/include/asm/x86_init.h | 1 + arch/x86/include/uapi/asm/prctl.h | 3 ++ arch/x86/kernel/cpu/vmware.c | 51 +++++++++++++++++++++++------- arch/x86/kernel/process.c | 20 ++++++++++++ 6 files changed, 84 insertions(+), 11 deletions(-) -- 2.40.1 . From: Dragan Simic To: linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org Cc: heiko@sntech.de, hjc@rock-chips.com, andy.yan@rock-chips.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/rockchip: cdn-dp: Remove redundant workarounds for firmware loading Date: Thu, 4 Jul 2024 01:32:02 +0200 Message-Id: <9b7a9e9b88ad8c7489ee1b4c70b8751eeb5cf6f9.1720049413.git.dsimic@manjaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267303 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-rockchip Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail After the additional firmware-related module information was introduced by the commit c0677e41a47f ("drm/rockchip: cdn-dp-core: add MODULE_FIRMWARE macro"), there's no longer need for the firmware-loading workarounds whose sole purpose was to prevent the missing firmware blob in an initial ramdisk from causing driver initialization to fail. Thus, delete the workarounds, which removes a sizable chunk of redundant code. Various utilities used by Linux distributions to generate initial ramdisks need to obey the firmware-related module information, so we can rely on the firmware blob being present in the generated initial ramdisks. Signed-off-by: Dragan Simic --- drivers/gpu/drm/rockchip/cdn-dp-core.c | 53 +++++--------------------- 1 file changed, 10 insertions(+), 43 deletions(-) diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c index bd7aa891b839..e1a7c6a1172b 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -44,9 +44,9 @@ static inline struct cdn_dp_device *encoder_to_dp(struct drm_encoder *encoder) #define DPTX_HPD_DEL (2 << 12) #define DPTX_HPD_SEL_MASK (3 << 28) -#define CDN_FW_TIMEOUT_MS (64 * 1000) #define CDN_DPCD_TIMEOUT_MS 5000 #define CDN_DP_FIRMWARE "rockchip/dptx.bin" + MODULE_FIRMWARE(CDN_DP_FIRMWARE); struct cdn_dp_data { @@ -909,61 +909,28 @@ static int cdn_dp_audio_codec_init(struct cdn_dp_device *dp, return PTR_ERR_OR_ZERO(dp->audio_pdev); } -static int cdn_dp_request_firmware(struct cdn_dp_device *dp) -{ - int ret; - unsigned long timeout = jiffies + msecs_to_jiffies(CDN_FW_TIMEOUT_MS); - unsigned long sleep = 1000; - - WARN_ON(!mutex_is_locked(&dp->lock)); - - if (dp->fw_loaded) - return 0; - - /* Drop the lock before getting the firmware to avoid blocking boot */ - mutex_unlock(&dp->lock); - - while (time_before(jiffies, timeout)) { - ret = request_firmware(&dp->fw, CDN_DP_FIRMWARE, dp->dev); - if (ret == -ENOENT) { - msleep(sleep); - sleep *= 2; - continue; - } else if (ret) { - DRM_DEV_ERROR(dp->dev, - "failed to request firmware: %d\n", ret); - goto out; - } - - dp->fw_loaded = true; - ret = 0; - goto out; - } - - DRM_DEV_ERROR(dp->dev, "Timed out trying to load firmware\n"); - ret = -ETIMEDOUT; -out: - mutex_lock(&dp->lock); - return ret; -} - static void cdn_dp_pd_event_work(struct work_struct *work) { struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device, event_work); struct drm_connector *connector = &dp->connector; enum drm_connector_status old_status; - int ret; mutex_lock(&dp->lock); if (dp->suspended) goto out; - ret = cdn_dp_request_firmware(dp); - if (ret) - goto out; + if (!dp->fw_loaded) { + ret = request_firmware(&dp->fw, CDN_DP_FIRMWARE, dp->dev); + if (ret) { + DRM_DEV_ERROR(dp->dev, "Loading firmware failed: %d\n", ret); + goto out; + } + + dp->fw_loaded = true; + } dp->connected = true; . From: Dragan Simic To: linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org Cc: heiko@sntech.de, hjc@rock-chips.com, andy.yan@rock-chips.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/rockchip: cdn-dp: Clean up a few logged messages Date: Thu, 4 Jul 2024 01:32:20 +0200 Message-Id: <92db74a313547c087cc71059428698c4ec37a9ae.1720048818.git.dsimic@manjaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267304 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-rockchip Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Clean up a few logged messages, which were previously worded as rather incomplete sentences separated by periods. This was both a bit unreadable and grammatically incorrect, so convert them into partial sentences separated (or connected) by semicolons, together with some wording improvements. Signed-off-by: Dragan Simic --- drivers/gpu/drm/rockchip/cdn-dp-core.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c index bd7aa891b839..ee9def197095 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -969,46 +969,44 @@ static void cdn_dp_pd_event_work(struct work_struct *work) /* Not connected, notify userspace to disable the block */ if (!cdn_dp_connected_port(dp)) { - DRM_DEV_INFO(dp->dev, "Not connected. Disabling cdn\n"); + DRM_DEV_INFO(dp->dev, "Not connected; disabling cdn\n"); dp->connected = false; /* Connected but not enabled, enable the block */ } else if (!dp->active) { - DRM_DEV_INFO(dp->dev, "Connected, not enabled. Enabling cdn\n"); + DRM_DEV_INFO(dp->dev, "Connected, not enabled; enabling cdn\n"); ret = cdn_dp_enable(dp); if (ret) { - DRM_DEV_ERROR(dp->dev, "Enable dp failed %d\n", ret); + DRM_DEV_ERROR(dp->dev, "Enabling dp failed: %d\n", ret); dp->connected = false; } /* Enabled and connected to a dongle without a sink, notify userspace */ } else if (!cdn_dp_check_sink_connection(dp)) { - DRM_DEV_INFO(dp->dev, "Connected without sink. Assert hpd\n"); + DRM_DEV_INFO(dp->dev, "Connected without sink; assert hpd\n"); dp->connected = false; /* Enabled and connected with a sink, re-train if requested */ } else if (!cdn_dp_check_link_status(dp)) { unsigned int rate = dp->max_rate; unsigned int lanes = dp->max_lanes; struct drm_display_mode *mode = &dp->mode; - DRM_DEV_INFO(dp->dev, "Connected with sink. Re-train link\n"); + DRM_DEV_INFO(dp->dev, "Connected with sink; re-train link\n"); ret = cdn_dp_train_link(dp); if (ret) { dp->connected = false; - DRM_DEV_ERROR(dp->dev, "Train link failed %d\n", ret); + DRM_DEV_ERROR(dp->dev, "Training link failed: %d\n", ret); goto out; } /* If training result is changed, update the video config */ if (mode->clock && (rate != dp->max_rate || lanes != dp->max_lanes)) { ret = cdn_dp_config_video(dp); if (ret) { dp->connected = false; - DRM_DEV_ERROR(dp->dev, - "Failed to config video %d\n", - ret); + DRM_DEV_ERROR(dp->dev, "Failed to configure video: %d\n", ret); } } } . From: Roman Gushchin To: Andrew Morton , Shakeel Butt Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Johannes Weiner , Michal Hocko , Muchun Song , Roman Gushchin Subject: [PATCH] mm: memcg: move cgroup v1 oom handling code into memcontrol-v1.c: fixup Date: Thu, 4 Jul 2024 00:27:12 +0000 Message-ID: <20240704002712.2077812-1-roman.gushchin@linux.dev> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267314 org.kvack.linux-mm:202424 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is a small fixup for the commit "mm: memcg: move cgroup v1 oom handling code into memcontrol-v1.c". I forgot to actually move two functions mem_cgroup_node_nr_lru_pages() and mem_cgroup_nr_lru_pages() into mm/memcontrol-v1.c, so that they remain in mm/memcontrol.c and their commented out duplicated versions in mm/memcontrol-v1.c. Andrew, can you, please, squash it into the original commit? I checked that the rest of mm-unstable tree can be rebased automatically without any merge conflicts. Signed-off-by: Roman Gushchin --- mm/memcontrol-v1.c | 74 +++++++++++++++++++++++----------------------- mm/memcontrol-v1.h | 5 ---- mm/memcontrol.c | 38 ------------------------ 3 files changed, 37 insertions(+), 80 deletions(-) diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c index 42829cbf7b48..597b03ee9e35 100644 --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c @@ -2494,43 +2494,43 @@ static ssize_t mem_cgroup_reset(struct kernfs_open_file *of, char *buf, #define LRU_ALL_ANON (BIT(LRU_INACTIVE_ANON) | BIT(LRU_ACTIVE_ANON)) #define LRU_ALL ((1 << NR_LRU_LISTS) - 1) -/* static unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg, */ -/* int nid, unsigned int lru_mask, bool tree) */ -/* { */ -/* struct lruvec *lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(nid)); */ -/* unsigned long nr = 0; */ -/* enum lru_list lru; */ - -/* VM_BUG_ON((unsigned)nid >= nr_node_ids); */ - -/* for_each_lru(lru) { */ -/* if (!(BIT(lru) & lru_mask)) */ -/* continue; */ -/* if (tree) */ -/* nr += lruvec_page_state(lruvec, NR_LRU_BASE + lru); */ -/* else */ -/* nr += lruvec_page_state_local(lruvec, NR_LRU_BASE + lru); */ -/* } */ -/* return nr; */ -/* } */ - -/* static unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg, */ -/* unsigned int lru_mask, */ -/* bool tree) */ -/* { */ -/* unsigned long nr = 0; */ -/* enum lru_list lru; */ - -/* for_each_lru(lru) { */ -/* if (!(BIT(lru) & lru_mask)) */ -/* continue; */ -/* if (tree) */ -/* nr += memcg_page_state(memcg, NR_LRU_BASE + lru); */ -/* else */ -/* nr += memcg_page_state_local(memcg, NR_LRU_BASE + lru); */ -/* } */ -/* return nr; */ -/* } */ +static unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg, + int nid, unsigned int lru_mask, bool tree) +{ + struct lruvec *lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(nid)); + unsigned long nr = 0; + enum lru_list lru; + + VM_BUG_ON((unsigned)nid >= nr_node_ids); + + for_each_lru(lru) { + if (!(BIT(lru) & lru_mask)) + continue; + if (tree) + nr += lruvec_page_state(lruvec, NR_LRU_BASE + lru); + else + nr += lruvec_page_state_local(lruvec, NR_LRU_BASE + lru); + } + return nr; +} + +static unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg, + unsigned int lru_mask, + bool tree) +{ + unsigned long nr = 0; + enum lru_list lru; + + for_each_lru(lru) { + if (!(BIT(lru) & lru_mask)) + continue; + if (tree) + nr += memcg_page_state(memcg, NR_LRU_BASE + lru); + else + nr += memcg_page_state_local(memcg, NR_LRU_BASE + lru); + } + return nr; +} static int memcg_numa_stat_show(struct seq_file *m, void *v) { diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h index 7be4670d9abb..0a4d5092c51b 100644 --- a/mm/memcontrol-v1.h +++ b/mm/memcontrol-v1.h @@ -88,11 +88,6 @@ void memcg1_oom_finish(struct mem_cgroup *memcg, bool locked); void memcg1_oom_recover(struct mem_cgroup *memcg); void drain_all_stock(struct mem_cgroup *root_memcg); -unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg, - unsigned int lru_mask, bool tree); -unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg, - int nid, unsigned int lru_mask, - bool tree); unsigned long memcg_events(struct mem_cgroup *memcg, int event); unsigned long memcg_events_local(struct mem_cgroup *memcg, int event); diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 11e4a3c65437..f35ed6655992 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3188,44 +3188,6 @@ static void memcg_offline_kmem(struct mem_cgroup *memcg) } #endif /* CONFIG_MEMCG_KMEM */ -unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg, - int nid, unsigned int lru_mask, - bool tree) -{ - struct lruvec *lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(nid)); - unsigned long nr = 0; - enum lru_list lru; - - VM_BUG_ON((unsigned)nid >= nr_node_ids); - - for_each_lru(lru) { - if (!(BIT(lru) & lru_mask)) - continue; - if (tree) - nr += lruvec_page_state(lruvec, NR_LRU_BASE + lru); - else - nr += lruvec_page_state_local(lruvec, NR_LRU_BASE + lru); - } - return nr; -} - -unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg, - unsigned int lru_mask, bool tree) -{ - unsigned long nr = 0; - enum lru_list lru; - - for_each_lru(lru) { - if (!(BIT(lru) & lru_mask)) - continue; - if (tree) - nr += memcg_page_state(memcg, NR_LRU_BASE + lru); - else - nr += memcg_page_state_local(memcg, NR_LRU_BASE + lru); - } - return nr; -} - #ifdef CONFIG_CGROUP_WRITEBACK #include -- 2.45.2.803.g4e1b14247a-goog . From: Bard Liao To: linux-sound@vger.kernel.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, pierre-louis.bossart@linux.intel.com, bard.liao@intel.com Subject: [PATCH] soundwire: intel_auxdevice: start the bus at default frequency Date: Thu, 4 Jul 2024 08:34:11 +0800 Message-ID: <20240704003411.10347-1-yung-chuan.liao@linux.intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267316 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-sound Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Pierre-Louis Bossart When platform firmware exposes multiple supported bus frequencies, the existing SoundWire support selects the maximum frequency. This is not aligned with the SoundWire 1.2 directions: the MIPI recommendation is to start at a 'safe' speed, compatible with the default frame rate and shape, and only increase the clock when vendor and codec PHY parameters are updated. However, clock changes are not supported for now by the SoundWire core, so in practice this patch has the effect of discarding frequencies different to the implicit default. Dynamic clock changes will be required at some point, and this limitation will be removed after the core is updated, specifically to perform synchronous clock scale changes on manager and peripheral sides with a bank switch. On Intel LunarLake platforms with a 'standard' DSDT, this forces the use of 4.8MHz. On older platforms this patch has no effect. Signed-off-by: Pierre-Louis Bossart Signed-off-by: Bard Liao --- drivers/soundwire/intel_auxdevice.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/soundwire/intel_auxdevice.c b/drivers/soundwire/intel_auxdevice.c index 54cb455ed870..64ca55c1c94b 100644 --- a/drivers/soundwire/intel_auxdevice.c +++ b/drivers/soundwire/intel_auxdevice.c @@ -209,9 +209,30 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus) static int intel_prop_read(struct sdw_bus *bus) { + struct sdw_master_prop *prop; + /* Initialize with default handler to read all DisCo properties */ sdw_master_read_prop(bus); + /* + * Only one bus frequency is supported so far, filter + * frequencies reported in the DSDT + */ + prop = &bus->prop; + if (prop->clk_freq && prop->num_clk_freq > 1) { + unsigned int default_bus_frequency; + + default_bus_frequency = + prop->default_frame_rate * + prop->default_row * + prop->default_col / + SDW_DOUBLE_RATE_FACTOR; + + prop->num_clk_freq = 1; + prop->clk_freq[0] = default_bus_frequency; + prop->max_clk_freq = default_bus_frequency; + } + /* read Intel-specific properties */ sdw_master_read_intel_prop(bus); -- 2.43.0 . Date: Thu, 04 Jul 2024 08:34:52 +0800 From: kernel test robot To: "x86-ml" Cc: linux-kernel@vger.kernel.org Subject: [tip:x86/cache] BUILD SUCCESS ea34999f41873c96ac89e861e5fdfc7d0403f9e3 Message-ID: <202407040850.mrE4O3M2-lkp@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267317 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/cache branch HEAD: ea34999f41873c96ac89e861e5fdfc7d0403f9e3 x86/resctrl: Update documentation with Sub-NUMA cluster changes elapsed time: 1701m configs tested: 101 configs skipped: 1 The following configs have been built successfully. More configs may be tested in the coming days. tested configs: alpha allnoconfig gcc-13.2.0 arc allnoconfig gcc-13.2.0 arc randconfig-001-20240703 gcc-13.2.0 arc randconfig-002-20240703 gcc-13.2.0 arm allnoconfig clang-19 arm am200epdkit_defconfig gcc-13.2.0 arm hisi_defconfig gcc-13.2.0 arm randconfig-001-20240703 clang-19 arm randconfig-002-20240703 gcc-13.2.0 arm randconfig-003-20240703 clang-19 arm randconfig-004-20240703 clang-19 arm s5pv210_defconfig gcc-13.2.0 arm64 allnoconfig gcc-13.2.0 arm64 randconfig-001-20240703 clang-19 arm64 randconfig-002-20240703 gcc-13.2.0 arm64 randconfig-003-20240703 gcc-13.2.0 arm64 randconfig-004-20240703 gcc-13.2.0 csky allnoconfig gcc-13.2.0 csky randconfig-001-20240703 gcc-13.2.0 csky randconfig-002-20240703 gcc-13.2.0 hexagon allnoconfig clang-19 hexagon randconfig-001-20240703 clang-16 hexagon randconfig-002-20240703 clang-19 i386 allmodconfig gcc-13 i386 allnoconfig gcc-13 i386 allyesconfig gcc-13 i386 buildonly-randconfig-001-20240703 clang-18 i386 buildonly-randconfig-002-20240703 gcc-13 i386 buildonly-randconfig-003-20240703 gcc-13 i386 buildonly-randconfig-004-20240703 gcc-13 i386 buildonly-randconfig-005-20240703 clang-18 i386 buildonly-randconfig-006-20240703 gcc-13 i386 randconfig-001-20240703 gcc-13 i386 randconfig-002-20240703 clang-18 i386 randconfig-003-20240703 gcc-13 i386 randconfig-004-20240703 gcc-11 i386 randconfig-005-20240703 clang-18 i386 randconfig-006-20240703 gcc-7 i386 randconfig-011-20240703 gcc-13 i386 randconfig-012-20240703 gcc-13 i386 randconfig-013-20240703 gcc-13 i386 randconfig-014-20240703 gcc-13 i386 randconfig-015-20240703 gcc-13 i386 randconfig-016-20240703 clang-18 loongarch allnoconfig gcc-13.2.0 loongarch randconfig-001-20240703 gcc-13.2.0 loongarch randconfig-002-20240703 gcc-13.2.0 m68k allnoconfig gcc-13.2.0 m68k apollo_defconfig gcc-13.2.0 microblaze alldefconfig gcc-13.2.0 microblaze allnoconfig gcc-13.2.0 mips allnoconfig gcc-13.2.0 mips db1xxx_defconfig clang-19 mips decstation_r4k_defconfig gcc-13.2.0 mips ip22_defconfig gcc-13.2.0 nios2 allnoconfig gcc-13.2.0 nios2 randconfig-001-20240703 gcc-13.2.0 nios2 randconfig-002-20240703 gcc-13.2.0 openrisc allnoconfig gcc-13.2.0 openrisc defconfig gcc-13.2.0 parisc allnoconfig gcc-13.2.0 parisc randconfig-001-20240703 gcc-13.2.0 parisc randconfig-002-20240703 gcc-13.2.0 powerpc allnoconfig gcc-13.2.0 powerpc randconfig-001-20240703 clang-19 powerpc randconfig-002-20240703 gcc-13.2.0 powerpc randconfig-003-20240703 clang-15 powerpc64 randconfig-001-20240703 gcc-13.2.0 powerpc64 randconfig-002-20240703 gcc-13.2.0 powerpc64 randconfig-003-20240703 clang-19 riscv allnoconfig gcc-13.2.0 riscv randconfig-001-20240703 clang-19 riscv randconfig-002-20240703 gcc-13.2.0 s390 allnoconfig clang-19 s390 randconfig-001-20240703 clang-15 s390 randconfig-002-20240703 clang-19 sh allnoconfig gcc-13.2.0 sh randconfig-001-20240703 gcc-13.2.0 sh randconfig-002-20240703 gcc-13.2.0 sparc64 randconfig-001-20240703 gcc-13.2.0 sparc64 randconfig-002-20240703 gcc-13.2.0 um allnoconfig clang-17 um randconfig-001-20240703 clang-19 um randconfig-002-20240703 clang-19 x86_64 allnoconfig clang-18 x86_64 allyesconfig clang-18 x86_64 buildonly-randconfig-001-20240704 clang-18 x86_64 buildonly-randconfig-002-20240704 gcc-12 x86_64 buildonly-randconfig-003-20240704 clang-18 x86_64 buildonly-randconfig-004-20240704 gcc-13 x86_64 buildonly-randconfig-005-20240704 gcc-12 x86_64 buildonly-randconfig-006-20240704 gcc-13 x86_64 defconfig gcc-13 x86_64 randconfig-001-20240704 clang-18 x86_64 randconfig-002-20240704 gcc-11 x86_64 randconfig-003-20240704 clang-18 x86_64 randconfig-005-20240704 gcc-13 x86_64 rhel-8.3-rust clang-18 xtensa allnoconfig gcc-13.2.0 xtensa randconfig-001-20240703 gcc-13.2.0 xtensa randconfig-002-20240703 gcc-13.2.0 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki . X-CID-CACHE: Type:Local,Time:202407040836+08,HitQuantity:1 X-ns-mid: postfix-6685EF39-6795893 From: liuh To: trondmy@kernel.org, anna@kernel.org Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, liuh Subject: [PATCH] NFS: AIO doesn't require revert iterator Date: Thu, 4 Jul 2024 08:40:02 +0800 Message-ID: <20240704004002.5787-1-liuhuan01@kylinos.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267319 org.kernel.vger.linux-nfs:86557 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-nfs Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail For AIO, nfs_direct_wait return -EIOCBQUEUED would be expected. Revert iter is redundant. Signed-off-by: liuh --- fs/nfs/direct.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 90079ca13..1483f1965 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -469,7 +469,8 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, stru= ct iov_iter *iter, requested -=3D result; iocb->ki_pos +=3D result; } - iov_iter_revert(iter, requested); + if (is_sync_kiocb(iocb)) + iov_iter_revert(iter, requested); } else { result =3D requested; } @@ -1028,7 +1029,8 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, s= truct iov_iter *iter, /* XXX: should check the generic_write_sync retval */ generic_write_sync(iocb, result); } - iov_iter_revert(iter, requested); + if (is_sync_kiocb(iocb)) + iov_iter_revert(iter, requested); } else { result =3D requested; } --=20 2.27.0 . From: Chen Ridong To: , , , CC: , Subject: [PATCH v3 -next] cgroup/rstat: add force idle show helper Date: Thu, 4 Jul 2024 00:50:07 +0000 Message-ID: <20240704005007.1400414-1-chenridong@huawei.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267320 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.cgroups Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In the function cgroup_base_stat_cputime_show, there are five instances of #ifdef, which makes the code not concise. To address this, add the function cgroup_force_idle_show to make the code more succinct. Signed-off-by: Chen Ridong --- kernel/cgroup/rstat.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index fb8b49437573..1568558e36e5 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -594,49 +594,45 @@ static void root_cgroup_cputime(struct cgroup_base_stat *bstat) } } + +static void cgroup_force_idle_show(struct seq_file *seq, struct cgroup_base_stat *bstat) +{ +#ifdef CONFIG_SCHED_CORE + u64 forceidle_time = bstat->forceidle_sum; + + do_div(forceidle_time, NSEC_PER_USEC); + seq_printf(seq, "core_sched.force_idle_usec %llu\n", forceidle_time); +#endif +} + void cgroup_base_stat_cputime_show(struct seq_file *seq) { struct cgroup *cgrp = seq_css(seq)->cgroup; u64 usage, utime, stime; - struct cgroup_base_stat bstat; -#ifdef CONFIG_SCHED_CORE - u64 forceidle_time; -#endif if (cgroup_parent(cgrp)) { cgroup_rstat_flush_hold(cgrp); usage = cgrp->bstat.cputime.sum_exec_runtime; cputime_adjust(&cgrp->bstat.cputime, &cgrp->prev_cputime, &utime, &stime); -#ifdef CONFIG_SCHED_CORE - forceidle_time = cgrp->bstat.forceidle_sum; -#endif cgroup_rstat_flush_release(cgrp); } else { - root_cgroup_cputime(&bstat); - usage = bstat.cputime.sum_exec_runtime; - utime = bstat.cputime.utime; - stime = bstat.cputime.stime; -#ifdef CONFIG_SCHED_CORE - forceidle_time = bstat.forceidle_sum; -#endif + root_cgroup_cputime(&cgrp->bstat); + usage = cgrp->bstat.cputime.sum_exec_runtime; + utime = cgrp->bstat.cputime.utime; + stime = cgrp->bstat.cputime.stime; } do_div(usage, NSEC_PER_USEC); do_div(utime, NSEC_PER_USEC); do_div(stime, NSEC_PER_USEC); -#ifdef CONFIG_SCHED_CORE - do_div(forceidle_time, NSEC_PER_USEC); -#endif seq_printf(seq, "usage_usec %llu\n" "user_usec %llu\n" "system_usec %llu\n", usage, utime, stime); -#ifdef CONFIG_SCHED_CORE - seq_printf(seq, "core_sched.force_idle_usec %llu\n", forceidle_time); -#endif + cgroup_force_idle_show(seq, &cgrp->bstat); } /* Add bpf kfuncs for cgroup_rstat_updated() and cgroup_rstat_flush() */ -- 2.34.1 . From: Georgi Djakov To: , CC: , , , , , , , Subject: [PATCH] iommu/arm-smmu-qcom: Register the TBU driver in qcom_smmu_impl_init Date: Wed, 3 Jul 2024 18:07:59 -0700 Message-ID: <20240704010759.507798-1-quic_c_gdjako@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267322 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.iommu,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-arm-msm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Currently the TBU driver will only probe when CONFIG_ARM_SMMU_QCOM_DEBUG is enabled. The driver not probing would prevent the platform to reach sync_state and the system will remain in sub-optimal power consumption mode while waiting for all consumer drivers to probe. To address this, let's register the TBU driver in qcom_smmu_impl_init(), so that it can probe, but still enable its functionality only when the debug option in Kconfig is enabled. Reported-by: Dmitry Baryshkov Closes: https://lore.kernel.org/r/CAA8EJppcXVu72OSo+OiYEiC1HQjP3qCwKMumOsUhcn6Czj0URg@mail.gmail.com Fixes: 414ecb030870 ("iommu/arm-smmu-qcom-debug: Add support for TBUs") Signed-off-by: Georgi Djakov --- .../iommu/arm/arm-smmu/arm-smmu-qcom-debug.c | 17 +------- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 39 +++++++++++++++++++ drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h | 2 + 3 files changed, 42 insertions(+), 16 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c index ef93f825f11f..548783f3f8e8 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c @@ -464,7 +464,7 @@ irqreturn_t qcom_smmu_context_fault(int irq, void *dev) return ret; } -static int qcom_tbu_probe(struct platform_device *pdev) +int qcom_tbu_probe(struct platform_device *pdev) { struct of_phandle_args args = { .args_count = 2 }; struct device_node *np = pdev->dev.of_node; @@ -506,18 +506,3 @@ static int qcom_tbu_probe(struct platform_device *pdev) return 0; } - -static const struct of_device_id qcom_tbu_of_match[] = { - { .compatible = "qcom,sc7280-tbu" }, - { .compatible = "qcom,sdm845-tbu" }, - { } -}; - -static struct platform_driver qcom_tbu_driver = { - .driver = { - .name = "qcom_tbu", - .of_match_table = qcom_tbu_of_match, - }, - .probe = qcom_tbu_probe, -}; -builtin_platform_driver(qcom_tbu_driver); diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c index 971c6a2e592b..36c6b36ad4ff 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c @@ -8,6 +8,8 @@ #include #include #include +#include +#include #include "arm-smmu.h" #include "arm-smmu-qcom.h" @@ -562,10 +564,47 @@ static struct acpi_platform_list qcom_acpi_platlist[] = { }; #endif +static int qcom_smmu_tbu_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + int ret; + + if (IS_ENABLED(CONFIG_ARM_SMMU_QCOM_DEBUG)) { + ret = qcom_tbu_probe(pdev); + if (ret) + return ret; + } + + if (dev->pm_domain) { + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + } + + return 0; +} + +static const struct of_device_id qcom_smmu_tbu_of_match[] = { + { .compatible = "qcom,sc7280-tbu" }, + { .compatible = "qcom,sdm845-tbu" }, + { } +}; + +static struct platform_driver qcom_smmu_tbu_driver = { + .driver = { + .name = "qcom_tbu", + .of_match_table = qcom_smmu_tbu_of_match, + }, + .probe = qcom_smmu_tbu_probe, +}; + struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu) { const struct device_node *np = smmu->dev->of_node; const struct of_device_id *match; + static u8 tbu_registered; + + if (!tbu_registered++) + platform_driver_register(&qcom_smmu_tbu_driver); #ifdef CONFIG_ACPI if (np == NULL) { diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h index 9bb3ae7d62da..3c134d1a6277 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h @@ -34,8 +34,10 @@ irqreturn_t qcom_smmu_context_fault(int irq, void *dev); #ifdef CONFIG_ARM_SMMU_QCOM_DEBUG void qcom_smmu_tlb_sync_debug(struct arm_smmu_device *smmu); +int qcom_tbu_probe(struct platform_device *pdev); #else static inline void qcom_smmu_tlb_sync_debug(struct arm_smmu_device *smmu) { } +static inline int qcom_tbu_probe(struct platform_device *pdev) { return -EINVAL; } #endif #endif /* _ARM_SMMU_QCOM_H */ . Date: Wed, 3 Jul 2024 18:17:45 -0700 Message-Id: <20240704011745.1021288-1-irogers@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Subject: [PATCH v1] perf dso: Fix address sanitizer build From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Suzuki K Poulose , Mike Leach , James Clark , John Garry , Will Deacon , Leo Yan , Athira Rajeev , Yunseong Kim , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267325 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-perf-users Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Various files had been missed from having accessor functions added for the sake of dso reference count checking. Add the function calls and missing dso accessor functions. Fixes: ee756ef7491e ("perf dso: Add reference count checking and accessor functions") Signed-off-by: Ian Rogers --- Part of this fix was previously sent in unmerged change: https://lore.kernel.org/lkml/20240629045350.285243-4-irogers@google.com/ --- .../arch/powerpc/util/skip-callchain-idx.c | 8 ++++---- tools/perf/ui/gtk/annotate.c | 5 +++-- tools/perf/util/cs-etm.c | 10 +++++----- tools/perf/util/disasm.c | 10 +++++----- tools/perf/util/dso.h | 10 ++++++++++ tools/perf/util/srcline.c | 12 ++++++------ tools/perf/util/symbol.c | 15 ++++++++------- tools/perf/util/unwind-libdw.c | 12 ++++++------ tools/perf/util/unwind-libunwind-local.c | 18 +++++++++--------- 9 files changed, 56 insertions(+), 44 deletions(-) diff --git a/tools/perf/arch/powerpc/util/skip-callchain-idx.c b/tools/perf/arch/powerpc/util/skip-callchain-idx.c index 5f3edb3004d8..356786432fd3 100644 --- a/tools/perf/arch/powerpc/util/skip-callchain-idx.c +++ b/tools/perf/arch/powerpc/util/skip-callchain-idx.c @@ -159,9 +159,9 @@ static int check_return_addr(struct dso *dso, u64 map_start, Dwarf_Addr pc) Dwarf_Addr start = pc; Dwarf_Addr end = pc; bool signalp; - const char *exec_file = dso->long_name; + const char *exec_file = dso__long_name(dso); - dwfl = dso->dwfl; + dwfl = RC_CHK_ACCESS(dso)->dwfl; if (!dwfl) { dwfl = dwfl_begin(&offline_callbacks); @@ -183,7 +183,7 @@ static int check_return_addr(struct dso *dso, u64 map_start, Dwarf_Addr pc) dwfl_end(dwfl); goto out; } - dso->dwfl = dwfl; + RC_CHK_ACCESS(dso)->dwfl = dwfl; } mod = dwfl_addrmodule(dwfl, pc); @@ -267,7 +267,7 @@ int arch_skip_callchain_idx(struct thread *thread, struct ip_callchain *chain) rc = check_return_addr(dso, map__start(al.map), ip); pr_debug("[DSO %s, sym %s, ip 0x%" PRIx64 "] rc %d\n", - dso->long_name, al.sym->name, ip, rc); + dso__long_name(dso), al.sym->name, ip, rc); if (rc == 0) { /* diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c index 93ce3d47e47e..6da24aa039eb 100644 --- a/tools/perf/ui/gtk/annotate.c +++ b/tools/perf/ui/gtk/annotate.c @@ -180,13 +180,14 @@ static int symbol__gtk_annotate(struct map_symbol *ms, struct evsel *evsel, GtkWidget *tab_label; int err; - if (dso->annotate_warned) + if (dso__annotate_warned(dso)) return -1; err = symbol__annotate(ms, evsel, NULL); if (err) { char msg[BUFSIZ]; - dso->annotate_warned = true; + + dso__set_annotate_warned(dso); symbol__strerror_disassemble(ms, err, msg, sizeof(msg)); ui__error("Couldn't annotate %s: %s\n", sym->name, msg); return -1; diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 32818bd7cd17..5e9fbcfad7d4 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -1013,7 +1013,7 @@ static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u8 trace_chan_id, if (!dso) goto out; - if (dso->data.status == DSO_DATA_STATUS_ERROR && + if (dso__data(dso)->status == DSO_DATA_STATUS_ERROR && dso__data_status_seen(dso, DSO_DATA_STATUS_SEEN_ITRACE)) goto out; @@ -1027,11 +1027,11 @@ static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u8 trace_chan_id, if (len <= 0) { ui__warning_once("CS ETM Trace: Missing DSO. Use 'perf archive' or debuginfod to export data from the traced system.\n" " Enable CONFIG_PROC_KCORE or use option '-k /path/to/vmlinux' for kernel symbols.\n"); - if (!dso->auxtrace_warned) { + if (!dso__auxtrace_warned(dso)) { pr_err("CS ETM Trace: Debug data not found for address %#"PRIx64" in %s\n", - address, - dso->long_name ? dso->long_name : "Unknown"); - dso->auxtrace_warned = true; + address, + dso__long_name(dso) ? dso__long_name(dso) : "Unknown"); + dso__set_auxtrace_warned(dso); } goto out; } diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index 72aec8f61b94..e10558b79504 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -1199,7 +1199,7 @@ static int symbol__disassemble_bpf(struct symbol *sym, int ret; FILE *s; - if (dso->binary_type != DSO_BINARY_TYPE__BPF_PROG_INFO) + if (dso__binary_type(dso) != DSO_BINARY_TYPE__BPF_PROG_INFO) return SYMBOL_ANNOTATE_ERRNO__BPF_INVALID_FILE; pr_debug("%s: handling sym %s addr %" PRIx64 " len %" PRIx64 "\n", __func__, @@ -1226,14 +1226,14 @@ static int symbol__disassemble_bpf(struct symbol *sym, info.arch = bfd_get_arch(bfdf); info.mach = bfd_get_mach(bfdf); - info_node = perf_env__find_bpf_prog_info(dso->bpf_prog.env, - dso->bpf_prog.id); + info_node = perf_env__find_bpf_prog_info(dso__bpf_prog(dso)->env, + dso__bpf_prog(dso)->id); if (!info_node) { ret = SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF; goto out; } info_linear = info_node->info_linear; - sub_id = dso->bpf_prog.sub_id; + sub_id = dso__bpf_prog(dso)->sub_id; info.buffer = (void *)(uintptr_t)(info_linear->info.jited_prog_insns); info.buffer_length = info_linear->info.jited_prog_len; @@ -1244,7 +1244,7 @@ static int symbol__disassemble_bpf(struct symbol *sym, if (info_linear->info.btf_id) { struct btf_node *node; - node = perf_env__find_btf(dso->bpf_prog.env, + node = perf_env__find_btf(dso__bpf_prog(dso)->env, info_linear->info.btf_id); if (node) btf = btf__new((__u8 *)(node->data), diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index d72f3b8c37f6..878c1f441868 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -280,6 +280,16 @@ static inline void dso__set_annotate_warned(struct dso *dso) RC_CHK_ACCESS(dso)->annotate_warned = 1; } +static inline bool dso__auxtrace_warned(const struct dso *dso) +{ + return RC_CHK_ACCESS(dso)->auxtrace_warned; +} + +static inline void dso__set_auxtrace_warned(struct dso *dso) +{ + RC_CHK_ACCESS(dso)->auxtrace_warned = 1; +} + static inline struct auxtrace_cache *dso__auxtrace_cache(struct dso *dso) { return RC_CHK_ACCESS(dso)->auxtrace_cache; diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c index 51eb78993fe2..760742fd4a7d 100644 --- a/tools/perf/util/srcline.c +++ b/tools/perf/util/srcline.c @@ -288,7 +288,7 @@ static int inline_list__append_dso_a2l(struct dso *dso, struct inline_node *node, struct symbol *sym) { - struct a2l_data *a2l = dso->a2l; + struct a2l_data *a2l = dso__a2l(dso); struct symbol *inline_sym = new_inline_sym(dso, sym, a2l->funcname); char *srcline = NULL; @@ -304,11 +304,11 @@ static int addr2line(const char *dso_name, u64 addr, struct symbol *sym) { int ret = 0; - struct a2l_data *a2l = dso->a2l; + struct a2l_data *a2l = dso__a2l(dso); if (!a2l) { - dso->a2l = addr2line_init(dso_name); - a2l = dso->a2l; + a2l = addr2line_init(dso_name); + dso__set_a2l(dso, a2l); } if (a2l == NULL) { @@ -360,14 +360,14 @@ static int addr2line(const char *dso_name, u64 addr, void dso__free_a2l(struct dso *dso) { - struct a2l_data *a2l = dso->a2l; + struct a2l_data *a2l = dso__a2l(dso); if (!a2l) return; addr2line_cleanup(a2l); - dso->a2l = NULL; + dso__set_a2l(dso, NULL); } #else /* HAVE_LIBBFD_SUPPORT */ diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 478e922ce676..19eb623e0826 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -1607,7 +1607,7 @@ int dso__load_bfd_symbols(struct dso *dso, const char *debugfile) if (!bfd_check_format(abfd, bfd_object)) { pr_debug2("%s: cannot read %s bfd file.\n", __func__, - dso->long_name); + dso__long_name(dso)); goto out_close; } @@ -1640,12 +1640,13 @@ int dso__load_bfd_symbols(struct dso *dso, const char *debugfile) } if (i < symbols_count) { /* PE symbols can only have 4 bytes, so use .text high bits */ - dso->text_offset = section->vma - (u32)section->vma; - dso->text_offset += (u32)bfd_asymbol_value(symbols[i]); - dso->text_end = (section->vma - dso->text_offset) + section->size; + u64 text_offset = (section->vma - (u32)section->vma) + + (u32)bfd_asymbol_value(symbols[i]); + dso__set_text_offset(dso, text_offset); + dso__set_text_end(dso, (section->vma - text_offset) + section->size); } else { - dso->text_offset = section->vma - section->filepos; - dso->text_end = section->filepos + section->size; + dso__set_text_offset(dso, section->vma - section->filepos); + dso__set_text_end(dso, section->filepos + section->size); } } @@ -1671,7 +1672,7 @@ int dso__load_bfd_symbols(struct dso *dso, const char *debugfile) else len = section->size - sym->value; - start = bfd_asymbol_value(sym) - dso->text_offset; + start = bfd_asymbol_value(sym) - dso__text_offset(dso); symbol = symbol__new(start, len, bfd2elf_binding(sym), STT_FUNC, bfd_asymbol_name(sym)); if (!symbol) diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c index b38d322734b4..bde216e630d2 100644 --- a/tools/perf/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw.c @@ -29,8 +29,8 @@ static int __find_debuginfo(Dwfl_Module *mod __maybe_unused, void **userdata, const struct dso *dso = *userdata; assert(dso); - if (dso->symsrc_filename && strcmp (file_name, dso->symsrc_filename)) - *debuginfo_file_name = strdup(dso->symsrc_filename); + if (dso__symsrc_filename(dso) && strcmp(file_name, dso__symsrc_filename(dso))) + *debuginfo_file_name = strdup(dso__symsrc_filename(dso)); return -1; } @@ -66,7 +66,7 @@ static int __report_module(struct addr_location *al, u64 ip, * a different code in another DSO. So just use the map->start * directly to pick the correct one. */ - if (!strncmp(dso->long_name, "/tmp/jitted-", 12)) + if (!strncmp(dso__long_name(dso), "/tmp/jitted-", 12)) base = map__start(al->map); else base = map__start(al->map) - map__pgoff(al->map); @@ -83,15 +83,15 @@ static int __report_module(struct addr_location *al, u64 ip, if (!mod) { char filename[PATH_MAX]; - __symbol__join_symfs(filename, sizeof(filename), dso->long_name); - mod = dwfl_report_elf(ui->dwfl, dso->short_name, filename, -1, + __symbol__join_symfs(filename, sizeof(filename), dso__long_name(dso)); + mod = dwfl_report_elf(ui->dwfl, dso__short_name(dso), filename, -1, base, false); } if (!mod) { char filename[PATH_MAX]; if (dso__build_id_filename(dso, filename, sizeof(filename), false)) - mod = dwfl_report_elf(ui->dwfl, dso->short_name, filename, -1, + mod = dwfl_report_elf(ui->dwfl, dso__short_name(dso), filename, -1, base, false); } diff --git a/tools/perf/util/unwind-libunwind-local.c b/tools/perf/util/unwind-libunwind-local.c index a424eae6d308..f6a6f6a91030 100644 --- a/tools/perf/util/unwind-libunwind-local.c +++ b/tools/perf/util/unwind-libunwind-local.c @@ -363,7 +363,7 @@ static int read_unwind_spec_debug_frame(struct dso *dso, struct machine *machine, u64 *offset) { int fd; - u64 ofs = dso->data.debug_frame_offset; + u64 ofs = dso__data(dso)->debug_frame_offset; /* debug_frame can reside in: * - dso @@ -379,7 +379,7 @@ static int read_unwind_spec_debug_frame(struct dso *dso, } if (ofs <= 0) { - fd = open(dso->symsrc_filename, O_RDONLY); + fd = open(dso__symsrc_filename(dso), O_RDONLY); if (fd >= 0) { ofs = elf_section_offset(fd, ".debug_frame"); close(fd); @@ -407,21 +407,21 @@ static int read_unwind_spec_debug_frame(struct dso *dso, } } if (ofs > 0) { - if (dso->symsrc_filename != NULL) { + if (dso__symsrc_filename(dso) != NULL) { pr_warning( "%s: overwrite symsrc(%s,%s)\n", __func__, - dso->symsrc_filename, + dso__symsrc_filename(dso), debuglink); - zfree(&dso->symsrc_filename); + zfree(&dso__symsrc_filename(dso)); } - dso->symsrc_filename = debuglink; + dso__set_symsrc_filename(dso, debuglink); } else { free(debuglink); } } - dso->data.debug_frame_offset = ofs; + dso__data(dso)->debug_frame_offset = ofs; } *offset = ofs; @@ -486,7 +486,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi, if (ret < 0 && !read_unwind_spec_debug_frame(dso, ui->machine, &segbase)) { int fd = dso__data_get_fd(dso, ui->machine); - int is_exec = elf_is_exec(fd, dso->name); + int is_exec = elf_is_exec(fd, dso__name(dso)); u64 start = map__start(map); unw_word_t base = is_exec ? 0 : start; const char *symfile; @@ -494,7 +494,7 @@ find_proc_info(unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi, if (fd >= 0) dso__data_put_fd(dso); - symfile = dso->symsrc_filename ?: dso->name; + symfile = dso__symsrc_filename(dso) ?: dso__name(dso); memset(&di, 0, sizeof(di)); if (dwarf_find_debug_frame(0, &di, ip, base, symfile, start, map__end(map))) -- 2.45.2.803.g4e1b14247a-goog . From: Lance Yang To: akpm@linux-foundation.org Cc: dj456119@gmail.com, 21cnbao@gmail.com, ryan.roberts@arm.com, david@redhat.com, shy828301@gmail.com, ziy@nvidia.com, libang.li@antgroup.com, baolin.wang@linux.alibaba.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Lance Yang Subject: [PATCH v3 0/2] mm: introduce per-order mTHP split counters Date: Thu, 4 Jul 2024 09:29:03 +0800 Message-ID: <20240704012905.42971-1-ioworker0@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267331 org.kvack.linux-mm:202429 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi all, At present, the split counters in THP statistics no longer include PTE-mapped mTHP. Therefore, we want to introduce per-order mTHP split counters to monitor the frequency of mTHP splits. This will assist developers in better analyzing and optimizing system performance. /sys/kernel/mm/transparent_hugepage/hugepages-/stats split split_failed split_deferred --- Changes since v2 [2] ==================== - mm: add per-order mTHP split counters - Pick AB from Barry - thanks! - Pick RB from Baolin - thanks! - Pick RB from Ryan - thanks! - Make things more readable (per Barry and Baolin) - mm: add docs for per-order mTHP split counters - Pick RB from Barry - thanks! - Improve the doc as suggested by Ryan - Remove the outdated note (per Ryan) Changes since v1 [1] ==================== - mm: add per-order mTHP split counters - Update the changelog - Drop '_page' from mTHP split counter names (per David and Ryan) - Store the order of the folio in a variable and reuse it later (per Bang) - mm: add docs for per-order mTHP split counters - Improve the doc as suggested by Ryan [1] https://lore.kernel.org/linux-mm/20240424135148.30422-1-ioworker0@gmail.com [2] https://lore.kernel.org/linux-mm/20240628130750.73097-1-ioworker0@gmail.com Lance Yang (2): mm: add per-order mTHP split counters mm: add docs for per-order mTHP split counters Documentation/admin-guide/mm/transhuge.rst | 20 ++++++++++++++++---- include/linux/huge_mm.h | 3 +++ mm/huge_memory.c | 12 ++++++++++-- 3 files changed, 29 insertions(+), 6 deletions(-) base-commit: ec34ecf3924f09a694e5c7d8d7e785b82f67f9f0 -- 2.45.2 . From: Fanhui Meng To: kashyap.desai@broadcom.com, sumit.saxena@broadcom.com, shivasharan.srikanteshwara@broadcom.com, chandrakanth.patil@broadcom.com, martin.petersen@oracle.com, James.Bottomley@HansenPartnership.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [scsi-next v2 0/2] scsi: add megasas_dcmd_timeout helper Date: Thu, 4 Jul 2024 09:40:47 +0800 Message-Id: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267338 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-scsi Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patch set contains small cleanups for megaraid_sas. Patch 1 adds a new helper megasas_dcmd_timeout() to reduce duplicate code. Patch 2 makes dcmd_timeout_ocr_possible() static. Fanhui Meng (2): scsi: megaraid_sas: Add megasas_dcmd_timeout helper scsi: megaraid_sas: make dcmd_timeout_ocr_possible static drivers/scsi/megaraid/megaraid_sas.h | 2 + drivers/scsi/megaraid/megaraid_sas_base.c | 203 ++++------------------ 2 files changed, 38 insertions(+), 167 deletions(-) -- 2.25.1 . Date: Thu, 04 Jul 2024 09:45:30 +0800 From: kernel test robot To: "x86-ml" Cc: linux-kernel@vger.kernel.org Subject: [tip:x86/urgent] BUILD SUCCESS ac8b270b61d48fcc61f052097777e3b5e11591e0 Message-ID: <202407040928.QSEmpENb-lkp@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267345 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/urgent branch HEAD: ac8b270b61d48fcc61f052097777e3b5e11591e0 x86/bhi: Avoid warning in #DB handler due to BHI mitigation elapsed time: 743m configs tested: 59 configs skipped: 130 The following configs have been built successfully. More configs may be tested in the coming days. tested configs: alpha allnoconfig gcc-13.2.0 alpha allyesconfig gcc-13.2.0 arc allmodconfig gcc-13.2.0 arc allnoconfig gcc-13.2.0 arc allyesconfig gcc-13.2.0 arc axs101_defconfig gcc-13.2.0 arm allmodconfig gcc-13.2.0 arm allnoconfig gcc-13.2.0 arm allyesconfig gcc-13.2.0 arm h3600_defconfig gcc-13.2.0 arm64 allmodconfig gcc-13.2.0 arm64 allnoconfig gcc-13.2.0 csky allnoconfig gcc-13.2.0 i386 allmodconfig clang-18 i386 allnoconfig clang-18 i386 allyesconfig clang-18 i386 defconfig clang-18 loongarch allnoconfig gcc-13.2.0 m68k allnoconfig gcc-13.2.0 m68k atari_defconfig gcc-13.2.0 m68k stmark2_defconfig gcc-13.2.0 microblaze allnoconfig gcc-13.2.0 mips allnoconfig gcc-13.2.0 mips mtx1_defconfig gcc-13.2.0 mips rm200_defconfig gcc-13.2.0 nios2 allnoconfig gcc-13.2.0 openrisc allnoconfig gcc-13.2.0 openrisc defconfig gcc-13.2.0 parisc allnoconfig gcc-13.2.0 parisc defconfig gcc-13.2.0 powerpc allnoconfig gcc-13.2.0 powerpc asp8347_defconfig gcc-13.2.0 powerpc ep8248e_defconfig gcc-13.2.0 powerpc mpc834x_itxgp_defconfig gcc-13.2.0 powerpc ppc40x_defconfig gcc-13.2.0 riscv allnoconfig gcc-13.2.0 riscv defconfig gcc-13.2.0 s390 allmodconfig clang-19 s390 allnoconfig gcc-13.2.0 s390 allyesconfig clang-19 s390 defconfig gcc-13.2.0 sh allnoconfig gcc-13.2.0 sh defconfig gcc-13.2.0 sh edosk7760_defconfig gcc-13.2.0 sh rsk7264_defconfig gcc-13.2.0 sh rsk7269_defconfig gcc-13.2.0 sh sh7757lcr_defconfig gcc-13.2.0 sparc64 defconfig gcc-13.2.0 um allmodconfig gcc-13.2.0 um allnoconfig gcc-13.2.0 um allyesconfig gcc-13.2.0 um defconfig gcc-13.2.0 um i386_defconfig gcc-13.2.0 um x86_64_defconfig gcc-13.2.0 x86_64 allnoconfig clang-18 x86_64 allyesconfig clang-18 x86_64 defconfig clang-18 x86_64 rhel-8.3-rust clang-18 xtensa allnoconfig gcc-13.2.0 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki . From: Christian Marangi To: Pavel Machek , Lee Jones , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [PATCH 1/3] leds: leds-lp5569: Fix typo in driver name Date: Thu, 4 Jul 2024 03:55:40 +0200 Message-ID: <20240704015543.14495-1-ansuelsmth@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267349 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-leds Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Remove extra x from driver name as this was a typo from copy-paste error. Signed-off-by: Christian Marangi --- drivers/leds/leds-lp5569.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/leds/leds-lp5569.c b/drivers/leds/leds-lp5569.c index 7ccd8dd6026a..b7a74d6c19ca 100644 --- a/drivers/leds/leds-lp5569.c +++ b/drivers/leds/leds-lp5569.c @@ -529,7 +529,7 @@ MODULE_DEVICE_TABLE(of, of_lp5569_leds_match); static struct i2c_driver lp5569_driver = { .driver = { - .name = "lp5569x", + .name = "lp5569", .of_match_table = of_lp5569_leds_match, }, .probe = lp55xx_probe, -- 2.45.2 . From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers , Kan Liang Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Athira Rajeev Subject: [PATCH] perf annotate: Cache debuginfo for data type profiling Date: Wed, 3 Jul 2024 18:58:12 -0700 Message-ID: <20240704015812.2119457-1-namhyung@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267354 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-perf-users Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In find_data_type(), it creates and deletes a debug info whenver it tries to find data type for a sample. This is inefficient and it most likely accesses the same binary again and again. Let's add a single entry cache the debug info structure for the last DSO. Depending on sample data, it usually gives me 2~3x (and sometimes more) speed ups. Note that this will introduce a little difference in the output due to the order of checking stack operations. It used to check the stack ops before checking the availability of debug info but I moved it after the symbol check. So it'll report stack operations in DSOs without debug info as unknown. But I think it's ok and better to have the checking near the caching logic. Signed-off-by: Namhyung Kim --- tools/perf/util/annotate-data.c | 15 ++------------- tools/perf/util/annotate-data.h | 2 +- tools/perf/util/annotate.c | 29 +++++++++++++++++++++++++++++ tools/perf/util/annotate.h | 2 ++ tools/perf/util/session.c | 2 ++ 5 files changed, 36 insertions(+), 14 deletions(-) diff --git a/tools/perf/util/annotate-data.c b/tools/perf/util/annotate-data.c index 965da6c0b542..24c03475b3f2 100644 --- a/tools/perf/util/annotate-data.c +++ b/tools/perf/util/annotate-data.c @@ -1764,16 +1764,9 @@ static int find_data_type_die(struct data_loc_info *dloc, Dwarf_Die *type_die) */ struct annotated_data_type *find_data_type(struct data_loc_info *dloc) { - struct annotated_data_type *result = NULL; struct dso *dso = map__dso(dloc->ms->map); Dwarf_Die type_die; - dloc->di = debuginfo__new(dso__long_name(dso)); - if (dloc->di == NULL) { - pr_debug_dtp("cannot get the debug info\n"); - return NULL; - } - /* * The type offset is the same as instruction offset by default. * But when finding a global variable, the offset won't be valid. @@ -1783,13 +1776,9 @@ struct annotated_data_type *find_data_type(struct data_loc_info *dloc) dloc->fbreg = -1; if (find_data_type_die(dloc, &type_die) < 0) - goto out; - - result = dso__findnew_data_type(dso, &type_die); + return NULL; -out: - debuginfo__delete(dloc->di); - return result; + return dso__findnew_data_type(dso, &type_die); } static int alloc_data_type_histograms(struct annotated_data_type *adt, int nr_entries) diff --git a/tools/perf/util/annotate-data.h b/tools/perf/util/annotate-data.h index 0a57d9f5ee78..40c9377fa1a5 100644 --- a/tools/perf/util/annotate-data.h +++ b/tools/perf/util/annotate-data.h @@ -100,9 +100,9 @@ struct data_loc_info { u64 var_addr; u8 cpumode; struct annotated_op_loc *op; + struct debuginfo *di; /* These are used internally */ - struct debuginfo *di; int fbreg; bool fb_cfa; diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 1451caf25e77..821e4b2c3bcd 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -25,6 +25,7 @@ #include "srcline.h" #include "units.h" #include "debug.h" +#include "debuginfo.h" #include "annotate.h" #include "annotate-data.h" #include "evsel.h" @@ -2313,6 +2314,20 @@ u64 annotate_calc_pcrel(struct map_symbol *ms, u64 ip, int offset, return map__rip_2objdump(ms->map, addr); } +static struct debuginfo_cache { + struct dso *dso; + struct debuginfo *dbg; +} di_cache; + +void debuginfo_cache__delete(void) +{ + dso__put(di_cache.dso); + di_cache.dso = NULL; + + debuginfo__delete(di_cache.dbg); + di_cache.dbg = NULL; +} + /** * hist_entry__get_data_type - find data type for given hist entry * @he: hist entry @@ -2347,6 +2362,19 @@ struct annotated_data_type *hist_entry__get_data_type(struct hist_entry *he) return NULL; } + if (map__dso(ms->map) != di_cache.dso) { + dso__put(di_cache.dso); + di_cache.dso = dso__get(map__dso(ms->map)); + + debuginfo__delete(di_cache.dbg); + di_cache.dbg = debuginfo__new(dso__long_name(di_cache.dso)); + } + + if (di_cache.dbg == NULL) { + ann_data_stat.no_dbginfo++; + return NULL; + } + /* Make sure it has the disasm of the function */ if (symbol__annotate(ms, evsel, &arch) < 0) { ann_data_stat.no_insn++; @@ -2391,6 +2419,7 @@ struct annotated_data_type *hist_entry__get_data_type(struct hist_entry *he) .ip = ms->sym->start + dl->al.offset, .cpumode = he->cpumode, .op = op_loc, + .di = di_cache.dbg, }; if (!op_loc->mem_ref && op_loc->segment == INSN_SEG_NONE) diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index d5c821c22f79..0686af637ed9 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -540,4 +540,6 @@ struct annotated_basic_block { int annotate_get_basic_blocks(struct symbol *sym, s64 src, s64 dst, struct list_head *head); +void debuginfo_cache__delete(void); + #endif /* __PERF_ANNOTATE_H */ diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 5596bed1b8c8..f9072e003367 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -36,6 +36,7 @@ #include "util.h" #include "arch/common.h" #include "units.h" +#include "annotate.h" #include #ifdef HAVE_ZSTD_SUPPORT @@ -304,6 +305,7 @@ void perf_session__delete(struct perf_session *session) return; auxtrace__free(session); auxtrace_index__free(&session->auxtrace_index); + debuginfo_cache__delete(); perf_session__destroy_kernel_maps(session); perf_decomp__release_events(session->decomp_data.decomp); perf_env__exit(&session->header.env); -- 2.45.2.803.g4e1b14247a-goog . From: Frank Li To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , dmaengine@vger.kernel.org (open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Cc: imx@lists.linux.dev Subject: [PATCH v3 1/1] dt-bindings: fsl-qdma: allow compatible string fallback to fsl,ls1021a-qdma Date: Wed, 3 Jul 2024 22:08:02 -0400 Message-Id: <20240704020802.3371203-1-Frank.Li@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267359 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.kernel.vger.dmaengine,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The IP of QDMA ls1028/ls1043/ls1046/ is same as ls1021. So allow compatible string fallback to fsl,ls1021a-qdma. The difference is that ls1021a-qdma have 3 irqs, and other have 5 irqs. Fix below CHECK_DTB warning. arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dtb: dma-controller@8380000: compatible: ['fsl,ls1046a-qdma', 'fsl,ls1021a-qdma'] is too long Signed-off-by: Frank Li --- Change from v2 to v3 - previous patch missed a dependent change. https://lore.kernel.org/imx/20240701195717.1843041-1-Frank.Li@nxp.com/T/#u - Combine depedent change to one patch. Change from v1 to v2 - Change maxItems: 5 to minItems: 5. because maxItems: 5 already restrict at top interrupts: minItems: 2 maxItems: 5 --- --- .../devicetree/bindings/dma/fsl-qdma.yaml | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/fsl-qdma.yaml b/Documentation/devicetree/bindings/dma/fsl-qdma.yaml index 1b689a2529c87..9401b1f6300d4 100644 --- a/Documentation/devicetree/bindings/dma/fsl-qdma.yaml +++ b/Documentation/devicetree/bindings/dma/fsl-qdma.yaml @@ -11,11 +11,14 @@ maintainers: properties: compatible: - enum: - - fsl,ls1021a-qdma - - fsl,ls1028a-qdma - - fsl,ls1043a-qdma - - fsl,ls1046a-qdma + oneOf: + - const: fsl,ls1021a-qdma + - items: + - enum: + - fsl,ls1028a-qdma + - fsl,ls1043a-qdma + - fsl,ls1046a-qdma + - const: fsl,ls1021a-qdma reg: items: @@ -89,8 +92,16 @@ allOf: compatible: contains: enum: - - fsl,ls1021a-qdma + - fsl,ls1028a-qdma + - fsl,ls1043a-qdma + - fsl,ls1046a-qdma then: + properties: + interrupts: + minItems: 5 + interrupt-names: + minItems: 5 + else: properties: interrupts: maxItems: 3 -- 2.34.1 . From: Jiapeng Chong To: manivannan.sadhasivam@linaro.org Cc: kw@linux.com, kishon@kernel.org, arnd@arndb.de, gregkh@linuxfoundation.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Jiapeng Chong , Abaci Robot Subject: [PATCH -next v2] misc: pci_endpoint_test: Remove some unused functions Date: Thu, 4 Jul 2024 10:32:27 +0800 Message-Id: <20240704023227.87039-1-jiapeng.chong@linux.alibaba.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267368 org.kernel.vger.linux-pci:144871 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail These functions are defined in the pci_endpoint_test.c file, but not called elsewhere, so delete these unused functions. drivers/misc/pci_endpoint_test.c:144:19: warning: unused function 'pci_endpoint_test_bar_readl'. drivers/misc/pci_endpoint_test.c:150:20: warning: unused function 'pci_endpoint_test_bar_writel'. Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=9064 Signed-off-by: Jiapeng Chong --- Changes in v2: -Modify the branch name in the topic. drivers/misc/pci_endpoint_test.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c index edced893221e..3aaaf47fa4ee 100644 --- a/drivers/misc/pci_endpoint_test.c +++ b/drivers/misc/pci_endpoint_test.c @@ -144,18 +144,6 @@ static inline void pci_endpoint_test_writel(struct pci_endpoint_test *test, writel(value, test->base + offset); } -static inline u32 pci_endpoint_test_bar_readl(struct pci_endpoint_test *test, - int bar, int offset) -{ - return readl(test->bar[bar] + offset); -} - -static inline void pci_endpoint_test_bar_writel(struct pci_endpoint_test *test, - int bar, u32 offset, u32 value) -{ - writel(value, test->bar[bar] + offset); -} - static irqreturn_t pci_endpoint_test_irqhandler(int irq, void *dev_id) { struct pci_endpoint_test *test = dev_id; -- 2.20.1.7.g153144c . From: John Hubbard To: Shuah Khan Cc: "Jason A . Donenfeld" , Thomas Gleixner , Andy Lutomirski , Mark Brown , Vincenzo Frascino , Colin Ian King , Valentin Obst , linux-kselftest@vger.kernel.org, LKML , llvm@lists.linux.dev, John Hubbard Subject: [PATCH v4 0/3] selftests/vDSO: fix clang build errors, and Makefile cleanup Date: Wed, 3 Jul 2024 19:33:21 -0700 Message-ID: <20240704023324.83564-1-jhubbard@nvidia.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267370 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.llvm,org.kernel.vger.linux-kselftest Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi, This is basically a resend, with a rebase onto today's latest Linux main, in order to show that the patches are still relevant and correct. Changes since v3: 1. Rebased onto Linux 6.10-rc6+. Cover letter for v3: Jason A. Donenfeld, I've added you because I ended up looking through your latest "implement getrandom() in vDSO" series [1], which also touches this Makefile, so just a heads up about upcoming (minor) merge conflicts. Changes since v2: 1. Added two patches, both of which apply solely to the Makefile. These provide a smaller, cleaner, and more accurate Makefile. 2. Added Reviewed-by and Tested-by tags for the original patch, which fixes all of the clang errors and warnings for this selftest. 3. Removed an obsolete blurb from the commit description of the original patch, now that Valentin Obst LLVM build fix has been merged. John Hubbard (3): selftests/vDSO: fix clang build errors and warnings selftests/mm: remove partially duplicated "all:" target in Makefile selftests/vDSO: remove duplicate compiler invocations from Makefile tools/testing/selftests/vDSO/Makefile | 29 ++++++++----------- tools/testing/selftests/vDSO/parse_vdso.c | 16 ++++++---- .../selftests/vDSO/vdso_standalone_test_x86.c | 18 ++++++++++-- 3 files changed, 39 insertions(+), 24 deletions(-) base-commit: 8a9c6c40432e265600232b864f97d7c675e8be52 -- 2.45.2 . From: John Hubbard To: Shuah Khan Cc: John Stultz , Thomas Gleixner , Stephen Boyd , Anna-Maria Behnsen , Frederic Weisbecker , Valentin Obst , linux-kselftest@vger.kernel.org, LKML , llvm@lists.linux.dev, John Hubbard Subject: [PATCH v3] selftests/timers: remove unused irqcount variable Date: Wed, 3 Jul 2024 19:42:02 -0700 Message-ID: <20240704024202.84726-1-jhubbard@nvidia.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267376 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.llvm,org.kernel.vger.linux-kselftest Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail When building with clang, via: make LLVM=1 -C tools/testing/selftest ...clang warns about an unused irqcount variable. clang is correct: the variable is incremented and then ignored. Fix this by deleting the irqcount variable. Signed-off-by: John Hubbard --- Changes since v2: 1) Rebased onto Linux 6.10-rc6+ Changes since the first version: 1) Rebased onto Linux 6.10-rc1 thanks, John Hubbard tools/testing/selftests/timers/rtcpie.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/testing/selftests/timers/rtcpie.c b/tools/testing/selftests/timers/rtcpie.c index 4ef2184f1558..7c07edd0d450 100644 --- a/tools/testing/selftests/timers/rtcpie.c +++ b/tools/testing/selftests/timers/rtcpie.c @@ -29,7 +29,7 @@ static const char default_rtc[] = "/dev/rtc0"; int main(int argc, char **argv) { - int i, fd, retval, irqcount = 0; + int i, fd, retval; unsigned long tmp, data, old_pie_rate; const char *rtc = default_rtc; struct timeval start, end, diff; @@ -120,7 +120,6 @@ int main(int argc, char **argv) fprintf(stderr, " %d",i); fflush(stderr); - irqcount++; } /* Disable periodic interrupts */ base-commit: 8a9c6c40432e265600232b864f97d7c675e8be52 -- 2.45.2 . From: Cheng Ming Lin To: miquel.raynal@bootlin.com, vigneshr@ti.com Cc: richard@nod.at, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, alvinzhou@mxic.com.tw, leoyu@mxic.com.tw, Cheng Ming Lin Subject: [PATCH v2 0/2] Add support for Macronix flash Date: Thu, 4 Jul 2024 10:48:37 +0800 Message-Id: <20240704024839.241101-1-linchengming884@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267379 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-mtd Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Cheng Ming Lin Adding Device ID 2 for Macronix serial NAND flash. Adding support for flash with the postfix Z4I8. Cheng Ming Lin (2): mtd: spinand: macronix: Add support for reading Device ID 2 mtd: spinand: macronix: Add support for serial NAND flash drivers/mtd/nand/spi/macronix.c | 64 ++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 13 deletions(-) -- 2.25.1 . From: John Hubbard To: Shuah Khan Cc: Andrei Vagin , Andrei Vagin , Dmitry Safonov , Thomas Gleixner , Valentin Obst , linux-kselftest@vger.kernel.org, LKML , llvm@lists.linux.dev, John Hubbard , Muhammad Usama Anjum Subject: [PATCH v3] selftest/timerns: fix clang build failures for abs() calls Date: Wed, 3 Jul 2024 19:52:47 -0700 Message-ID: <20240704025247.86418-1-jhubbard@nvidia.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267383 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.llvm,org.kernel.vger.linux-kselftest Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail When building with clang, via: make LLVM=1 -C tools/testing/selftests ...clang warns about mismatches between the expected and required integer length being supplied to abs(3). Fix this by using the correct variant of abs(3): labs(3) or llabs(3), in these cases. Reviewed-by: Dmitry Safonov Reviewed-by: Muhammad Usama Anjum Signed-off-by: John Hubbard --- Hi, Changes since v2: 1) Commit description: removed the reference to Valentin Obst's patch being a prerequisite, now that that has been merged. 2) Rebased on Linux 6.10-rc6+. Changes since the first version: 1) Rebased onto Linux 6.10-rc1 2) Reviewed-by's added. thanks, John Hubbard tools/testing/selftests/timens/exec.c | 6 +++--- tools/testing/selftests/timens/timer.c | 2 +- tools/testing/selftests/timens/timerfd.c | 2 +- tools/testing/selftests/timens/vfork_exec.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/timens/exec.c b/tools/testing/selftests/timens/exec.c index e40dc5be2f66..d12ff955de0d 100644 --- a/tools/testing/selftests/timens/exec.c +++ b/tools/testing/selftests/timens/exec.c @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) for (i = 0; i < 2; i++) { _gettime(CLOCK_MONOTONIC, &tst, i); - if (abs(tst.tv_sec - now.tv_sec) > 5) + if (labs(tst.tv_sec - now.tv_sec) > 5) return pr_fail("%ld %ld\n", now.tv_sec, tst.tv_sec); } return 0; @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) for (i = 0; i < 2; i++) { _gettime(CLOCK_MONOTONIC, &tst, i); - if (abs(tst.tv_sec - now.tv_sec) > 5) + if (labs(tst.tv_sec - now.tv_sec) > 5) return pr_fail("%ld %ld\n", now.tv_sec, tst.tv_sec); } @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) /* Check that a child process is in the new timens. */ for (i = 0; i < 2; i++) { _gettime(CLOCK_MONOTONIC, &tst, i); - if (abs(tst.tv_sec - now.tv_sec - OFFSET) > 5) + if (labs(tst.tv_sec - now.tv_sec - OFFSET) > 5) return pr_fail("%ld %ld\n", now.tv_sec + OFFSET, tst.tv_sec); } diff --git a/tools/testing/selftests/timens/timer.c b/tools/testing/selftests/timens/timer.c index 5e7f0051bd7b..5b939f59dfa4 100644 --- a/tools/testing/selftests/timens/timer.c +++ b/tools/testing/selftests/timens/timer.c @@ -56,7 +56,7 @@ int run_test(int clockid, struct timespec now) return pr_perror("timerfd_gettime"); elapsed = new_value.it_value.tv_sec; - if (abs(elapsed - 3600) > 60) { + if (llabs(elapsed - 3600) > 60) { ksft_test_result_fail("clockid: %d elapsed: %lld\n", clockid, elapsed); return 1; diff --git a/tools/testing/selftests/timens/timerfd.c b/tools/testing/selftests/timens/timerfd.c index 9edd43d6b2c1..a4196bbd6e33 100644 --- a/tools/testing/selftests/timens/timerfd.c +++ b/tools/testing/selftests/timens/timerfd.c @@ -61,7 +61,7 @@ int run_test(int clockid, struct timespec now) return pr_perror("timerfd_gettime(%d)", clockid); elapsed = new_value.it_value.tv_sec; - if (abs(elapsed - 3600) > 60) { + if (llabs(elapsed - 3600) > 60) { ksft_test_result_fail("clockid: %d elapsed: %lld\n", clockid, elapsed); return 1; diff --git a/tools/testing/selftests/timens/vfork_exec.c b/tools/testing/selftests/timens/vfork_exec.c index beb7614941fb..5b8907bf451d 100644 --- a/tools/testing/selftests/timens/vfork_exec.c +++ b/tools/testing/selftests/timens/vfork_exec.c @@ -32,7 +32,7 @@ static void *tcheck(void *_args) for (i = 0; i < 2; i++) { _gettime(CLOCK_MONOTONIC, &tst, i); - if (abs(tst.tv_sec - now->tv_sec) > 5) { + if (labs(tst.tv_sec - now->tv_sec) > 5) { pr_fail("%s: in-thread: unexpected value: %ld (%ld)\n", args->tst_name, tst.tv_sec, now->tv_sec); return (void *)1UL; @@ -64,7 +64,7 @@ static int check(char *tst_name, struct timespec *now) for (i = 0; i < 2; i++) { _gettime(CLOCK_MONOTONIC, &tst, i); - if (abs(tst.tv_sec - now->tv_sec) > 5) + if (labs(tst.tv_sec - now->tv_sec) > 5) return pr_fail("%s: unexpected value: %ld (%ld)\n", tst_name, tst.tv_sec, now->tv_sec); } base-commit: 8a9c6c40432e265600232b864f97d7c675e8be52 -- 2.45.2 . From: En-Wei Wu To: kvalo@kernel.org, edumazet@google.com, davem@davemloft.net, en-wei.wu@canonical.com, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Cc: rickywu0421@gmail.com, syzbot+d6eb9cee2885ec06f5e3@syzkaller.appspotmail.com Subject: [PATCH] wifi: virt_wifi: avoid reporting connection success with wrong SSID Date: Thu, 4 Jul 2024 11:03:04 +0800 Message-ID: <20240704030304.16213-1-en-wei.wu@canonical.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267391 org.kernel.vger.linux-wireless:85689 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-wireless Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail When user issues a connection with a different SSID than the one virt_wifi has advertised, the __cfg80211_connect_result() will trigger the warning: WARN_ON(bss_not_found). The issue is because the connection code in virt_wifi does not check the SSID from user space (it only checks the BSSID), and virt_wifi will call cfg80211_connect_result() with WLAN_STATUS_SUCCESS even if the SSID is different from the one virt_wifi has advertised. Eventually cfg80211 won't be able to find the cfg80211_bss and generate the warning. Fixed it by checking the SSID (from user space) in the connection code. Fixes: c7cdba31ed8b ("mac80211-next: rtnetlink wifi simulation device") Reported-by: syzbot+d6eb9cee2885ec06f5e3@syzkaller.appspotmail.com Signed-off-by: En-Wei Wu --- drivers/net/wireless/virtual/virt_wifi.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/virtual/virt_wifi.c b/drivers/net/wireless/virtual/virt_wifi.c index 6a84ec58d618..86a8f74be654 100644 --- a/drivers/net/wireless/virtual/virt_wifi.c +++ b/drivers/net/wireless/virtual/virt_wifi.c @@ -136,6 +136,9 @@ static struct ieee80211_supported_band band_5ghz = { /* Assigned at module init. Guaranteed locally-administered and unicast. */ static u8 fake_router_bssid[ETH_ALEN] __ro_after_init = {}; +#define VIRT_WIFI_SSID_LEN 8 +#define VIRT_WIFI_SSID "VirtWifi" + static void virt_wifi_inform_bss(struct wiphy *wiphy) { u64 tsf = div_u64(ktime_get_boottime_ns(), 1000); @@ -146,8 +149,8 @@ static void virt_wifi_inform_bss(struct wiphy *wiphy) u8 ssid[8]; } __packed ssid = { .tag = WLAN_EID_SSID, - .len = 8, - .ssid = "VirtWifi", + .len = VIRT_WIFI_SSID_LEN, + .ssid = VIRT_WIFI_SSID, }; informed_bss = cfg80211_inform_bss(wiphy, &channel_5ghz, @@ -213,6 +216,8 @@ struct virt_wifi_netdev_priv { struct net_device *upperdev; u32 tx_packets; u32 tx_failed; + u32 connect_requested_ssid_len; + u8 connect_requested_ssid[IEEE80211_MAX_SSID_LEN]; u8 connect_requested_bss[ETH_ALEN]; bool is_up; bool is_connected; @@ -224,11 +229,21 @@ static int virt_wifi_connect(struct wiphy *wiphy, struct net_device *netdev, struct cfg80211_connect_params *sme) { struct virt_wifi_netdev_priv *priv = netdev_priv(netdev); + u32 ssid_len; bool could_schedule; if (priv->being_deleted || !priv->is_up) return -EBUSY; + if (!sme->ssid) { + wiphy_err(wiphy, "invalid SSID\n"); + return -EINVAL; + } + + ssid_len = min_t(u32, sme->ssid_len, IEEE80211_MAX_SSID_LEN); + priv->connect_requested_ssid_len = ssid_len; + memcpy(priv->connect_requested_ssid, sme->ssid, ssid_len); + could_schedule = schedule_delayed_work(&priv->connect, HZ * 2); if (!could_schedule) return -EBUSY; @@ -252,12 +267,15 @@ static void virt_wifi_connect_complete(struct work_struct *work) container_of(work, struct virt_wifi_netdev_priv, connect.work); u8 *requested_bss = priv->connect_requested_bss; bool right_addr = ether_addr_equal(requested_bss, fake_router_bssid); + bool right_ssid = (priv->connect_requested_ssid_len == VIRT_WIFI_SSID_LEN ? + !memcmp(priv->connect_requested_ssid, VIRT_WIFI_SSID, + priv->connect_requested_ssid_len) : false); u16 status = WLAN_STATUS_SUCCESS; if (is_zero_ether_addr(requested_bss)) requested_bss = NULL; - if (!priv->is_up || (requested_bss && !right_addr)) + if (!priv->is_up || (requested_bss && !right_addr) || !right_ssid) status = WLAN_STATUS_UNSPECIFIED_FAILURE; else priv->is_connected = true; -- 2.43.0 . From: John Hubbard To: Shuah Khan Cc: Nathan Chancellor , Nick Desaulniers , Bill Wendling , Ryan Roberts , Justin Stitt , Muhammad Usama Anjum , linux-kselftest@vger.kernel.org, llvm@lists.linux.dev, LKML , John Hubbard Subject: [RFC PATCH] selftests: introduce and use SELFTESTS_CC_IS_CLANG instead of LLVM Date: Wed, 3 Jul 2024 20:04:52 -0700 Message-ID: <20240704030452.88793-1-jhubbard@nvidia.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267392 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.llvm,org.kernel.vger.linux-kselftest Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Current practice in the selftests Makefiles is to use $(LLVM) as a way to decide if clang is being used as the compiler (and/or the linker front end). Unfortunately, this does not cover all of the use cases: 1) CC could have been set within selftests/lib.mk, by inferring it from LLVM==1, or 2) CC could have been set externally, such as when cross compiling. Solution: In order to allow subsystem selftests to more accurately control clang-specific behavior, such as compiler options, provide a new Makefile variable: SELFTESTS_CC_IS_CLANG. If $(CC) contains an invocation of clang in any form, then SELFTESTS_CC_IS_CLANG will be non-empty. SELFTESTS_CC_IS_CLANG does not specify which linker is being used. However, it can still help with linker options, because $(CC) is often used to do both the compile and link steps (often in the same step). Signed-off-by: John Hubbard --- Hi, If this looks reasonable, I'll break it up into separate patches and post it as a non-RFC. thanks, John Hubbard tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/fchmodat2/Makefile | 12 +++++++----- tools/testing/selftests/hid/Makefile | 2 +- tools/testing/selftests/lib.mk | 15 +++++++++++++++ tools/testing/selftests/openat2/Makefile | 16 +++++++++------- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index dd49c1d23a60..6b924297ab71 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -55,7 +55,7 @@ progs/test_sk_lookup.c-CFLAGS := -fno-strict-aliasing progs/timer_crash.c-CFLAGS := -fno-strict-aliasing progs/test_global_func9.c-CFLAGS := -fno-strict-aliasing -ifneq ($(LLVM),) +ifeq ($(SELFTESTS_CC_IS_CLANG),) # Silence some warnings when compiled with clang CFLAGS += -Wno-unused-command-line-argument endif diff --git a/tools/testing/selftests/fchmodat2/Makefile b/tools/testing/selftests/fchmodat2/Makefile index 4373cea79b79..d00b01be5d96 100644 --- a/tools/testing/selftests/fchmodat2/Makefile +++ b/tools/testing/selftests/fchmodat2/Makefile @@ -2,14 +2,16 @@ CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined $(KHDR_INCLUDES) +TEST_GEN_PROGS := fchmodat2_test + +include ../lib.mk + # gcc requires -static-libasan in order to ensure that Address Sanitizer's # library is the first one loaded. However, clang already statically links the # Address Sanitizer if -fsanitize is specified. Therefore, simply omit # -static-libasan for clang builds. -ifeq ($(LLVM),) +# This check must be done after including ../lib.mk, in order to pick up the +# correct value of SELFTESTS_CC_IS_CLANG. +ifeq ($(SELFTESTS_CC_IS_CLANG),) CFLAGS += -static-libasan endif - -TEST_GEN_PROGS := fchmodat2_test - -include ../lib.mk diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests/hid/Makefile index 2b5ea18bde38..734a53dc8ad9 100644 --- a/tools/testing/selftests/hid/Makefile +++ b/tools/testing/selftests/hid/Makefile @@ -27,7 +27,7 @@ CFLAGS += -I$(OUTPUT)/tools/include LDLIBS += -lelf -lz -lrt -lpthread # Silence some warnings when compiled with clang -ifneq ($(LLVM),) +ifeq ($(SELFTESTS_CC_IS_CLANG),) CFLAGS += -Wno-unused-command-line-argument endif diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index 429535816dbd..f321ad5a1d0c 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -43,6 +43,21 @@ else CC := $(CROSS_COMPILE)gcc endif # LLVM +# SELFTESTS_CC_IS_CLANG allows subsystem selftests to more accurately control +# clang-specific behavior, such as compiler options. If CC is an invocation of +# clang in any form, then SELFTESTS_CC_IS_CLANG will be non-empty. Notes: +# +# 1) CC could have been set above, by inferring it from LLVM==1, or externally, +# from the CC shell environment variable. +# +# 2) SELFTESTS_CC_IS_CLANG does not specify which linker is being used. However, +# it can still help with linker options, if clang or gcc is used for the +# linker front end. +SELFTESTS_CC_IS_CLANG := +ifeq ($(findstring clang,$(CC)),clang) + SELFTESTS_CC_IS_CLANG := 1 +endif + ifeq (0,$(MAKELEVEL)) ifeq ($(OUTPUT),) OUTPUT := $(shell pwd) diff --git a/tools/testing/selftests/openat2/Makefile b/tools/testing/selftests/openat2/Makefile index 185dc76ebb5f..7acb85a8f2ac 100644 --- a/tools/testing/selftests/openat2/Makefile +++ b/tools/testing/selftests/openat2/Makefile @@ -3,16 +3,18 @@ CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined TEST_GEN_PROGS := openat2_test resolve_test rename_attack_test +LOCAL_HDRS += helpers.h + +include ../lib.mk + +$(TEST_GEN_PROGS): helpers.c + # gcc requires -static-libasan in order to ensure that Address Sanitizer's # library is the first one loaded. However, clang already statically links the # Address Sanitizer if -fsanitize is specified. Therefore, simply omit # -static-libasan for clang builds. -ifeq ($(LLVM),) +# This check must be done after including ../lib.mk, in order to pick up the +# correct value of SELFTESTS_CC_IS_CLANG. +ifeq ($(SELFTESTS_CC_IS_CLANG),) CFLAGS += -static-libasan endif - -LOCAL_HDRS += helpers.h - -include ../lib.mk - -$(TEST_GEN_PROGS): helpers.c base-commit: 9a5cd459be8a425d70cda1fa1c89af7875a35d17 -- 2.45.2 . From: Jiapeng Chong To: James.Bottomley@HansenPartnership.com Cc: martin.petersen@oracle.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Jiapeng Chong , Abaci Robot Subject: [PATCH -next v2] scsi: sd: Fix unsigned expression compared with zero in sd_spinup_disk() Date: Thu, 4 Jul 2024 11:14:37 +0800 Message-Id: <20240704031437.33338-1-jiapeng.chong@linux.alibaba.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267400 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-scsi Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The return value from the call to scsi_execute_cmd() is int. However, the return value is being assigned to an unsigned int variable 'the_result', so making 'the_result' an int. ./drivers/scsi/sd.c:2333:6-16: WARNING: Unsigned expression compared with zero: the_result > 0. Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=9463 Signed-off-by: Jiapeng Chong --- Changes in v2: -Refine the title to make it more precise. drivers/scsi/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 979795dad62b..ade8c6cca295 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -2396,7 +2396,7 @@ sd_spinup_disk(struct scsi_disk *sdkp) static const u8 cmd[10] = { TEST_UNIT_READY }; unsigned long spintime_expire = 0; int spintime, sense_valid = 0; - unsigned int the_result; + int the_result; struct scsi_sense_hdr sshdr; struct scsi_failure failure_defs[] = { /* Do not retry Medium Not Present */ -- 2.20.1.7.g153144c . From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] i2c: add debug message for detected HostNotify alerts Date: Thu, 4 Jul 2024 05:28:59 +0200 Message-ID: <20240704032940.4268-2-wsa+renesas@sang-engineering.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267408 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-i2c,org.kernel.vger.linux-renesas-soc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Setting up HostNotify can be tricky. Support debugging by stating when a HostNotify alert was received independent of the irq being mapped. Especially useful with the in-kernel i2c testunit. Update documentation as well. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti --- Changes since v1: * added docs * added tags (Thanks, Andi!) Documentation/i2c/slave-testunit-backend.rst | 5 +++++ drivers/i2c/i2c-core-base.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Documentation/i2c/slave-testunit-backend.rst b/Documentation/i2c/slave-testunit-backend.rst index 0df60c7c0be4..37142a48ab35 100644 --- a/Documentation/i2c/slave-testunit-backend.rst +++ b/Documentation/i2c/slave-testunit-backend.rst @@ -99,6 +99,11 @@ Example to send a notification after 10ms:: # i2cset -y 0 0x30 0x02 0x42 0x64 0x01 i +If the host controller supports HostNotify, this message with debug level +should appear (Linux 6.11 and later):: + + Detected HostNotify from address 0x30 + 0x03 SMBUS_BLOCK_PROC_CALL ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index db0d1ac82910..b94594e90a66 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -1468,6 +1468,8 @@ int i2c_handle_smbus_host_notify(struct i2c_adapter *adap, unsigned short addr) if (!adap) return -EINVAL; + dev_dbg(&adap->dev, "Detected HostNotify from address 0x%02x", addr); + irq = irq_find_mapping(adap->host_notify_domain, addr); if (irq <= 0) return -ENXIO; -- 2.43.0 . From: David Lin To: linux-wireless@vger.kernel.org Cc: linux-kernel@vger.kernel.org, briannorris@chromium.org, kvalo@kernel.org, francesco@dolcini.it, tsung-hsien.hsieh@nxp.com, David Lin , rafael.beims@toradex.com, Francesco Dolcini Subject: [PATCH v11 0/2] wifi: mwifiex: add code to support host mlme Date: Thu, 4 Jul 2024 11:29:59 +0800 Message-Id: <20240704033001.603419-1-yu-hao.lin@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267409 org.kernel.vger.linux-wireless:85691 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-wireless Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail With host mlme: Tested-by: #Verdin AM62 IW416 SD Without host mlme: Tested-by: Francesco Dolcini # 88W8997-SD This series add host based MLME support to the mwifiex driver, this enables WPA3 support in both client and AP mode. To enable WPA3, a firmware with corresponding V2 Key API support is required. The feature is currently only enabled on NXP IW416 (SD8978), and it was internally validated by NXP QA team. Other NXP Wi-Fi chips supported in current mwifiex are not affected by this change. v11: - add proper and useful comment for mwifiex_cfg80211_probe_client(). - modify 'mwifiex_mgmt_stypes' to allow multi-adapters with different setting of host_mlme_enbaled. v10: - Use eth_broadcast_addr() to set the broadcast address. - Add comment for constant used for the length of FW special 4 address management header. - Check host_mlme_enabled to decide if creating host_mlme_workqueue or not. - Use cpu_to_le16 instead of casting via (__force __le16). - Change the abbreviation "disasso" to "disassoc" of the printout message. v9: - Remove redundent code. - Remove unnecessary goto target. v8: - Separate 6/12 from patch v7. As it's a bug fix not part of host MLME feature. - Rearrnage MLME feature into 2 patches: a. Add host based MLME support for STA mode. b. Add host based MLME support for AP mode. v7: - Fix regression: Downlink throughput degraded by 70% in AP mode. - Fix issue: On STAUT, kernel Oops occurs when there is no association response from AP. - Fix issue: On STAUT, if AP leaves abruptly and deauth is missing, STA can't connect to AP anymore. - Fix regression: STA can't connect to AP when host_mlme is disabled (impact all chips). - Address reviewer comments. v6: - Correct mailing sequence. v5: - Add host base MLME support to enable WPA3 functionalities for both STA and AP mode. - This feature (WPA3) required a firmware with corresponding Key API V2 support. - QA validation and regression have been covered for IW416. - This feature (WPA3) is currently enabled and verified only for IW416. - Changelogs since patch V4: a. Add WPA3 support for AP mode. b. Bug fix: In WPA3 STA mode, deice gets disconnected from AP when group rekey occurs. c. Bug fix: STAUT doesn't send WMM IE in association request when associate to a WMM-AP. v4: - Refine code segment per review comment. - Add API to check firmware encryption key command version when host_mlme is enabled. v3: - Cleanup commit message. v2: - Fix checkpatch error (pwe[1] -> pwe[0]). - Move module parameter 'host_mlme' to mwifiex_sdio_device structure. Default only enable for IW416. - Disable advertising NL80211_FEATURE_SAE if host_mlme is not enabled. David Lin (2): wifi: mwifiex: add host mlme for client mode wifi: mwifiex: add host mlme for AP mode .../net/wireless/marvell/mwifiex/cfg80211.c | 404 +++++++++++++++++- drivers/net/wireless/marvell/mwifiex/cmdevt.c | 27 ++ drivers/net/wireless/marvell/mwifiex/decl.h | 23 + drivers/net/wireless/marvell/mwifiex/fw.h | 54 +++ drivers/net/wireless/marvell/mwifiex/init.c | 6 + drivers/net/wireless/marvell/mwifiex/ioctl.h | 5 + drivers/net/wireless/marvell/mwifiex/join.c | 66 ++- drivers/net/wireless/marvell/mwifiex/main.c | 62 +++ drivers/net/wireless/marvell/mwifiex/main.h | 17 + drivers/net/wireless/marvell/mwifiex/scan.c | 6 + drivers/net/wireless/marvell/mwifiex/sdio.c | 13 + drivers/net/wireless/marvell/mwifiex/sdio.h | 2 + .../wireless/marvell/mwifiex/sta_cmdresp.c | 2 + .../net/wireless/marvell/mwifiex/sta_event.c | 36 +- .../net/wireless/marvell/mwifiex/sta_ioctl.c | 2 +- drivers/net/wireless/marvell/mwifiex/sta_tx.c | 9 +- .../net/wireless/marvell/mwifiex/uap_cmd.c | 171 ++++++++ drivers/net/wireless/marvell/mwifiex/util.c | 104 +++++ 18 files changed, 992 insertions(+), 17 deletions(-) base-commit: 347bf38330c2971230d8206eb8b37ed36b54982d -- 2.34.1 . From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Lai Jiangshan , Tejun Heo , Juri Lelli , Waiman Long Subject: [PATCH V2 0/5] workqueue: Make the PWQ allocation and WQ enlistment atomic Date: Thu, 4 Jul 2024 11:49:09 +0800 Message-Id: <20240704034915.2164-1-jiangshanlai@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267416 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Lai Jiangshan The PWQ allocation and WQ enlistment are not within the same lock-held critical section; therefore, their states can become out of sync when the user modifies the unbound mask or if CPU hotplug events occur in the interim since those operations only update the WQs that are already in the list. Change from v1: Init rescuer's affinities as the wq's effective cpumask Cc: Tejun Heo Cc: Juri Lelli Cc: Waiman Long V1: https://lore.kernel.org/lkml/20240703033855.3373-1-jiangshanlai@gmail.com/ Lai Jiangshan (5): workqueue: Register sysfs after the whole creation of the new wq workqueue: Make rescuer initialization as the last step of the creation of a new wq workqueue: Move kthread_flush_worker() out of alloc_and_link_pwqs() workqueue: Put PWQ allocation and WQ enlistment in the same lock C.S. workqueue: Init rescuer's affinities as the wq's effective cpumask kernel/workqueue.c | 87 +++++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 40 deletions(-) -- 2.19.1.6.gb485710b . From: Oscar Salvador To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Peter Xu , Muchun Song , David Hildenbrand , SeongJae Park , Miaohe Lin , Michal Hocko , Matthew Wilcox , Christophe Leroy , Oscar Salvador Subject: [PATCH 00/45] hugetlb pagewalk unification Date: Thu, 4 Jul 2024 06:30:47 +0200 Message-ID: <20240704043132.28501-1-osalvador@suse.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267434 org.kvack.linux-mm:202459 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi all, During Peter's talk at the LSFMM, it was agreed that one of the things that need to be done in order to further integrate hugetlb into mm core, is to unify generic and hugetlb pagewalkers. I started with this one, which is unifying hugetlb into generic pagewalk, instead of having its hugetlb_entry entries. Which means that pmd_entry/pte_entry(for cont-pte) entries will also deal with hugetlb vmas as well, and so will new pud_entry entries since hugetlb can be pud mapped (devm pages as well but we seem not to care about those with the exception of hmm code). The outcome is this RFC. Before you continue, let me clarify certain points: This patchset is not yet finished, as there are things that 1) need more thought, 2) are still broken (like the hmm bits as I am clueless about that) 3) some paths have not been tested at all. The things I tested were: - memory-failure - smaps/numa_maps/pagemap (the latter only for pud/pmd, not cont-{pmd,ptes} - mempolicy on arm64 (for 64KB and 32M hugetlb pages) and on x86_64 (for 2MB and 1GB hugetlb pages). More tests need to be conducted, and I plan to borrow a pp64le machine to also carry out some tests there, but for now this is what my bandwith allowed me to do. I am well aware that there are two things that might scare people, one being the number of patches, and the other being the amount of code added. For the former, I will by no means ask anyone to review 45 patches, but since this patchset touches isolated paths (damon, mincore, hmm, task_mmu, memory-failure, mempolicy), I will point out some people that might be able to help me out with those different bits: - Miaohe for memory-failure bits - David for task_mmu bits - SeongJae Park for damon bits - Jerome for hmm bits - feel freel to join for the rest I think that that might be a good approach, and instead of having to review 45 patches, one has only to review at most 5 or 6. For the latter, there is an explanation: hugetlb operates on ptes (although it allocates puds/pmds and the operations work on that level too), which means that now that we will handle PUD/PMD-mapped hugetlb with {pud,pmd}_* operations, we need to introduce quite a few functions that do not exist yet and we need from now onwards. Although I am sending this out, this is not a "rfc ready material", as I said there are still things that need to be improved/fixed/tested, but I wanted to make it public nevertheless so we can gather some constructive feedback that helps us moving in the right direction and to also widen the discussions. So take this more of a "Hey, let me show what I am doing and call me out on things you consider wrong". Thanks in advance Oscar Salvador (45): arch/x86: Drop own definition of pgd,p4d_leaf mm: Add {pmd,pud}_huge_lock helper mm/pagewalk: Move vma_pgtable_walk_begin and vma_pgtable_walk_end upfront mm/pagewalk: Only call pud_entry when we have a pud leaf mm/pagewalk: Enable walk_pmd_range to handle cont-pmds mm/pagewalk: Do not try to split non-thp pud or pmd leafs arch/s390: Enable __s390_enable_skey_pmd to handle hugetlb vmas fs/proc: Enable smaps_pmd_entry to handle PMD-mapped hugetlb vmas mm: Implement pud-version functions for swap and vm_normal_page_pud fs/proc: Create smaps_pud_range to handle PUD-mapped hugetlb vmas fs/proc: Enable smaps_pte_entry to handle cont-pte mapped hugetlb vmas fs/proc: Enable pagemap_pmd_range to handle hugetlb vmas mm: Implement pud-version uffd functions fs/proc: Create pagemap_pud_range to handle PUD-mapped hugetlb vmas fs/proc: Adjust pte_to_pagemap_entry for hugetlb vmas fs/proc: Enable pagemap_scan_pmd_entry to handle hugetlb vmas mm: Implement pud-version for pud_mkinvalid and pudp_establish fs/proc: Create pagemap_scan_pud_entry to handle PUD-mapped hugetlb vmas fs/proc: Enable gather_pte_stats to handle hugetlb vmas fs/proc: Enable gather_pte_stats to handle cont-pte mapped hugetlb vmas fs/proc: Create gather_pud_stats to handle PUD-mapped hugetlb pages mm/mempolicy: Enable queue_folios_pmd to handle hugetlb vmas mm/mempolicy: Create queue_folios_pud to handle PUD-mapped hugetlb vmas mm/memory_failure: Enable check_hwpoisoned_pmd_entry to handle hugetlb vmas mm/memory-failure: Create check_hwpoisoned_pud_entry to handle PUD-mapped hugetlb vmas mm/damon: Enable damon_young_pmd_entry to handle hugetlb vmas mm/damon: Create damon_young_pud_entry to handle PUD-mapped hugetlb vmas mm/damon: Enable damon_mkold_pmd_entry to handle hugetlb vmas mm/damon: Create damon_mkold_pud_entry to handle PUD-mapped hugetlb vmas mm,mincore: Enable mincore_pte_range to handle hugetlb vmas mm/mincore: Create mincore_pud_range to handle PUD-mapped hugetlb vmas mm/hmm: Enable hmm_vma_walk_pmd, to handle hugetlb vmas mm/hmm: Enable hmm_vma_walk_pud to handle PUD-mapped hugetlb vmas arch/powerpc: Skip hugetlb vmas in subpage_mark_vma_nohuge arch/s390: Skip hugetlb vmas in thp_split_mm fs/proc: Make clear_refs_test_walk skip hugetlb vmas mm/lock: Make mlock_test_walk skip hugetlb vmas mm/madvise: Make swapin_test_walk skip hugetlb vmas mm/madvise: Make madvise_cold_test_walk skip hugetlb vmas mm/madvise: Make madvise_free_test_walk skip hugetlb vmas mm/migrate_device: Make migrate_vma_test_walk skip hugetlb vmas mm/memcontrol: Make mem_cgroup_move_test_walk skip hugetlb vmas mm/memcontrol: Make mem_cgroup_count_test_walk skip hugetlb vmas mm/hugetlb_vmemmap: Make vmemmap_test_walk skip hugetlb vmas mm: Delete all hugetlb_entry entries arch/arm64/include/asm/pgtable.h | 19 + arch/loongarch/include/asm/pgtable.h | 8 + arch/mips/include/asm/pgtable.h | 7 + arch/powerpc/include/asm/book3s/64/pgtable.h | 8 +- arch/powerpc/mm/book3s64/pgtable.c | 15 +- arch/powerpc/mm/book3s64/subpage_prot.c | 2 + arch/riscv/include/asm/pgtable.h | 15 + arch/s390/mm/gmap.c | 37 +- arch/x86/include/asm/pgtable.h | 199 +++++---- fs/proc/task_mmu.c | 434 ++++++++++++------- include/asm-generic/pgtable_uffd.h | 30 ++ include/linux/mm.h | 4 + include/linux/mm_inline.h | 34 ++ include/linux/pagewalk.h | 10 - include/linux/pgtable.h | 77 +++- include/linux/swapops.h | 27 ++ mm/damon/ops-common.c | 21 +- mm/damon/vaddr.c | 173 ++++---- mm/hmm.c | 69 +-- mm/hugetlb_vmemmap.c | 12 + mm/madvise.c | 36 ++ mm/memcontrol-v1.c | 24 + mm/memory-failure.c | 99 +++-- mm/memory.c | 51 +++ mm/mempolicy.c | 121 +++--- mm/migrate_device.c | 12 + mm/mincore.c | 46 +- mm/mlock.c | 12 + mm/mprotect.c | 10 - mm/pagewalk.c | 73 +--- mm/pgtable-generic.c | 21 + 31 files changed, 1089 insertions(+), 617 deletions(-) -- 2.26.2 . From: Vishnu Reddy To: krzysztof.kozlowski@linaro.org, s.nawrocki@samsung.com, alim.akhtar@samsung.com, linus.walleij@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, pankaj.dubey@samsung.com, ravi.patel@samsung.com, gost.dev@samsung.com Subject: [PATCH v3] pinctrl: samsung: Add support for pull-up and pull-down Date: Thu, 4 Jul 2024 09:56:29 +0530 Message-Id: <20240704042629.26151-1-vishnu.reddy@samsung.com> Content-Type: text/plain; charset="utf-8" References: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267477 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-gpio,org.kernel.vger.linux-samsung-soc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail gpiolib framework has the implementation of setting up the PUD configuration for GPIO pins but there is no driver support. Add support to handle the PUD configuration request from the userspace in samsung pinctrl driver. Signed-off-by: Vishnu Reddy --- drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 15 ++++ drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 15 ++++ drivers/pinctrl/samsung/pinctrl-samsung.c | 80 ++++++++++++++++++++ drivers/pinctrl/samsung/pinctrl-samsung.h | 24 ++++++ 4 files changed, 134 insertions(+) diff --git a/drivers/pinctrl/samsung/pinctrl-exynos-arm.c b/drivers/pinctrl/samsung/pinctrl-exynos-arm.c index 85ddf49a5188..426d1daacef2 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos-arm.c +++ b/drivers/pinctrl/samsung/pinctrl-exynos-arm.c @@ -40,6 +40,20 @@ static const struct samsung_pin_bank_type bank_type_alive = { #define S5P_OTHERS_RET_MMC (1 << 29) #define S5P_OTHERS_RET_UART (1 << 28) +/* + * s5pv210_pud_value_init: initialize the drvdata pud_val with s5pv210 pud values + * s5pv210_pull_disable: 0 + * s5pv210_pull_down_enable: 1 + * s5pv210_pull_up_enable: 2 + */ +static void s5pv210_pud_value_init(struct samsung_pinctrl_drv_data *drvdata) +{ + unsigned int i, *pud_val = drvdata->pud_val; + + for (i = 0; i < PUD_MAX; i++) + pud_val[i] = i; +} + static void s5pv210_retention_disable(struct samsung_pinctrl_drv_data *drvdata) { void __iomem *clk_base = (void __iomem *)drvdata->retention_ctrl->priv; @@ -133,6 +147,7 @@ static const struct samsung_pin_ctrl s5pv210_pin_ctrl[] __initconst = { .nr_banks = ARRAY_SIZE(s5pv210_pin_bank), .eint_gpio_init = exynos_eint_gpio_init, .eint_wkup_init = exynos_eint_wkup_init, + .pud_value_init = s5pv210_pud_value_init, .suspend = exynos_pinctrl_suspend, .resume = exynos_pinctrl_resume, .retention_data = &s5pv210_retention_data, diff --git a/drivers/pinctrl/samsung/pinctrl-s3c64xx.c b/drivers/pinctrl/samsung/pinctrl-s3c64xx.c index c5d92db4fdb1..cf57b0f16999 100644 --- a/drivers/pinctrl/samsung/pinctrl-s3c64xx.c +++ b/drivers/pinctrl/samsung/pinctrl-s3c64xx.c @@ -255,6 +255,20 @@ static int s3c64xx_irq_get_trigger(unsigned int type) return trigger; } +/* + * s3c64xx_pud_value_init: initialize the drvdata pud_val with s3c64xx pud values + * s3c64xx_pull_disable: 0 + * s3c64xx_pull_down_enable: 1 + * s3c64xx_pull_up_enable: 2 + */ +static void s3c64xx_pud_value_init(struct samsung_pinctrl_drv_data *drvdata) +{ + unsigned int i, *pud_val = drvdata->pud_val; + + for (i = 0; i < PUD_MAX; i++) + pud_val[i] = i; +} + static void s3c64xx_irq_set_handler(struct irq_data *d, unsigned int type) { /* Edge- and level-triggered interrupts need different handlers */ @@ -797,6 +811,7 @@ static const struct samsung_pin_ctrl s3c64xx_pin_ctrl[] __initconst = { .nr_banks = ARRAY_SIZE(s3c64xx_pin_banks0), .eint_gpio_init = s3c64xx_eint_gpio_init, .eint_wkup_init = s3c64xx_eint_eint0_init, + .pud_value_init = s3c64xx_pud_value_init, }, }; diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index 623df65a5d6f..7d7e924c1fdb 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c @@ -997,6 +997,80 @@ static int samsung_pinctrl_unregister(struct platform_device *pdev, return 0; } +/* + * samsung_pud_value_init: initialize the drvdata pud_val + */ +static void samsung_pud_value_init(struct samsung_pinctrl_drv_data *drvdata) +{ + unsigned int *pud_val = drvdata->pud_val; + + pud_val[PUD_PULL_DISABLE] = PIN_PUD_PULL_UP_DOWN_DISABLE; + pud_val[PUD_PULL_DOWN] = PIN_PUD_PULL_DOWN_ENABLE; + pud_val[PUD_PULL_UP] = PIN_PUD_PULL_UP_ENABLE; +} + +/* + * samsung_gpio_set_pud will enable or disable the pull-down and + * pull-up for the gpio pins in the PUD register. + */ +static void samsung_gpio_set_pud(struct gpio_chip *gc, unsigned int offset, + unsigned int value) +{ + struct samsung_pin_bank *bank = gpiochip_get_data(gc); + const struct samsung_pin_bank_type *type = bank->type; + void __iomem *reg; + unsigned int data, mask; + + reg = bank->pctl_base + bank->pctl_offset; + data = readl(reg + type->reg_offset[PINCFG_TYPE_PUD]); + mask = (1 << type->fld_width[PINCFG_TYPE_PUD]) - 1; + data &= ~(mask << (offset * type->fld_width[PINCFG_TYPE_PUD])); + data |= value << (offset * type->fld_width[PINCFG_TYPE_PUD]); + writel(data, reg + type->reg_offset[PINCFG_TYPE_PUD]); +} + +/* + * samsung_gpio_set_config will identify the type of PUD config based + * on the gpiolib request to enable or disable the PUD configuration. + */ +static int samsung_gpio_set_config(struct gpio_chip *gc, unsigned int offset, + unsigned long config) +{ + struct samsung_pin_bank *bank = gpiochip_get_data(gc); + struct samsung_pinctrl_drv_data *drvdata = bank->drvdata; + unsigned int value; + int ret = 0; + unsigned long flags; + + switch (pinconf_to_config_param(config)) { + case PIN_CONFIG_BIAS_DISABLE: + value = drvdata->pud_val[PUD_PULL_DISABLE]; + break; + case PIN_CONFIG_BIAS_PULL_DOWN: + value = drvdata->pud_val[PUD_PULL_DOWN]; + break; + case PIN_CONFIG_BIAS_PULL_UP: + value = drvdata->pud_val[PUD_PULL_UP]; + break; + default: + return -ENOTSUPP; + } + + ret = clk_enable(drvdata->pclk); + if (ret) { + dev_err(drvdata->dev, "failed to enable clock\n"); + return ret; + } + + raw_spin_lock_irqsave(&bank->slock, flags); + samsung_gpio_set_pud(gc, offset, value); + raw_spin_unlock_irqrestore(&bank->slock, flags); + + clk_disable(drvdata->pclk); + + return ret; +} + static const struct gpio_chip samsung_gpiolib_chip = { .request = gpiochip_generic_request, .free = gpiochip_generic_free, @@ -1006,6 +1080,7 @@ static const struct gpio_chip samsung_gpiolib_chip = { .direction_output = samsung_gpio_direction_output, .to_irq = samsung_gpio_to_irq, .add_pin_ranges = samsung_add_pin_ranges, + .set_config = samsung_gpio_set_config, .owner = THIS_MODULE, }; @@ -1237,6 +1312,11 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) if (ctrl->eint_wkup_init) ctrl->eint_wkup_init(drvdata); + if (ctrl->pud_value_init) + ctrl->pud_value_init(drvdata); + else + samsung_pud_value_init(drvdata); + ret = samsung_gpiolib_register(pdev, drvdata); if (ret) goto err_unregister; diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.h b/drivers/pinctrl/samsung/pinctrl-samsung.h index d50ba6f07d5d..61384096b6d7 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.h +++ b/drivers/pinctrl/samsung/pinctrl-samsung.h @@ -61,6 +61,28 @@ enum pincfg_type { #define PIN_CON_FUNC_INPUT 0x0 #define PIN_CON_FUNC_OUTPUT 0x1 +/* + * Values for the pin PUD register. + */ +#define PIN_PUD_PULL_UP_DOWN_DISABLE 0x0 +#define PIN_PUD_PULL_DOWN_ENABLE 0x1 +#define PIN_PUD_PULL_UP_ENABLE 0x3 + +/* + * enum pud_index: Index values to access the pud_val array in + * struct samsung_pinctrl_drv_data. + * @PUD_PULL_DISABLE: Index for value of pud disable + * @PUD_PULL_DOWN: Index for the value of pull down enable + * @PUD_PULL_UP: Index for the value of pull up enable + * @PUD_MAX: Maximun value of the index + */ +enum pud_index { + PUD_PULL_DISABLE, + PUD_PULL_DOWN, + PUD_PULL_UP, + PUD_MAX, +}; + /** * enum eint_type - possible external interrupt types. * @EINT_TYPE_NONE: bank does not support external interrupts @@ -261,6 +283,7 @@ struct samsung_pin_ctrl { int (*eint_gpio_init)(struct samsung_pinctrl_drv_data *); int (*eint_wkup_init)(struct samsung_pinctrl_drv_data *); + void (*pud_value_init)(struct samsung_pinctrl_drv_data *drvdata); void (*suspend)(struct samsung_pinctrl_drv_data *); void (*resume)(struct samsung_pinctrl_drv_data *); }; @@ -307,6 +330,7 @@ struct samsung_pinctrl_drv_data { struct samsung_pin_bank *pin_banks; unsigned int nr_banks; unsigned int nr_pins; + unsigned int pud_val[PUD_MAX]; struct samsung_retention_ctrl *retention_ctrl; -- 2.17.1 . From: Cong Yang To: sam@ravnborg.org, neil.armstrong@linaro.org, daniel@ffwll.ch, dianders@chromium.org, linus.walleij@linaro.org, swboyd@chromium.org, airlied@gmail.com, dmitry.baryshkov@linaro.org, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org, conor+dt@kernel.org Cc: lvzhaoxiong@huaqin.corp-partner.google.com, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Cong Yang Subject: [PATCH v2 0/3] Support for Melfas lmfbx101117480 MIPI-DSI panel Date: Thu, 4 Jul 2024 12:50:14 +0800 Message-Id: <20240704045017.2781991-1-yangcong5@huaqin.corp-partner.google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267480 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series support for Melfas lmfbx101117480 MIPI-DSI panel with jadard-jd9365da controller. Add compatible for melfas lmfbx101117480 in dt-bindings. Break some CMDS into helper functions. Changes in v2: - PATCH 1/3: No change. - PATCH 2/3: No change.. - PATCH 3/7: Break some CMDS into helper functions. - Link to v1: https://lore.kernel.org/dri-devel/20240702130138.2543711-1-yangcong5@huaqin.corp-partner.google.com/ Cong Yang (3): dt-bindings: display: panel: Add compatible for melfas lmfbx101117480 drm/panel: jd9365da: Support for Melfas lmfbx101117480 MIPI-DSI panel drm/panel: jd9365da: Break some CMDS into helper functions .../display/panel/jadard,jd9365da-h3.yaml | 1 + .../gpu/drm/panel/panel-jadard-jd9365da-h3.c | 317 ++++++++++++++++-- 2 files changed, 291 insertions(+), 27 deletions(-) -- 2.25.1 . From: Thorsten Blum To: James.Bottomley@HansenPartnership.com, deller@gmx.de, rppt@kernel.org Cc: linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, Thorsten Blum Subject: [PATCH] parisc: Use max() to improve code Date: Thu, 4 Jul 2024 06:51:34 +0200 Message-ID: <20240704045133.32400-2-thorsten.blum@toblux.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267484 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-parisc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Use max() to reduce 4 lines of code to a single line and improve its readability. Fixes the following Coccinelle/coccicheck warning reported by minmax.cocci: WARNING opportunity for max() Compile-tested only. Signed-off-by: Thorsten Blum --- arch/parisc/kernel/cache.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index 483bfafd930c..db531e58d70e 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c @@ -611,11 +611,7 @@ void __init parisc_setup_cache_timing(void) threshold/1024); set_tlb_threshold: - if (threshold > FLUSH_TLB_THRESHOLD) - parisc_tlb_flush_threshold = threshold; - else - parisc_tlb_flush_threshold = FLUSH_TLB_THRESHOLD; - + parisc_tlb_flush_threshold = max(threshold, FLUSH_TLB_THRESHOLD); printk(KERN_INFO "TLB flush threshold set to %lu KiB\n", parisc_tlb_flush_threshold/1024); } -- 2.45.2 . Date: Wed, 3 Jul 2024 22:27:28 -0700 From: Andrew Morton To: Linus Torvalds Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, mm-commits@vger.kernel.org Subject: [GIT PULL] hotfixes for 6.10-rc7 Message-Id: <20240703222728.d5ef62a48ebf19260832ee73@linux-foundation.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267491 org.kvack.linux-mm:202502 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.mm-commits,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Linus, please merge this batch of hotfixes, thanks. The following changes since commit 22a40d14b572deb80c0648557f4bd502d7e83826: Linux 6.10-rc6 (2024-06-30 14:40:44 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-hotfixes-stable-2024-07-03-22-23 for you to fetch changes up to 93aef9eda1cea9e84ab2453fcceb8addad0e46f1: nilfs2: fix incorrect inode allocation from reserved inodes (2024-07-03 12:29:25 -0700) ---------------------------------------------------------------- 6 hotfies, all cc:stable. Some fixes for longstanding nilfs2 issues and three unrelated MM fixes. ---------------------------------------------------------------- Jan Kara (2): Revert "mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again" mm: avoid overflows in dirty throttling logic Jinliang Zheng (1): mm: optimize the redundant loop of mm_update_owner_next() Ryusuke Konishi (3): nilfs2: fix inode number range checks nilfs2: add missing check for inode numbers on directory entries nilfs2: fix incorrect inode allocation from reserved inodes fs/nilfs2/alloc.c | 19 +++++++++++++++---- fs/nilfs2/alloc.h | 4 ++-- fs/nilfs2/dat.c | 2 +- fs/nilfs2/dir.c | 6 ++++++ fs/nilfs2/ifile.c | 7 ++----- fs/nilfs2/nilfs.h | 10 ++++++++-- fs/nilfs2/the_nilfs.c | 6 ++++++ fs/nilfs2/the_nilfs.h | 2 +- kernel/exit.c | 2 ++ mm/page-writeback.c | 32 +++++++++++++++++++++++++++----- 10 files changed, 70 insertions(+), 20 deletions(-) . Return-Path: From: Inochi Amaoto To: Linus Walleij , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen Wang , Inochi Amaoto , Paul Walmsley , Palmer Dabbelt , Albert Ou , Jisheng Zhang , Guo Ren , Haylen Chu , Drew Fustini Cc: linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 0/7] riscv: sophgo: Add pinctrl support for CV1800 series SoC Date: Thu, 4 Jul 2024 13:45:09 +0800 Message-ID: MIME-Version: 1.0 X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Xref: photonic.trudheim.com org.infradead.lists.linux-riscv:79356 org.kernel.vger.linux-kernel:1267494 Newsgroups: org.infradead.lists.linux-riscv,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-gpio,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add basic pinctrl driver for Sophgo CV1800 series SoCs. This patch series aims to replace the previous patch from Jisheng [1]. Since the pinctrl of cv1800 has nested mux and its pin definination is discrete, it is not suitable to use "pinctrl-single" to cover the pinctrl device. Note: As current documentation is not enough to guess the pin configuration of Huashan Pi, only the pinctrl node is added. [1] https://lore.kernel.org/linux-riscv/20231113005702.2467-1-jszhang@kernel.org/ Inochi Amaoto (7): dt-bindings: pinctrl: Add pinctrl for Sophgo CV1800 series SoC. pinctrl: sophgo: add support for CV1800B SoC pinctrl: sophgo: add support for CV1812H SoC pinctrl: sophgo: add support for SG2000 SoC pinctrl: sophgo: add support for SG2002 SoC riscv: dts: sophgo: cv1800b: add pinctrl support riscv: dts: sophgo: cv1812h: add pinctrl support .../pinctrl/sophgo,cv1800-pinctrl.yaml | 120 ++++ .../boot/dts/sophgo/cv1800b-milkv-duo.dts | 44 ++ arch/riscv/boot/dts/sophgo/cv1800b.dtsi | 10 + arch/riscv/boot/dts/sophgo/cv1812h.dtsi | 10 + drivers/pinctrl/Kconfig | 1 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/sophgo/Kconfig | 54 ++ drivers/pinctrl/sophgo/Makefile | 7 + drivers/pinctrl/sophgo/pinctrl-cv1800b.c | 293 ++++++++ drivers/pinctrl/sophgo/pinctrl-cv1812h.c | 596 ++++++++++++++++ drivers/pinctrl/sophgo/pinctrl-cv18xx.c | 642 ++++++++++++++++++ drivers/pinctrl/sophgo/pinctrl-cv18xx.h | 126 ++++ drivers/pinctrl/sophgo/pinctrl-sg2000.c | 596 ++++++++++++++++ drivers/pinctrl/sophgo/pinctrl-sg2002.c | 373 ++++++++++ include/dt-bindings/pinctrl/pinctrl-cv1800b.h | 63 ++ include/dt-bindings/pinctrl/pinctrl-cv1812h.h | 127 ++++ include/dt-bindings/pinctrl/pinctrl-cv18xx.h | 19 + include/dt-bindings/pinctrl/pinctrl-sg2000.h | 127 ++++ include/dt-bindings/pinctrl/pinctrl-sg2002.h | 79 +++ 19 files changed, 3288 insertions(+) create mode 100644 Documentation/devicetree/bindings/pinctrl/sophgo,cv1800-pinctrl.yaml create mode 100644 drivers/pinctrl/sophgo/Kconfig create mode 100644 drivers/pinctrl/sophgo/Makefile create mode 100644 drivers/pinctrl/sophgo/pinctrl-cv1800b.c create mode 100644 drivers/pinctrl/sophgo/pinctrl-cv1812h.c create mode 100644 drivers/pinctrl/sophgo/pinctrl-cv18xx.c create mode 100644 drivers/pinctrl/sophgo/pinctrl-cv18xx.h create mode 100644 drivers/pinctrl/sophgo/pinctrl-sg2000.c create mode 100644 drivers/pinctrl/sophgo/pinctrl-sg2002.c create mode 100644 include/dt-bindings/pinctrl/pinctrl-cv1800b.h create mode 100644 include/dt-bindings/pinctrl/pinctrl-cv1812h.h create mode 100644 include/dt-bindings/pinctrl/pinctrl-cv18xx.h create mode 100644 include/dt-bindings/pinctrl/pinctrl-sg2000.h create mode 100644 include/dt-bindings/pinctrl/pinctrl-sg2002.h -- 2.45.2 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv . From: Chris Lu To: Marcel Holtmann , Johan Hedberg , Luiz Von Dentz CC: Sean Wang , Aaron Hou , Steve Lee , linux-bluetooth , linux-kernel , linux-mediatek , Chris Lu Subject: [PATCH v7 0/8] Bluetooth: btmtk: MediaTek ISO data transmission support Date: Thu, 4 Jul 2024 14:01:08 +0800 Message-ID: <20240704060116.16600-1-chris.lu@mediatek.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267507 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-mediatek,org.kernel.vger.linux-bluetooth Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Since SIG has not yet clearly defined the specification for ISO data transmission over USB, MediaTek has adopted a method of adding an additional interrupt endpoint for ISO data transmission. This approach differs from the current method used in the Bluetooth upstream driver, which utilizes existing bulk endpoints. The interrupt endpoint provides guaranteed bandwidth, sufficient maximum data length for ISO packets and error checking. Driver sets up ISO interface and endpoints in btusb_mtk_setup and clears the setup in btusb_mtk_shutdown. These flow can't move to btmtk.c due to btusb_driver is only defined in btusb.c when claiming/relaesing interface. Once ISO interface is claimed, driver can use specific interrupt endpoint to send and receive iso data. ISO packet anchor stops when driver suspending and resubmit interrupt urb for ISO data when driver resuming. --- Change from v6 to v7: -Change MediaTek's specific suspend/resume function naming to btmtk_usb_suspend/resume and add comment to explain the purpose of function. --- Chris Lu (8): Bluetooth: btusb: mediatek: remove the unnecessary goto tag Bluetooth: btusb: mediatek: return error for failed reg access Bluetooth: btmtk: rename btmediatek_data Bluetooth: btusb: add callback function in btusb suspend/resume Bluetooth: btmtk: move btusb_mtk_hci_wmt_sync to btmtk.c Bluetooth: btmtk: move btusb_mtk_[setup, shutdown] to btmtk.c Bluetooth: btmtk: move btusb_recv_acl_mtk to btmtk.c Bluetooth: btusb: mediatek: add ISO data transmission functions drivers/bluetooth/btmtk.c | 1067 ++++++++++++++++++++++++++++++++- drivers/bluetooth/btmtk.h | 91 ++- drivers/bluetooth/btmtksdio.c | 1 + drivers/bluetooth/btmtkuart.c | 1 + drivers/bluetooth/btusb.c | 751 +++-------------------- 5 files changed, 1227 insertions(+), 684 deletions(-) -- 2.18.0 . From: Shan-Chun Hung To: ulf.hansson@linaro.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, adrian.hunter@intel.com, p.zabel@pengutronix.de, pbrobinson@gmail.com, serghox@gmail.com, mcgrof@kernel.org, prabhakar.mahadev-lad.rj@bp.renesas.com, forbidden405@outlook.com, tmaimon77@gmail.com, andy.shevchenko@gmail.com, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ychuang3@nuvoton.com, schung@nuvoton.com, Shan-Chun Hung Subject: [PATCH v4 0/2] Add support for Nuvoton MA35D1 SDHCI Date: Thu, 4 Jul 2024 14:26:21 +0800 Message-Id: <20240704062623.1480062-1-shanchun1218@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267537 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-mmc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patch adds the SDHCI driver and DT binding documentation for the Nuvoton MA35D1 platform. This MA35D1 SDHCI driver has been tested on the MA35D1 SOM board with Linux 6.10 v4: - Update to nuvoton,ma35d1-sdhci.yaml - Fixing overlooked issues. v3: - Update ma35d1 sdhci driver - Fixing "Alignment" and "spaces preferred around". - Fixing style for multi-line comments. - Fixing double call to sdhci_pltfm_free(). v2: - Update to nuvoton,ma35d1-sdhci.yaml - Remove some redundant descriptions. - Replace 'minitem' with 'maxitem' in the clock settings. - Make corrections to nuvoton,sys description. - Add sdhci-common.yaml. - Remove '|' except where necessary to be preserved. - Keeping one example is sufficient. - Add regulators in the example. - Update ma35d1 sdhci driver - Refer to 'include what you use' to modify included header files. - Replace the number 8 with sizeof(u8), and similarly for others. - Use "dev" instead of "&pdev->dev". - Use the min() macro to improve the code. - Use dev_err_probe() instead of dev_err(). - Implement an error reset check mechanism. - Add devm_add_action_or_reset() to help with sdhci_pltfm_free(). - Use devm_reset_control_get_exclusive() instead of devm_reset_control_get(). Shan-Chun Hung (2): dt-bindings: mmc: nuvoton,ma35d1-sdhci: Document MA35D1 SDHCI controller mmc: sdhci-of-ma35d1: Add Nuvoton MA35D1 SDHCI driver .../bindings/mmc/nuvoton,ma35d1-sdhci.yaml | 87 +++++ drivers/mmc/host/Kconfig | 12 + drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-of-ma35d1.c | 297 ++++++++++++++++++ 4 files changed, 397 insertions(+) create mode 100644 Documentation/devicetree/bindings/mmc/nuvoton,ma35d1-sdhci.yaml create mode 100644 drivers/mmc/host/sdhci-of-ma35d1.c -- 2.25.1 . From: Zqiang To: paulmck@kernel.org, imran.f.khan@oracle.com, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH] smp: Fix missed destroy_work_on_stack() calls in smp_call_on_cpu() Date: Thu, 4 Jul 2024 14:52:13 +0800 Message-Id: <20240704065213.13559-1-qiang.zhang1211@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267551 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail For builts with CONFIG_DEBUG_OBJECTS_WORK=y kernels, the sscs.work defined using INIT_WORK_ONSTACK() will be initialized by debug_object_init_on_stack() for debug check in __init_work(). This commit therefore invoke destroy_work_on_stack() to free sscs.work debug objects before smp_call_on_cpu() returns. Signed-off-by: Zqiang --- kernel/smp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/smp.c b/kernel/smp.c index cc13e73a887c..61f10f982341 100644 --- a/kernel/smp.c +++ b/kernel/smp.c @@ -1135,6 +1135,7 @@ int smp_call_on_cpu(unsigned int cpu, int (*func)(void *), void *par, bool phys) queue_work_on(cpu, system_wq, &sscs.work); wait_for_completion(&sscs.done); + destroy_work_on_stack(&sscs.work); return sscs.ret; } -- 2.17.1 . From: yangge1116@126.com To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, 21cnbao@gmail.com, david@redhat.com, baolin.wang@linux.alibaba.com, aneesh.kumar@linux.ibm.com, liuzixing@hygon.cn, yangge Subject: [PATCH V4] mm/gup: Clear the LRU flag of a page before adding to LRU batch Date: Thu, 4 Jul 2024 14:52:24 +0800 Message-Id: <1720075944-27201-1-git-send-email-yangge1116@126.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267552 org.kvack.linux-mm:202511 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.stable,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: yangge If a large number of CMA memory are configured in system (for example, the CMA memory accounts for 50% of the system memory), starting a virtual virtual machine with device passthrough, it will call pin_user_pages_remote(..., FOLL_LONGTERM, ...) to pin memory. Normally if a page is present and in CMA area, pin_user_pages_remote() will migrate the page from CMA area to non-CMA area because of FOLL_LONGTERM flag. But the current code will cause the migration failure due to unexpected page refcounts, and eventually cause the virtual machine fail to start. If a page is added in LRU batch, its refcount increases one, remove the page from LRU batch decreases one. Page migration requires the page is not referenced by others except page mapping. Before migrating a page, we should try to drain the page from LRU batch in case the page is in it, however, folio_test_lru() is not sufficient to tell whether the page is in LRU batch or not, if the page is in LRU batch, the migration will fail. To solve the problem above, we modify the logic of adding to LRU batch. Before adding a page to LRU batch, we clear the LRU flag of the page so that we can check whether the page is in LRU batch by folio_test_lru(page). It's quite valuable, because likely we don't want to blindly drain the LRU batch simply because there is some unexpected reference on a page, as described above. This change makes the LRU flag of a page invisible for longer, which may impact some programs. For example, as long as a page is on a LRU batch, we cannot isolate it, and we cannot check if it's an LRU page. Further, a page can now only be on exactly one LRU batch. This doesn't seem to matter much, because a new page is allocated from buddy and added to the lru batch, or be isolated, it's LRU flag may also be invisible for a long time. Fixes: 9a4e9f3b2d73 ("mm: update get_user_pages_longterm to migrate pages allocated from CMA region") Cc: Signed-off-by: yangge --- mm/swap.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) V4: Adjust commit message according to David's comments V3: Add fixes tag V2: Adjust code and commit message according to David's comments diff --git a/mm/swap.c b/mm/swap.c index dc205bd..9caf6b0 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -211,10 +211,6 @@ static void folio_batch_move_lru(struct folio_batch *fbatch, move_fn_t move_fn) for (i = 0; i < folio_batch_count(fbatch); i++) { struct folio *folio = fbatch->folios[i]; - /* block memcg migration while the folio moves between lru */ - if (move_fn != lru_add_fn && !folio_test_clear_lru(folio)) - continue; - folio_lruvec_relock_irqsave(folio, &lruvec, &flags); move_fn(lruvec, folio); @@ -255,11 +251,16 @@ static void lru_move_tail_fn(struct lruvec *lruvec, struct folio *folio) void folio_rotate_reclaimable(struct folio *folio) { if (!folio_test_locked(folio) && !folio_test_dirty(folio) && - !folio_test_unevictable(folio) && folio_test_lru(folio)) { + !folio_test_unevictable(folio)) { struct folio_batch *fbatch; unsigned long flags; folio_get(folio); + if (!folio_test_clear_lru(folio)) { + folio_put(folio); + return; + } + local_lock_irqsave(&lru_rotate.lock, flags); fbatch = this_cpu_ptr(&lru_rotate.fbatch); folio_batch_add_and_move(fbatch, folio, lru_move_tail_fn); @@ -352,11 +353,15 @@ static void folio_activate_drain(int cpu) void folio_activate(struct folio *folio) { - if (folio_test_lru(folio) && !folio_test_active(folio) && - !folio_test_unevictable(folio)) { + if (!folio_test_active(folio) && !folio_test_unevictable(folio)) { struct folio_batch *fbatch; folio_get(folio); + if (!folio_test_clear_lru(folio)) { + folio_put(folio); + return; + } + local_lock(&cpu_fbatches.lock); fbatch = this_cpu_ptr(&cpu_fbatches.activate); folio_batch_add_and_move(fbatch, folio, folio_activate_fn); @@ -700,6 +705,11 @@ void deactivate_file_folio(struct folio *folio) return; folio_get(folio); + if (!folio_test_clear_lru(folio)) { + folio_put(folio); + return; + } + local_lock(&cpu_fbatches.lock); fbatch = this_cpu_ptr(&cpu_fbatches.lru_deactivate_file); folio_batch_add_and_move(fbatch, folio, lru_deactivate_file_fn); @@ -716,11 +726,16 @@ void deactivate_file_folio(struct folio *folio) */ void folio_deactivate(struct folio *folio) { - if (folio_test_lru(folio) && !folio_test_unevictable(folio) && - (folio_test_active(folio) || lru_gen_enabled())) { + if (!folio_test_unevictable(folio) && (folio_test_active(folio) || + lru_gen_enabled())) { struct folio_batch *fbatch; folio_get(folio); + if (!folio_test_clear_lru(folio)) { + folio_put(folio); + return; + } + local_lock(&cpu_fbatches.lock); fbatch = this_cpu_ptr(&cpu_fbatches.lru_deactivate); folio_batch_add_and_move(fbatch, folio, lru_deactivate_fn); @@ -737,12 +752,16 @@ void folio_deactivate(struct folio *folio) */ void folio_mark_lazyfree(struct folio *folio) { - if (folio_test_lru(folio) && folio_test_anon(folio) && - folio_test_swapbacked(folio) && !folio_test_swapcache(folio) && - !folio_test_unevictable(folio)) { + if (folio_test_anon(folio) && folio_test_swapbacked(folio) && + !folio_test_swapcache(folio) && !folio_test_unevictable(folio)) { struct folio_batch *fbatch; folio_get(folio); + if (!folio_test_clear_lru(folio)) { + folio_put(folio); + return; + } + local_lock(&cpu_fbatches.lock); fbatch = this_cpu_ptr(&cpu_fbatches.lru_lazyfree); folio_batch_add_and_move(fbatch, folio, lru_lazyfree_fn); -- 2.7.4 . From: "Ho-Ren (Jack) Chuang" To: "Jonathan Cameron" , "Huang, Ying" , "Gregory Price" , aneesh.kumar@linux.ibm.com, mhocko@suse.com, tj@kernel.org, john@jagalactic.com, "Eishan Mirakhur" , "Vinicius Tavares Petrucci" , "Ravis OpenSrc" , "Alistair Popple" , "Srinivasulu Thanneeru" , "SeongJae Park" , "Rafael J. Wysocki" , Len Brown , Andrew Morton , Dave Jiang , Dan Williams , Jonathan Cameron , "Ho-Ren (Jack) Chuang" , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: "Ho-Ren (Jack) Chuang" , "Ho-Ren (Jack) Chuang" , "Ho-Ren (Jack) Chuang" , linux-cxl@vger.kernel.org, qemu-devel@nongnu.org Subject: [PATCH v3] memory tier: consolidate the initialization of memory tiers Date: Thu, 4 Jul 2024 07:26:44 +0000 Message-Id: <20240704072646.437579-1-horen.chuang@linux.dev> X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-cxl:29279 org.kernel.vger.linux-kernel:1267570 org.kvack.linux-mm:202515 Newsgroups: org.kernel.vger.linux-cxl,org.kernel.vger.linux-acpi,org.kernel.vger.linux-kernel,org.kvack.linux-mm,org.nongnu.qemu-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The current memory tier initialization process is distributed across two different functions, memory_tier_init() and memory_tier_late_init(). This design is hard to maintain. Thus, this patch is proposed to reduce the possible code paths by consolidating different initialization patches into one. The earlier discussion with Jonathan and Ying is listed here: https://lore.kernel.org/lkml/20240405150244.00004b49@Huawei.com/ If we want to put these two initializations together, they must be placed together in the later function. Because only at that time, the HMAT information will be ready, adist between nodes can be calculated, and memory tiering can be established based on the adist. So we position the initialization at memory_tier_init() to the memory_tier_late_init() call. Moreover, it's natural to keep memory_tier initialization in drivers at device_initcall() level. If we simply move the set_node_memory_tier() from memory_tier_init() to late_initcall(), it will result in HMAT not registering the mt_adistance_algorithm callback function, because set_node_memory_tier() is not performed during the memory tiering initialization phase, leading to a lack of correct default_dram information. Therefore, we introduced a nodemask to pass the information of the default DRAM nodes. The reason for not choosing to reuse default_dram_type->nodes is that it is not clean enough. So in the end, we use a __initdata variable, which is a variable that is released once initialization is complete, including both CPU and memory nodes for HMAT to iterate through. This patchset is based on commits ("memory tier: create CPUless memory tiers after obtaining HMAT info") and ("memory tier: dax/kmem: introduce an abstract layer for finding, allocating, and putting memory types"): [0/2] https://lkml.kernel.org/r/20240405000707.2670063-1-horenchuang@bytedance.com [1/2] https://lkml.kernel.org/r/20240405000707.2670063-2-horenchuang@bytedance.com [1/2] https://lkml.kernel.org/r/20240405000707.2670063-3-horenchuang@bytedance.com Signed-off-by: Ho-Ren (Jack) Chuang Suggested-by: Jonathan Cameron --- - v3: * Combine the cover letter and the patch. * Remove extern default_dram_type * Remove __initdata in a extern variable * Roll back coding style, fix comment description - v2: Thanks to Huang, Ying's and Andrew's comments * Add a cover letter * Add Suggested-by: Jonathan Cameron * Add get/put_online_mems() protection in memory_tier_late_init() * If memtype is set, skip initializing its node * Remove redundant code/comments or rewrite code in a cleaner manner * https://lore.kernel.org/all/20240628060925.303309-1-horen.chuang@linux.dev/ - v1: * https://lore.kernel.org/all/20240621044833.3953055-1-horen.chuang@linux.dev/ - Open to discussion: * Should we use `continue` or `break` if set_node_memory_tier() fails in memory_tier_late_init()? I've changed it to `continue` in v3. * Compute the default_dram_nodes mask in hmat when needed? Currently, it still remains in memory-tiers.c * Instead of using guard(mutex)(), use mutex_lock() as it was to make a cleaner diff? Thanks, Ho-Ren (Jack) Chuang drivers/acpi/numa/hmat.c | 5 +--- include/linux/memory-tiers.h | 2 ++ mm/memory-tiers.c | 54 ++++++++++++++---------------------- 3 files changed, 24 insertions(+), 37 deletions(-) diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c index 2c8ccc91ebe6..a2f9e7a4b479 100644 --- a/drivers/acpi/numa/hmat.c +++ b/drivers/acpi/numa/hmat.c @@ -940,10 +940,7 @@ static int hmat_set_default_dram_perf(void) struct memory_target *target; struct access_coordinate *attrs; - if (!default_dram_type) - return -EIO; - - for_each_node_mask(nid, default_dram_type->nodes) { + for_each_node_mask(nid, default_dram_nodes) { pxm = node_to_pxm(nid); target = find_mem_target(pxm); if (!target) diff --git a/include/linux/memory-tiers.h b/include/linux/memory-tiers.h index 0d70788558f4..0dc0cf2863e2 100644 --- a/include/linux/memory-tiers.h +++ b/include/linux/memory-tiers.h @@ -38,6 +38,7 @@ struct access_coordinate; #ifdef CONFIG_NUMA extern bool numa_demotion_enabled; extern struct memory_dev_type *default_dram_type; +extern nodemask_t default_dram_nodes; struct memory_dev_type *alloc_memory_type(int adistance); void put_memory_type(struct memory_dev_type *memtype); void init_node_memory_type(int node, struct memory_dev_type *default_type); @@ -76,6 +77,7 @@ static inline bool node_is_toptier(int node) #define numa_demotion_enabled false #define default_dram_type NULL +#define default_dram_nodes NODE_MASK_NONE /* * CONFIG_NUMA implementation returns non NULL error. */ diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c index 6632102bd5c9..4775b3a3dabe 100644 --- a/mm/memory-tiers.c +++ b/mm/memory-tiers.c @@ -43,6 +43,7 @@ static LIST_HEAD(memory_tiers); static LIST_HEAD(default_memory_types); static struct node_memory_type_map node_memory_types[MAX_NUMNODES]; struct memory_dev_type *default_dram_type; +nodemask_t default_dram_nodes __initdata = NODE_MASK_NONE; static const struct bus_type memory_tier_subsys = { .name = "memory_tiering", @@ -671,28 +672,35 @@ EXPORT_SYMBOL_GPL(mt_put_memory_types); /* * This is invoked via `late_initcall()` to initialize memory tiers for - * CPU-less memory nodes after driver initialization, which is - * expected to provide `adistance` algorithms. + * memory nodes, both with and without CPUs. After the initialization of + * firmware and devices, adistance algorithms are expected to be provided. */ static int __init memory_tier_late_init(void) { int nid; + struct memory_tier *memtier; + get_online_mems(); guard(mutex)(&memory_tier_lock); + + /* Assign each uninitialized N_MEMORY node to a memory tier. */ for_each_node_state(nid, N_MEMORY) { /* - * Some device drivers may have initialized memory tiers - * between `memory_tier_init()` and `memory_tier_late_init()`, - * potentially bringing online memory nodes and - * configuring memory tiers. Exclude them here. + * Some device drivers may have initialized + * memory tiers, potentially bringing memory nodes + * online and configuring memory tiers. + * Exclude them here. */ if (node_memory_types[nid].memtype) continue; - set_node_memory_tier(nid); + memtier = set_node_memory_tier(nid); + if (IS_ERR(memtier)) + continue; } establish_demotion_targets(); + put_online_mems(); return 0; } @@ -875,8 +883,7 @@ static int __meminit memtier_hotplug_callback(struct notifier_block *self, static int __init memory_tier_init(void) { - int ret, node; - struct memory_tier *memtier; + int ret; ret = subsys_virtual_register(&memory_tier_subsys, NULL); if (ret) @@ -887,7 +894,8 @@ static int __init memory_tier_init(void) GFP_KERNEL); WARN_ON(!node_demotion); #endif - mutex_lock(&memory_tier_lock); + + guard(mutex)(&memory_tier_lock); /* * For now we can have 4 faster memory tiers with smaller adistance * than default DRAM tier. @@ -897,29 +905,9 @@ static int __init memory_tier_init(void) if (IS_ERR(default_dram_type)) panic("%s() failed to allocate default DRAM tier\n", __func__); - /* - * Look at all the existing N_MEMORY nodes and add them to - * default memory tier or to a tier if we already have memory - * types assigned. - */ - for_each_node_state(node, N_MEMORY) { - if (!node_state(node, N_CPU)) - /* - * Defer memory tier initialization on - * CPUless numa nodes. These will be initialized - * after firmware and devices are initialized. - */ - continue; - - memtier = set_node_memory_tier(node); - if (IS_ERR(memtier)) - /* - * Continue with memtiers we are able to setup - */ - break; - } - establish_demotion_targets(); - mutex_unlock(&memory_tier_lock); + /* Record nodes with memory and CPU to set default DRAM performance. */ + nodes_and(default_dram_nodes, node_states[N_MEMORY], + node_states[N_CPU]); hotplug_memory_notifier(memtier_hotplug_callback, MEMTIER_HOTPLUG_PRI); return 0; -- Ho-Ren (Jack) Chuang . From: John Hubbard To: Shuah Khan Cc: angquan yu , "Kirill A . Shutemov" , Ingo Molnar , Binbin Wu , Alexey Dobriyan , Rick Edgecombe , Sohil Mehta , Yu-cheng Yu , Dave Hansen , Muhammad Usama Anjum , Valentin Obst , linux-kselftest@vger.kernel.org, LKML , llvm@lists.linux.dev, x86@kernel.org, John Hubbard Subject: [PATCH v4 0/7] selftests/x86: fix build errors and warnings found via clang Date: Thu, 4 Jul 2024 00:24:24 -0700 Message-ID: <20240704072431.111640-1-jhubbard@nvidia.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267575 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.llvm,org.kernel.vger.linux-kselftest Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Changes since v3: 1) Rebased onto Linux 6.10-rc6+. 2) Added Muhammad's acks for the series. Cover letter for v3: Hi, Dave Hansen, Muhammad Usama Anjum, here is the combined series that we discussed yesterday [1]. As I mentioned then, this is a bit intrusive--but no more than necessary, IMHO. Specifically, it moves some clang-un-inlineable things out to "pure" assembly code files. I've tested this by building with clang, then running each binary on my x86_64 test system with today's 6.10-rc1, and comparing the console and dmesg output to a gcc-based build without these patches applied. Aside from timestamps and virtual addresses, it looks identical. Earlier cover letter: Just a bunch of build and warnings fixes that show up when building with clang. Some of these depend on each other, so I'm sending them as a series. Changes since v2: 1) Dropped my test_FISTTP.c patch, and picked up Muhammad's fix instead, seeing as how that was posted first. 2) Updated patch descriptions to reflect that Valentin Obst's build fix for LLVM [1] has already been merged into Linux main. 3) Minor wording and typo corrections in the commit logs throughout. Changes since the first version: 1) Rebased onto Linux 6.10-rc1 Enjoy! [1] https://lore.kernel.org/44428518-4d21-4de7-8587-04eceefb330d@nvidia.com thanks, John Hubbard John Hubbard (6): selftests/x86: fix Makefile dependencies to work with clang selftests/x86: build fsgsbase_restore.c with clang selftests/x86: build sysret_rip.c with clang selftests/x86: avoid -no-pie warnings from clang during compilation selftests/x86: remove (or use) unused variables and functions selftests/x86: fix printk warnings reported by clang Muhammad Usama Anjum (1): selftests: x86: test_FISTTP: use fisttps instead of ambiguous fisttp tools/testing/selftests/x86/Makefile | 31 +++++++++++++++---- tools/testing/selftests/x86/amx.c | 16 ---------- .../testing/selftests/x86/clang_helpers_32.S | 11 +++++++ .../testing/selftests/x86/clang_helpers_64.S | 28 +++++++++++++++++ tools/testing/selftests/x86/fsgsbase.c | 6 ---- .../testing/selftests/x86/fsgsbase_restore.c | 11 +++---- tools/testing/selftests/x86/sigreturn.c | 2 +- .../testing/selftests/x86/syscall_arg_fault.c | 1 - tools/testing/selftests/x86/sysret_rip.c | 20 ++++-------- tools/testing/selftests/x86/test_FISTTP.c | 8 ++--- tools/testing/selftests/x86/test_vsyscall.c | 15 +++------ tools/testing/selftests/x86/vdso_restorer.c | 2 ++ 12 files changed, 87 insertions(+), 64 deletions(-) create mode 100644 tools/testing/selftests/x86/clang_helpers_32.S create mode 100644 tools/testing/selftests/x86/clang_helpers_64.S base-commit: 795c58e4c7fc6163d8fb9f2baa86cfe898fa4b19 -- 2.45.2 . From: Zhaoxiong Lv To: neil.armstrong@linaro.org, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, airlied@gmail.com, daniel@ffwll.ch, mripard@kernel.org, dianders@google.com, hsinyi@google.com, awarnecke002@hotmail.com, quic_jesszhan@quicinc.com, dmitry.baryshkov@linaro.org Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Zhaoxiong Lv Subject: [PATCH v5 0/5] Support Starry er88577 MIPI-DSI panel Date: Thu, 4 Jul 2024 15:29:53 +0800 Message-Id: <20240704072958.27876-1-lvzhaoxiong@huaqin.corp-partner.google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267584 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The Starry is a 10.1" WXGA TFT LCD panel. Because Starry-er88577 and boe-th101mb31ig002 have very similar inti_code, after discussing with Dmitry Baryshkov, We will modify it based on the panel-boe-th101mb31ig002-28a.c driver instead of using a separate driver. Changes between V5 and V4: - PATCH 1/5: Add a new patch, make it compatible with more panels. - PATCH 2/5: Add a new patch, change devm_gpiod_get() to devm_gpiod_get_optional() in the Probe() function. - PATCH 3/5: Add a new patch, use wrapped MIPI DCS functions. - PATCH 4/5: Add it to the "boe,th101mb31ig002-28a.yaml. - PATCH 5/5: Compatible with starry-er88577 panel in panel-boe-th101mb31ig002-28a.c driver. - Link to v4: https://lore.kernel.org/all/20240620115245.31540-1-lvzhaoxiong@huaqin.corp-partner.google.com/ Changes between V4 and V3: - PATCH 1/2: Move positions to keep the list sorted. - PATCH 2/2: Adjust the ".clock" assignment format. - Link to v3: https://lore.kernel.org/all/20240614145609.25432-1-lvzhaoxiong@huaqin.corp-partner.google.com/ Changes between V3 and V2: - PATCH 1/2: This add the bindings to panel-simple-dsi. - PATCH 2/2: Add a separate driver for Starry-er88577, and Use the new mipi_dsi_dcs_write_seq_multi() function. - Link to v2: https://lore.kernel.org/all/20240601084528.22502-1-lvzhaoxiong@huaqin.corp-partner.google.com/ Changes between V2 and V1: - PATCH 1/4: Delete some unnecessary information. - PATCH 2/4: Use the new mipi_dsi_dcs_write_seq_multi() function, deleted some unnecessary functions. - PATCH 3/4: Add compatible for Starry-er88577. - PATCH 4/4: Add starry panel configuration in panel-kingdisplay-kd101ne3 driver. - Link to v1: https://lore.kernel.org/all/20240418081548.12160-1-lvzhaoxiong@huaqin.corp-partner.google.com/ Zhaoxiong Lv (5): drm/panel: boe-th101mb31ig002 : Make it compatible with other panel. drm/panel: boe-th101mb31ig002: switch to devm_gpiod_get_optional() for reset_gpio drm/panel: boe-th101mb31ig002: use wrapped MIPI DCS functions dt-bindings: display: panel: Add compatible for starry-er88577 drm/panel: :boe-th101mb31ig002: Support for starry-er88577 MIPI-DSI panel .../display/panel/boe,th101mb31ig002-28a.yaml | 2 + .../drm/panel/panel-boe-th101mb31ig002-28a.c | 298 +++++++++++++----- 2 files changed, 215 insertions(+), 85 deletions(-) -- 2.17.1 . From: Chen Ni To: andersson@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, ansuelsmth@gmail.com Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Chen Ni Subject: [PATCH] clk: qcom: kpss-xcc: Return of_clk_add_hw_provider to transfer the error Date: Thu, 4 Jul 2024 15:36:06 +0800 Message-Id: <20240704073606.1976936-1-nichen@iscas.ac.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267597 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-clk Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Return of_clk_add_hw_provider() in order to transfer the error if it fails. Fixes: 09be1a39e685 ("clk: qcom: kpss-xcc: register it as clk provider") Signed-off-by: Chen Ni --- drivers/clk/qcom/kpss-xcc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/clk/qcom/kpss-xcc.c b/drivers/clk/qcom/kpss-xcc.c index 23b0b11f0007..e7cfa8d22044 100644 --- a/drivers/clk/qcom/kpss-xcc.c +++ b/drivers/clk/qcom/kpss-xcc.c @@ -58,9 +58,7 @@ static int kpss_xcc_driver_probe(struct platform_device *pdev) if (IS_ERR(hw)) return PTR_ERR(hw); - of_clk_add_hw_provider(dev->of_node, of_clk_hw_simple_get, hw); - - return 0; + return of_clk_add_hw_provider(dev->of_node, of_clk_hw_simple_get, hw); } static struct platform_driver kpss_xcc_driver = { -- 2.25.1 . X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Thu, 04 Jul 2024 00:49:25 -0700 Message-ID: <0000000000008acfcf061c672fba@google.com> Subject: [syzbot] [lsm?] KASAN: slab-use-after-free Read in smack_socket_sock_rcv_skb From: syzbot To: casey@schaufler-ca.com, jmorris@namei.org, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, paul@paul-moore.com, serge@hallyn.com, syzkaller-bugs@googlegroups.com Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267600 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-security-module Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, syzbot found the following issue on: HEAD commit: 8282d5af7be8 Merge tag 'nfs-for-6.10-3' of git://git.linux.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=1235ae99980000 kernel config: https://syzkaller.appspot.com/x/.config?x=67463c0717b8d4ca dashboard link: https://syzkaller.appspot.com/bug?extid=4ca2868197c9747dca53 compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40 Unfortunately, I don't have any reproducer for this issue yet. Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/0501bcb3ee43/disk-8282d5af.raw.xz vmlinux: https://storage.googleapis.com/syzbot-assets/a0f124c04344/vmlinux-8282d5af.xz kernel image: https://storage.googleapis.com/syzbot-assets/1d5690d55f9c/bzImage-8282d5af.xz IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+4ca2868197c9747dca53@syzkaller.appspotmail.com ================================================================== BUG: KASAN: slab-use-after-free in smack_socket_sock_rcv_skb+0xec/0x13a0 security/smack/smack_lsm.c:4142 Read of size 8 at addr ffff888023db9498 by task kworker/u9:7/5088 CPU: 1 PID: 5088 Comm: kworker/u9:7 Not tainted 6.10.0-rc5-syzkaller-00282-g8282d5af7be8 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 06/07/2024 Workqueue: hci0 hci_rx_work Call Trace: __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:114 print_address_description mm/kasan/report.c:377 [inline] print_report+0x169/0x550 mm/kasan/report.c:488 kasan_report+0x143/0x180 mm/kasan/report.c:601 smack_socket_sock_rcv_skb+0xec/0x13a0 security/smack/smack_lsm.c:4142 security_sock_rcv_skb+0x6d/0xa0 security/security.c:4603 sk_filter_trim_cap+0x184/0xa80 net/core/filter.c:150 sk_filter include/linux/filter.h:945 [inline] l2cap_sock_recv_cb+0x12d/0x4f0 net/bluetooth/l2cap_sock.c:1502 l2cap_conless_channel net/bluetooth/l2cap_core.c:6774 [inline] l2cap_recv_frame+0x8d47/0x107d0 net/bluetooth/l2cap_core.c:6827 hci_acldata_packet net/bluetooth/hci_core.c:3842 [inline] hci_rx_work+0x50f/0xca0 net/bluetooth/hci_core.c:4079 process_one_work kernel/workqueue.c:3248 [inline] process_scheduled_works+0xa2c/0x1830 kernel/workqueue.c:3329 worker_thread+0x86d/0xd50 kernel/workqueue.c:3409 kthread+0x2f0/0x390 kernel/kthread.c:389 ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 Allocated by task 24593: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x3f/0x80 mm/kasan/common.c:68 poison_kmalloc_redzone mm/kasan/common.c:370 [inline] __kasan_kmalloc+0x98/0xb0 mm/kasan/common.c:387 kasan_kmalloc include/linux/kasan.h:211 [inline] __do_kmalloc_node mm/slub.c:4123 [inline] __kmalloc_noprof+0x1f9/0x400 mm/slub.c:4136 kmalloc_noprof include/linux/slab.h:664 [inline] sk_prot_alloc+0xe0/0x210 net/core/sock.c:2080 sk_alloc+0x38/0x370 net/core/sock.c:2133 bt_sock_alloc+0x3c/0x340 net/bluetooth/af_bluetooth.c:148 l2cap_sock_alloc net/bluetooth/l2cap_sock.c:1869 [inline] l2cap_sock_create+0x13f/0x2d0 net/bluetooth/l2cap_sock.c:1909 bt_sock_create+0x161/0x230 net/bluetooth/af_bluetooth.c:132 __sock_create+0x490/0x920 net/socket.c:1571 sock_create net/socket.c:1622 [inline] __sys_socket_create net/socket.c:1659 [inline] __sys_socket+0x150/0x3c0 net/socket.c:1706 __do_sys_socket net/socket.c:1720 [inline] __se_sys_socket net/socket.c:1718 [inline] __x64_sys_socket+0x7a/0x90 net/socket.c:1718 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f Freed by task 24593: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x3f/0x80 mm/kasan/common.c:68 kasan_save_free_info+0x40/0x50 mm/kasan/generic.c:579 poison_slab_object+0xe0/0x150 mm/kasan/common.c:240 __kasan_slab_free+0x37/0x60 mm/kasan/common.c:256 kasan_slab_free include/linux/kasan.h:184 [inline] slab_free_hook mm/slub.c:2196 [inline] slab_free mm/slub.c:4438 [inline] kfree+0x149/0x360 mm/slub.c:4559 sk_prot_free net/core/sock.c:2116 [inline] __sk_destruct+0x476/0x5f0 net/core/sock.c:2208 l2cap_sock_release+0x15b/0x1d0 net/bluetooth/l2cap_sock.c:1417 __sock_release net/socket.c:659 [inline] sock_close+0xbc/0x240 net/socket.c:1421 __fput+0x406/0x8b0 fs/file_table.c:422 task_work_run+0x24f/0x310 kernel/task_work.c:180 resume_user_mode_work include/linux/resume_user_mode.h:50 [inline] exit_to_user_mode_loop kernel/entry/common.c:114 [inline] exit_to_user_mode_prepare include/linux/entry-common.h:328 [inline] __syscall_exit_to_user_mode_work kernel/entry/common.c:207 [inline] syscall_exit_to_user_mode+0x168/0x360 kernel/entry/common.c:218 do_syscall_64+0x100/0x230 arch/x86/entry/common.c:89 entry_SYSCALL_64_after_hwframe+0x77/0x7f The buggy address belongs to the object at ffff888023db9000 which belongs to the cache kmalloc-2k of size 2048 The buggy address is located 1176 bytes inside of freed 2048-byte region [ffff888023db9000, ffff888023db9800) The buggy address belongs to the physical page: page: refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x23db8 head: order:3 mapcount:0 entire_mapcount:0 nr_pages_mapped:0 pincount:0 anon flags: 0xfff00000000040(head|node=0|zone=1|lastcpupid=0x7ff) page_type: 0xffffefff(slab) raw: 00fff00000000040 ffff888015042000 0000000000000000 dead000000000001 raw: 0000000000000000 0000000000080008 00000001ffffefff 0000000000000000 head: 00fff00000000040 ffff888015042000 0000000000000000 dead000000000001 head: 0000000000000000 0000000000080008 00000001ffffefff 0000000000000000 head: 00fff00000000003 ffffea00008f6e01 ffffffffffffffff 0000000000000000 head: 0000000000000008 0000000000000000 00000000ffffffff 0000000000000000 page dumped because: kasan: bad access detected page_owner tracks the page as allocated page last allocated via order 3, migratetype Unmovable, gfp_mask 0x1d20c0(__GFP_IO|__GFP_FS|__GFP_NOWARN|__GFP_NORETRY|__GFP_COMP|__GFP_NOMEMALLOC|__GFP_HARDWALL), pid 7400, tgid 7400 (kworker/u8:13), ts 897858391086, free_ts 897824765702 set_page_owner include/linux/page_owner.h:32 [inline] post_alloc_hook+0x1f3/0x230 mm/page_alloc.c:1473 prep_new_page mm/page_alloc.c:1481 [inline] get_page_from_freelist+0x2e4c/0x2f10 mm/page_alloc.c:3425 __alloc_pages_noprof+0x256/0x6c0 mm/page_alloc.c:4683 __alloc_pages_node_noprof include/linux/gfp.h:269 [inline] alloc_pages_node_noprof include/linux/gfp.h:296 [inline] alloc_slab_page+0x5f/0x120 mm/slub.c:2265 allocate_slab+0x5a/0x2f0 mm/slub.c:2428 new_slab mm/slub.c:2481 [inline] ___slab_alloc+0xcd1/0x14b0 mm/slub.c:3667 __slab_alloc+0x58/0xa0 mm/slub.c:3757 __slab_alloc_node mm/slub.c:3810 [inline] slab_alloc_node mm/slub.c:3990 [inline] __do_kmalloc_node mm/slub.c:4122 [inline] kmalloc_node_track_caller_noprof+0x281/0x440 mm/slub.c:4143 kmalloc_reserve+0x111/0x2a0 net/core/skbuff.c:597 __alloc_skb+0x1f3/0x440 net/core/skbuff.c:666 alloc_skb include/linux/skbuff.h:1308 [inline] alloc_skb_with_frags+0xc3/0x770 net/core/skbuff.c:6504 sock_alloc_send_pskb+0x91a/0xa60 net/core/sock.c:2794 sock_alloc_send_skb include/net/sock.h:1773 [inline] mld_newpack+0x1c3/0xa90 net/ipv6/mcast.c:1746 add_grhead net/ipv6/mcast.c:1849 [inline] add_grec+0x1492/0x19a0 net/ipv6/mcast.c:1987 mld_send_initial_cr+0x228/0x4b0 net/ipv6/mcast.c:2233 ipv6_mc_dad_complete+0x88/0x490 net/ipv6/mcast.c:2244 page last free pid 5064 tgid 5064 stack trace: reset_page_owner include/linux/page_owner.h:25 [inline] free_pages_prepare mm/page_alloc.c:1093 [inline] free_unref_page+0xd19/0xea0 mm/page_alloc.c:2588 skb_free_frag include/linux/skbuff.h:3354 [inline] skb_free_head net/core/skbuff.c:1079 [inline] skb_release_data+0x6b2/0x880 net/core/skbuff.c:1108 skb_release_all net/core/skbuff.c:1173 [inline] __napi_kfree_skb net/core/skbuff.c:1451 [inline] kfree_skb_napi_cache net/core/skbuff.c:7007 [inline] skb_attempt_defer_free+0x42f/0x5c0 net/core/skbuff.c:7029 tcp_eat_recv_skb net/ipv4/tcp.c:1520 [inline] tcp_recvmsg_locked+0x1500/0x2640 net/ipv4/tcp.c:2544 tcp_recvmsg+0x25d/0x920 net/ipv4/tcp.c:2590 inet_recvmsg+0x150/0x2d0 net/ipv4/af_inet.c:885 sock_recvmsg_nosec net/socket.c:1046 [inline] sock_recvmsg+0x1ae/0x280 net/socket.c:1068 sock_read_iter+0x2ca/0x3e0 net/socket.c:1138 new_sync_read fs/read_write.c:395 [inline] vfs_read+0x9c4/0xbd0 fs/read_write.c:476 ksys_read+0x1a0/0x2c0 fs/read_write.c:619 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f Memory state around the buggy address: ffff888023db9380: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff888023db9400: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb >ffff888023db9480: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff888023db9500: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff888023db9580: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ================================================================== --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. If the report is already addressed, let syzbot know by replying with: #syz fix: exact-commit-title If you want to overwrite report's subsystems, reply with: #syz set subsystems: new-subsystem (See the list of subsystem names on the web dashboard) If the report is a duplicate of another one, reply with: #syz dup: exact-subject-of-another-report If you want to undo deduplication, reply with: #syz undup . From: Jammy Huang To: eajames@linux.ibm.com, mchehab@kernel.org, joel@jms.id.au, andrew@aj.id.au, linux-media@vger.kernel.org, openbmc@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Cc: Jammy Huang Subject: [PATCH] media: aspeed: Add additional input type, GFX, to capture Date: Thu, 4 Jul 2024 15:55:10 +0800 Message-Id: <20240704075510.27034-1-jammy_huang@aspeedtech.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267606 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-media Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail ASPEED BMC IC has 2 different display engines. 1. VGA on PCIe 2. SoC Display(GFX) By default, video engine(VE) will capture video from VGA. This patch adds an option to caputre video from GFX with standard ioctl, vidioc_s_input. An enum, aspeed_video_input, is added for this purpose. enum aspeed_video_input { VIDEO_INPUT_VGA = 0, VIDEO_INPUT_GFX, VIDEO_INPUT_MAX }; Signed-off-by: Jammy Huang --- drivers/media/platform/aspeed/aspeed-video.c | 177 ++++++++++++++++--- include/uapi/linux/aspeed-video.h | 7 + 2 files changed, 158 insertions(+), 26 deletions(-) diff --git a/drivers/media/platform/aspeed/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c index fc6050e3be0d..da5bf512a8ab 100644 --- a/drivers/media/platform/aspeed/aspeed-video.c +++ b/drivers/media/platform/aspeed/aspeed-video.c @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include #include @@ -203,6 +205,25 @@ #define VE_MEM_RESTRICT_START 0x310 #define VE_MEM_RESTRICT_END 0x314 +// SCU's registers +#define SCU_MISC_CTRL 0xC0 +#define SCU_DPLL_SOURCE BIT(20) + +// GFX's registers +#define GFX_CTRL 0x60 +#define GFX_CTRL_ENABLE BIT(0) +#define GFX_CTRL_FMT GENMASK(9, 7) + +#define GFX_H_DISPLAY 0x70 +#define GFX_H_DISPLAY_DE GENMASK(28, 16) +#define GFX_H_DISPLAY_TOTAL GENMASK(12, 0) + +#define GFX_V_DISPLAY 0x78 +#define GFX_V_DISPLAY_DE GENMASK(27, 16) +#define GFX_V_DISPLAY_TOTAL GENMASK(11, 0) + +#define GFX_DISPLAY_ADDR 0x80 + /* * VIDEO_MODE_DETECT_DONE: a flag raised if signal lock * VIDEO_RES_CHANGE: a flag raised if res_change work on-going @@ -273,6 +294,7 @@ struct aspeed_video_perf { * yuv420: a flag raised if JPEG subsampling is 420 * format: holds the video format * hq_mode: a flag raised if HQ is enabled. Only for VIDEO_FMT_ASPEED + * input: holds the video input * frame_rate: holds the frame_rate * jpeg_quality: holds jpeq's quality (0~11) * jpeg_hq_quality: holds hq's quality (1~12) only if hq_mode enabled @@ -298,6 +320,8 @@ struct aspeed_video { struct video_device vdev; struct mutex video_lock; /* v4l2 and videobuf2 lock */ + struct regmap *scu; + struct regmap *gfx; u32 jpeg_mode; u32 comp_size_read; @@ -316,6 +340,7 @@ struct aspeed_video { bool yuv420; enum aspeed_video_format format; bool hq_mode; + enum aspeed_video_input input; unsigned int frame_rate; unsigned int jpeg_quality; unsigned int jpeg_hq_quality; @@ -485,6 +510,7 @@ static const struct v4l2_dv_timings_cap aspeed_video_timings_cap = { static const char * const format_str[] = {"Standard JPEG", "Aspeed JPEG"}; +static const char * const input_str[] = {"VGA", "BMC GFX"}; static unsigned int debug; @@ -609,6 +635,14 @@ static int aspeed_video_start_frame(struct aspeed_video *video) aspeed_video_free_buf(video, &video->bcd); } + if (video->input == VIDEO_INPUT_GFX) { + u32 val; + + // update input buffer address as gfx's + regmap_read(video->gfx, GFX_DISPLAY_ADDR, &val); + aspeed_video_write(video, VE_TGS_0, val); + } + spin_lock_irqsave(&video->lock, flags); buf = list_first_entry_or_null(&video->buffers, struct aspeed_video_buffer, link); @@ -1026,9 +1060,23 @@ static void aspeed_video_get_timings(struct aspeed_video *v, } } +static void aspeed_video_get_resolution_gfx(struct aspeed_video *video, + struct v4l2_bt_timings *det) +{ + u32 h_val, v_val; + + regmap_read(video->gfx, GFX_H_DISPLAY, &h_val); + regmap_read(video->gfx, GFX_V_DISPLAY, &v_val); + + det->width = FIELD_GET(GFX_H_DISPLAY_DE, h_val) + 1; + det->height = FIELD_GET(GFX_V_DISPLAY_DE, v_val) + 1; + video->v4l2_input_status = 0; +} + #define res_check(v) test_and_clear_bit(VIDEO_MODE_DETECT_DONE, &(v)->flags) -static void aspeed_video_get_resolution(struct aspeed_video *video) +static void aspeed_video_get_resolution_vga(struct aspeed_video *video, + struct v4l2_bt_timings *det) { bool invalid_resolution = true; int rc; @@ -1036,7 +1084,6 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) u32 mds; u32 src_lr_edge; u32 src_tb_edge; - struct v4l2_bt_timings *det = &video->detected_timings; det->width = MIN_WIDTH; det->height = MIN_HEIGHT; @@ -1113,14 +1160,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) aspeed_video_get_timings(video, det); - /* - * Enable mode-detect watchdog, resolution-change watchdog and - * automatic compression after frame capture. - */ + /* Enable mode-detect watchdog, resolution-change watchdog */ aspeed_video_update(video, VE_INTERRUPT_CTRL, 0, VE_INTERRUPT_MODE_DETECT_WD); - aspeed_video_update(video, VE_SEQ_CTRL, 0, - VE_SEQ_CTRL_AUTO_COMP | VE_SEQ_CTRL_EN_WATCHDOG); + aspeed_video_update(video, VE_SEQ_CTRL, 0, VE_SEQ_CTRL_EN_WATCHDOG); +} + +static void aspeed_video_get_resolution(struct aspeed_video *video) +{ + struct v4l2_bt_timings *det = &video->detected_timings; + + if (video->input == VIDEO_INPUT_GFX) + aspeed_video_get_resolution_gfx(video, det); + else + aspeed_video_get_resolution_vga(video, det); v4l2_dbg(1, debug, &video->v4l2_dev, "Got resolution: %dx%d\n", det->width, det->height); @@ -1156,7 +1209,7 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) aspeed_video_write(video, VE_SRC_SCANLINE_OFFSET, act->width * 4); /* Don't use direct mode below 1024 x 768 (irqs don't fire) */ - if (size < DIRECT_FETCH_THRESHOLD) { + if (video->input == VIDEO_INPUT_VGA && size < DIRECT_FETCH_THRESHOLD) { v4l2_dbg(1, debug, &video->v4l2_dev, "Capture: Sync Mode\n"); aspeed_video_write(video, VE_TGS_0, FIELD_PREP(VE_TGS_FIRST, @@ -1171,10 +1224,20 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) VE_CTRL_INT_DE | VE_CTRL_DIRECT_FETCH, VE_CTRL_INT_DE); } else { + u32 ctrl, val, bpp; + v4l2_dbg(1, debug, &video->v4l2_dev, "Capture: Direct Mode\n"); + ctrl = VE_CTRL_DIRECT_FETCH; + if (video->input == VIDEO_INPUT_GFX) { + regmap_read(video->gfx, GFX_CTRL, &val); + bpp = FIELD_GET(GFX_CTRL_FMT, val) ? 32 : 16; + if (bpp == 16) + ctrl |= VE_CTRL_INT_DE; + aspeed_video_write(video, VE_TGS_1, act->width * (bpp >> 3)); + } aspeed_video_update(video, VE_CTRL, VE_CTRL_INT_DE | VE_CTRL_DIRECT_FETCH, - VE_CTRL_DIRECT_FETCH); + ctrl); } size *= 4; @@ -1207,6 +1270,22 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) aspeed_video_free_buf(video, &video->srcs[0]); } +/* + * Update relative parameters when timing changed. + * + * @video: the struct of aspeed_video + * @timings: the new timings + */ +static void aspeed_video_update_timings(struct aspeed_video *video, struct v4l2_bt_timings *timings) +{ + video->active_timings = *timings; + aspeed_video_set_resolution(video); + + video->pix_fmt.width = timings->width; + video->pix_fmt.height = timings->height; + video->pix_fmt.sizeimage = video->max_compressed_size; +} + static void aspeed_video_update_regs(struct aspeed_video *video) { u8 jpeg_hq_quality = clamp((int)video->jpeg_hq_quality - 1, 0, @@ -1219,6 +1298,8 @@ static void aspeed_video_update_regs(struct aspeed_video *video) u32 ctrl = 0; u32 seq_ctrl = 0; + v4l2_dbg(1, debug, &video->v4l2_dev, "input(%s)\n", + input_str[video->input]); v4l2_dbg(1, debug, &video->v4l2_dev, "framerate(%d)\n", video->frame_rate); v4l2_dbg(1, debug, &video->v4l2_dev, "jpeg format(%s) subsample(%s)\n", @@ -1234,6 +1315,9 @@ static void aspeed_video_update_regs(struct aspeed_video *video) else aspeed_video_update(video, VE_BCD_CTRL, VE_BCD_CTRL_EN_BCD, 0); + if (video->input == VIDEO_INPUT_VGA) + ctrl |= VE_CTRL_AUTO_OR_CURSOR; + if (video->frame_rate) ctrl |= FIELD_PREP(VE_CTRL_FRC, video->frame_rate); @@ -1252,7 +1336,9 @@ static void aspeed_video_update_regs(struct aspeed_video *video) aspeed_video_update(video, VE_SEQ_CTRL, video->jpeg_mode | VE_SEQ_CTRL_YUV420, seq_ctrl); - aspeed_video_update(video, VE_CTRL, VE_CTRL_FRC, ctrl); + aspeed_video_update(video, VE_CTRL, + VE_CTRL_FRC | VE_CTRL_AUTO_OR_CURSOR | + VE_CTRL_SOURCE, ctrl); aspeed_video_update(video, VE_COMP_CTRL, VE_COMP_CTRL_DCT_LUM | VE_COMP_CTRL_DCT_CHR | VE_COMP_CTRL_EN_HQ | VE_COMP_CTRL_HQ_DCT_LUM | @@ -1280,6 +1366,7 @@ static void aspeed_video_init_regs(struct aspeed_video *video) aspeed_video_write(video, VE_JPEG_ADDR, video->jpeg.dma); /* Set control registers */ + aspeed_video_write(video, VE_SEQ_CTRL, VE_SEQ_CTRL_AUTO_COMP); aspeed_video_write(video, VE_CTRL, ctrl); aspeed_video_write(video, VE_COMP_CTRL, VE_COMP_CTRL_RSVD); @@ -1311,12 +1398,7 @@ static void aspeed_video_start(struct aspeed_video *video) aspeed_video_get_resolution(video); /* Set timings since the device is being opened for the first time */ - video->active_timings = video->detected_timings; - aspeed_video_set_resolution(video); - - video->pix_fmt.width = video->active_timings.width; - video->pix_fmt.height = video->active_timings.height; - video->pix_fmt.sizeimage = video->max_compressed_size; + aspeed_video_update_timings(video, &video->detected_timings); } static void aspeed_video_stop(struct aspeed_video *video) @@ -1414,15 +1496,44 @@ static int aspeed_video_enum_input(struct file *file, void *fh, static int aspeed_video_get_input(struct file *file, void *fh, unsigned int *i) { - *i = 0; + struct aspeed_video *video = video_drvdata(file); + + *i = video->input; return 0; } static int aspeed_video_set_input(struct file *file, void *fh, unsigned int i) { - if (i) + struct aspeed_video *video = video_drvdata(file); + + if (i >= VIDEO_INPUT_MAX) + return -EINVAL; + + if (IS_ERR(video->scu)) { + v4l2_dbg(1, debug, &video->v4l2_dev, "%s: scu isn't ready for input-control\n", __func__); + return -EINVAL; + } + + if (IS_ERR(video->gfx) && i == VIDEO_INPUT_GFX) { + v4l2_dbg(1, debug, &video->v4l2_dev, "%s: gfx isn't ready for GFX input\n", __func__); return -EINVAL; + } + + video->input = i; + + // modify dpll source per current input + if (video->input == VIDEO_INPUT_VGA) + regmap_update_bits(video->scu, SCU_MISC_CTRL, SCU_DPLL_SOURCE, 0); + else + regmap_update_bits(video->scu, SCU_MISC_CTRL, SCU_DPLL_SOURCE, SCU_DPLL_SOURCE); + + aspeed_video_update_regs(video); + + // update signal status + aspeed_video_get_resolution(video); + if (!video->v4l2_input_status) + aspeed_video_update_timings(video, &video->detected_timings); return 0; } @@ -1527,13 +1638,7 @@ static int aspeed_video_set_dv_timings(struct file *file, void *fh, if (vb2_is_busy(&video->queue)) return -EBUSY; - video->active_timings = timings->bt; - - aspeed_video_set_resolution(video); - - video->pix_fmt.width = timings->bt.width; - video->pix_fmt.height = timings->bt.height; - video->pix_fmt.sizeimage = video->max_compressed_size; + aspeed_video_update_timings(video, &timings->bt); timings->type = V4L2_DV_BT_656_1120; @@ -1911,6 +2016,7 @@ static int aspeed_video_debugfs_show(struct seq_file *s, void *data) val08 = aspeed_video_read(v, VE_CTRL); if (FIELD_GET(VE_CTRL_DIRECT_FETCH, val08)) { seq_printf(s, " %-20s:\tDirect fetch\n", "Mode"); + seq_printf(s, " %-20s:\t%s\n", "Input", input_str[v->input]); seq_printf(s, " %-20s:\t%s\n", "VGA bpp mode", FIELD_GET(VE_CTRL_INT_DE, val08) ? "16" : "32"); } else { @@ -2070,12 +2176,31 @@ static int aspeed_video_setup_video(struct aspeed_video *video) return 0; } +// Get regmap without checking res, such as clk/reset, that could lead to conflict. +static struct regmap *aspeed_regmap_lookup(struct device_node *np, const char *property) +{ + struct device_node *syscon_np; + struct regmap *regmap; + + syscon_np = of_parse_phandle(np, property, 0); + if (!syscon_np) + return ERR_PTR(-ENODEV); + + regmap = device_node_to_regmap(syscon_np); + of_node_put(syscon_np); + + return regmap; +} + static int aspeed_video_init(struct aspeed_video *video) { int irq; int rc; struct device *dev = video->dev; + video->scu = aspeed_regmap_lookup(dev->of_node, "aspeed,scu"); + video->gfx = aspeed_regmap_lookup(dev->of_node, "aspeed,gfx"); + irq = irq_of_parse_and_map(dev->of_node, 0); if (!irq) { dev_err(dev, "Unable to find IRQ\n"); diff --git a/include/uapi/linux/aspeed-video.h b/include/uapi/linux/aspeed-video.h index 6586a65548c4..44173be4c8dd 100644 --- a/include/uapi/linux/aspeed-video.h +++ b/include/uapi/linux/aspeed-video.h @@ -8,6 +8,13 @@ #include +// enum for aspeed video's v4l2 s_input +enum aspeed_video_input { + VIDEO_INPUT_VGA = 0, + VIDEO_INPUT_GFX, + VIDEO_INPUT_MAX +}; + #define V4L2_CID_ASPEED_HQ_MODE (V4L2_CID_USER_ASPEED_BASE + 1) #define V4L2_CID_ASPEED_HQ_JPEG_QUALITY (V4L2_CID_USER_ASPEED_BASE + 2) base-commit: e9d22f7a6655941fc8b2b942ed354ec780936b3e -- 2.25.1 . From: Kory Maincent Subject: [PATCH net-next v6 0/7] net: pse-pd: Add new PSE c33 features Date: Thu, 04 Jul 2024 10:11:55 +0200 Message-Id: <20240704-feature_poe_power_cap-v6-0-320003204264@bootlin.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Donald Hunter , Oleksij Rempel , Jonathan Corbet Cc: Thomas Petazzoni , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Dent Project , kernel@pengutronix.de, linux-doc@vger.kernel.org, Kory Maincent , Sai Krishna Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267621 org.kernel.vger.netdev:355619 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-doc,org.kernel.vger.netdev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Kory Maincent (Dent Project) This patch series adds new c33 features to the PSE API. - Expand the PSE PI informations status with power, class and failure reason - Add the possibility to get and set the PSE PIs power limit Changes in v6: - Rebase on top of net-next - Link to v5: https://lore.kernel.org/r/20240628-feature_poe_power_cap-v5-0-5e1375d3817a@bootlin.com Changes in v5: - Fix few nitpick. - Link to v4: https://lore.kernel.org/r/20240625-feature_poe_power_cap-v4-0-b0813aad57d5@bootlin.com Changes in v4: - Made few update in PSE extended state an substate. - Add support for c33 pse power limit ranges. - Few changes in the specs and the documentation. - Link to v3: https://lore.kernel.org/r/20240614-feature_poe_power_cap-v3-0-a26784e78311@bootlin.com Changes in v3: - Use u32 instead of u8 size for c33 pse extended state and substate. - Reformat the state and substate enumeration to follow Oleksij proposal which is more IEEE 802.3 standard compliant - Sent the first patch standalone in net. - Link to v2: https://lore.kernel.org/r/20240607-feature_poe_power_cap-v2-0-c03c2deb83ab@bootlin.com Changes in v2: - Use uA and uV instead of mA and mV to have more precision in the power calculation. Need to use 64bit variables for the calculation. - Modify the pd-92x0behavior in case of setting the current out of the available ranges. Report an error now. - Link to v1: https://lore.kernel.org/r/20240529-feature_poe_power_cap-v1-0-0c4b1d5953b8@bootlin.com Signed-off-by: Kory Maincent --- Kory Maincent (7): net: ethtool: pse-pd: Expand C33 PSE status with class, power and extended state netlink: specs: Expand the PSE netlink command with C33 new features net: pse-pd: pd692x0: Expand ethtool status message net: pse-pd: Add new power limit get and set c33 features net: ethtool: Add new power limit get and set features netlink: specs: Expand the PSE netlink command with C33 pw-limit attributes net: pse-pd: pd692x0: Enhance with new current limit and voltage read callbacks Documentation/netlink/specs/ethtool.yaml | 58 +++++ Documentation/networking/ethtool-netlink.rst | 87 +++++++- drivers/net/pse-pd/pd692x0.c | 317 ++++++++++++++++++++++++++- drivers/net/pse-pd/pse_core.c | 172 ++++++++++++++- include/linux/ethtool.h | 20 ++ include/linux/pse-pd/pse.h | 51 +++++ include/uapi/linux/ethtool.h | 191 ++++++++++++++++ include/uapi/linux/ethtool_netlink.h | 12 + net/ethtool/pse-pd.c | 119 +++++++++- 9 files changed, 997 insertions(+), 30 deletions(-) --- base-commit: 2b117c82eb31424d12326707ba9085dd31fb193b change-id: 20240425-feature_poe_power_cap-18e90ba7294b Best regards, -- Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com . From: Mohammad Rafi Shaik To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , "Mohammad Rafi Shaik" , Prasad Kumpatla CC: , , Subject: [PATCH v2 0/3] Fix the unbalanced pm_runtime_enable in wcd937x-sdw soundwire slave Date: Thu, 4 Jul 2024 13:47:20 +0530 Message-ID: <20240704081723.3394153-1-quic_mohs@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267632 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-sound Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patch set change will fix the unbalanced pm_runtime_enable in wcd937x-sdw soundwire slave. And removed the string compare with widget name in MIC BIAS settings, instead of string compare use the MIC BIAS id's as value. Removed separate handling for vdd-buck regulator supply which is not required. The vdd-buck regulator supply enabled using bulk enable. Added the error handling in wcd937x_probe() and disable the regulators in error case. Changes in v2: - Remove Unrelated devm_free_irq change as suggested by Mark Brown - Link to v1: https://lore.kernel.org/linux-sound/a8a670f9-f03f-eff8-5cb2-b40b06267bc6@quicinc.com/ Changes in v1: - Fixed the unbalanced pm_runtime_enable in wcd937x-sdw soundwire slave - Removed the string compare with widget name in MIC BIAS widget settings suggested by Srinivas Kandagatla https://lore.kernel.org/all/33772eab-74c6-c5c3-fa25-3a643a2f9c57@quicinc.com/ - Removed separate handling for vdd-buck supply Suggested by Christophe JAILLET https://lore.kernel.org/all/834d31cc-f4bc-4db7-a25b-f9869e550eb6@wanadoo.fr/ https://lore.kernel.org/all/288156b9-2f72-6929-3422-c3aecb9c2c07@quicinc.com/ Mohammad Rafi Shaik (3): ASoC: codecs: wcd937x-sdw: Fix Unbalanced pm_runtime_enable ASoC: codecs: wcd937x: Remove the string compare in MIC BIAS widget settings ASoC: codecs: wcd937x: Remove separate handling for vdd-buck supply sound/soc/codecs/wcd937x-sdw.c | 18 +++---- sound/soc/codecs/wcd937x.c | 95 ++++++++-------------------------- sound/soc/codecs/wcd937x.h | 2 +- 3 files changed, 30 insertions(+), 85 deletions(-) base-commit: 0b58e108042b0ed28a71cd7edf5175999955b233 -- 2.25.1 . From: Tuo Li To: gregkh@linuxfoundation.org, jirislaby@kernel.org Cc: baijiaju1990@gmail.com, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Tuo Li Subject: [PATCH] tty: n_gsm: fix a possible data race in gsmtty_open Date: Thu, 4 Jul 2024 16:26:58 +0800 Message-ID: <20240704082658.189577-1-islituo@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267639 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-serial Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In the function gsmtty_open(), the counter port->count is updated without holding the lock port->lock, which may lead to a data race. This possible data race is found by an experimental static analysis tool. This tool analyzes the locking APIs to deduce locking rules about which variable should be protected by which lock. And then the tool checks whether a given variable access violates the deduced locking rules, to detect data races. The above possible data race is reported, when the tool analyzes the source code of Linux 6.2. Referring to the function tty_port_open() in tty_port.c: spin_lock_irq(&port->lock); ++port->count; spin_unlock_irq(&port->lock); we add a lock/unlock pair to protect the access to port->count, to fix this possible data race. Fixes: 86176ed90545 ("TTY: n_gsm, use tty_port_install") Signed-off-by: Tuo Li --- drivers/tty/n_gsm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index be35f7334ecd..b709f1a6bd2d 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -4307,7 +4307,9 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp) struct gsm_dlci *dlci = tty->driver_data; struct tty_port *port = &dlci->port; + spin_lock_irq(&port->lock); port->count++; + spin_unlock_irq(&port->lock); tty_port_tty_set(port, tty); dlci->modem_rx = 0; -- 2.43.0 . From: Manikandan Muralidharan To: , , , , , , , , , , , , , , , , , , , , , , , , , , CC: , , Subject: [PATCH 0/4] MIPI DSI Controller support for SAM9X75 series Date: Thu, 4 Jul 2024 14:18:33 +0530 Message-ID: <20240704084837.168075-1-manikandan.m@microchip.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267663 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patch series adds support for the Microchip's MIPI DSI Controller wrapper driver that uses the Synopsys DesignWare MIPI DSI host controller bridge for SAM9X75 SoC series. Manikandan Muralidharan (4): dt-bindings: display: bridge: add sam9x75-mipi-dsi binding drm/bridge: add Microchip DSI controller support for sam9x7 SoC series MAINTAINERS: add SAM9X7 SoC's Microchip's MIPI DSI host wrapper driver ARM: configs: at91: Enable Microchip's MIPI DSI Host Controller support .../bridge/microchip,sam9x75-mipi-dsi.yaml | 135 +++++ MAINTAINERS | 8 + arch/arm/configs/at91_dt_defconfig | 1 + drivers/gpu/drm/bridge/Kconfig | 8 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/dw-mipi-dsi-mchp.c | 544 ++++++++++++++++++ 6 files changed, 697 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/microchip,sam9x75-mipi-dsi.yaml create mode 100644 drivers/gpu/drm/bridge/dw-mipi-dsi-mchp.c -- 2.25.1 . Date: Thu, 4 Jul 2024 10:52:10 +0200 From: Karel Zak To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, util-linux@vger.kernel.org Subject: [ANNOUNCE] util-linux v2.40.2 Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267669 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-fsdevel,org.kernel.vger.util-linux Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The util-linux stable maintenance release v2.40.2 is now available at http://www.kernel.org/pub/linux/utils/util-linux/v2.40/ Feedback and bug reports, as always, are welcomed. Karel util-linux v2.40.2 Release Notes ================================ Changes between v2.40.1 and v2.40.2 ----------------------------------- autotools: - Properly order install dependencies of pam_lastlog2 [Thomas Weißschuh] - make pam install path configurable [Thomas Weißschuh] bash-completion: - add logger --sd-* completions [Ville Skyttä] build-sys: - _PATH_VENDORDIR workaround [Karel Zak] cfdisk: - fix possible integer overflow [coverity scan] [Karel Zak] docs: - update AUTHORS file [Karel Zak] include/pidfd-utils: - provide ENOSYS stubs if pidfd functions are missing [Thomas Weißschuh] - remove hardcoded syscall fallback [Karel Zak] lib/buffer: - introduce ul_buffer_get_string() [Thomas Weißschuh] lib/fileutils: - add ul_basename() [Karel Zak] lib/path: - Fix ul_path_read_buffer() [Daan De Meyer] lib/sysfs: - abort device hierarchy walk at root of sysfs [Thomas Weißschuh] - zero-terminate result of sysfs_blkdev_get_devchain() [Thomas Weißschuh] libmount: - fix syscall save function [Karel Zak] - fix tree FD usage in subdir hook [Karel Zak] - improving robustness in reading kernel messages [Karel Zak] - add pidfs to pseudo fs list [Mike Yuan] libsmartcols: - fix reduction stages use [Karel Zak] - ensure filter-scanner/paser.c file is newer than the .h file [Chen Qi] libuuid: - clear uuidd cache on fork() [Thomas Weißschuh] - drop check for HAVE_TLS [Thomas Weißschuh] - drop duplicate assignment liuuid_la_LDFLAGS [Karel Zak] - split uuidd cache into dedicated struct [Thomas Weißschuh] - Conditionally add uuid_time64 to sym. version map [Nicholas Vinson] lscpu: - New Arm Cortex part numbers [Jeremy Linton] lsfd: - Refactor the pidfd logic into lsfd-pidfd.c [Xi Ruoyao] - Support pidfs [Xi Ruoyao] - test Adapt test cases for pidfs [Xi Ruoyao] meson: - Correctly require the Python.h header for the python dependency [Jordan Williams] - Fix build-python option [Jordan Williams] - Only require Python module when building pylibmount [Jordan Williams] misc-utils: - uuidd Use ul_sig_err instead of errx [Cristian Rodríguez] mkswap.8.adoc: - update note regarding swapfile creation [Mike Yuan] po: - merge changes [Karel Zak] - update es.po (from translationproject.org) [Antonio Ceballos Roa] - update ja.po (from translationproject.org) [Hideki Yoshida] po-man: - merge changes [Karel Zak] rename: - use ul_basename() [Karel Zak] sys-utils/setpgid: - make -f work [Emanuele Torre] wdctl: - always query device node when sysfs is unavailable [Thomas Weißschuh] -- Karel Zak http://karelzak.blogspot.com . From: Neil Armstrong Date: Thu, 04 Jul 2024 10:52:08 +0200 Subject: [PATCH] power: supply: core: return -EAGAIN on uninitialized read temp X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240704-topic-sm8x50-upstream-fix-battmgr-temp-tz-warn-v1-1-9d66d6f6efde@linaro.org> To: Sebastian Reichel , Krzysztof Kozlowski , Rhyland Klein , Anton Vorontsov , Jenny TC Cc: Daniel Lezcano , "Rafael J. Wysocki" , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, regressions@lists.linux.dev, Neil Armstrong Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267670 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.regressions,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail If the thermal core tries to update the temperature from an uninitialized power supply, it will swawn the following warning: thermal thermal_zoneXX: failed to read out thermal zone (-19) But reading from an uninitialized power supply should not be considered as a fatal error, but the thermal core expects the -EAGAIN error to be returned in this particular case. So convert -ENODEV as -EAGAIN to express the fact that reading temperature from an uninitialized power supply shouldn't be a fatal error, but should indicate to the thermal zone it should retry later. It notably removes such messages on Qualcomm platforms using the qcom_battmgr driver spawning warnings until the aDSP firmware gets up and the battery manager reports valid data. Link: https://lore.kernel.org/all/2ed4c630-204a-4f80-a37f-f2ca838eb455@linaro.org/ Fixes: 5bc28b93a36e ("power_supply: power_supply_read_temp only if use_cnt > 0") Fixes: 3be330bf8860 ("power_supply: Register battery as a thermal zone") Signed-off-by: Neil Armstrong --- drivers/power/supply/power_supply_core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index 8f6025acd10a..b38bff4dbfc7 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -1287,8 +1287,13 @@ static int power_supply_read_temp(struct thermal_zone_device *tzd, WARN_ON(tzd == NULL); psy = thermal_zone_device_priv(tzd); ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_TEMP, &val); + /* + * The thermal core expects -EAGAIN as non-fatal error, + * convert -ENODEV as -EAGAIN since -ENODEV is returned + * when a power supply device isn't initialized + */ if (ret) - return ret; + return ret == -ENODEV ? -EAGAIN : ret; /* Convert tenths of degree Celsius to milli degree Celsius. */ *temp = val.intval * 100; --- base-commit: 82e4255305c554b0bb18b7ccf2db86041b4c8b6e change-id: 20240704-topic-sm8x50-upstream-fix-battmgr-temp-tz-warn-077166861efb Best regards, -- Neil Armstrong . From: Zhaoxiong Lv To: dmitry.torokhov@gmail.com, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, jikos@kernel.org, bentiss@kernel.org, linus.walleij@linaro.org, dianders@google.com, hsinyi@google.com Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Zhaoxiong Lv Subject: [PATCH v1 0/2] HID: i2c-hid: elan: Add elan-ekth6a12nay timing Date: Thu, 4 Jul 2024 16:55:53 +0800 Message-Id: <20240704085555.11204-1-lvzhaoxiong@huaqin.corp-partner.google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267674 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Elan-ekth6a12nay requires reset to pull down time greater than 10ms, so the configuration post_power_delay_ms is 10, and the chipset initial time is required to be greater than 300ms, so the post_gpio_reset_on_delay_ms is set to 300. Zhaoxiong Lv (2): dt-bindings: HID: i2c-hid: elan: Introduce Elan ekth6a12nay HID: i2c-hid: elan: Add elan-ekth6a12nay timing .../devicetree/bindings/input/elan,ekth6915.yaml | 1 + drivers/hid/i2c-hid/i2c-hid-of-elan.c | 8 ++++++++ 2 files changed, 9 insertions(+) -- 2.17.1 . From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: Thorsten Leemhuis , Linus Torvalds , Jarkko Sakkinen , James Bottomley , Mimi Zohar , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 0/3] Address !chip->auth Date: Thu, 4 Jul 2024 11:57:01 +0300 Message-ID: <20240704085708.661142-1-jarkko@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267677 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.keyrings,org.kernel.vger.linux-integrity,org.kernel.vger.linux-security-module Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Unless tpm2_sessions_init() is called, then chip->auth ends up being a null pointer, which is ignored by authenticated sessions code. These patches aim to fully address the bug, and hopefully still make into 6.10-rc7. Tested on x86-64 with: - TCG_TPM2_HMAC disabled. - TCG_TPM2_HMAC enabled. - TCG_TPM2_HMAC enabled, and "/* rc = tpm2_sessions_init(chip); */". For drivers that do not initialize with tpm2_chip_bootstrap(), the lack of auth sessions is reported once per power cycle by: "tpm tpm0: auth session is not active" This is expected output for the following drivers: * tpm_ftpm_tee.c * tpm_i2c_nuvoton.c * tpm_ibmvtpm.c * tpm_tis_i2c_cr50.c * tpm_vtpm_proxy.c They need to later on enable auth sessions, if they eager to. This patch set only fixes any collateral damage of not doing so. v3 * Address: https://lore.kernel.org/linux-integrity/922603265d61011dbb23f18a04525ae973b83ffd.camel@HansenPartnership.com/ * Git: https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git/log/?h=auth-null-3 * Did a full QA run given the changes in config flag handling. v2: * Rebase to commit 8a9c6c40432e ("Merge tag 'io_uring-6.10-20240703' of git://git.kernel.dk/linux"). * Couple of cosmetic fixes. Jarkko Sakkinen (3): tpm: Address !chip->auth in tpm2_*_auth_session() tpm: Address !chip->auth in tpm_buf_append_name() tpm: Address !chip->auth in tpm_buf_append_hmac_session*() drivers/char/tpm/Makefile | 2 +- drivers/char/tpm/tpm2-sessions.c | 415 ++++++++++++++++++------------- include/linux/tpm.h | 74 ++---- 3 files changed, 257 insertions(+), 234 deletions(-) -- 2.45.2 . From: Chen Ni To: stas.yakovlev@gmail.com, kvalo@kernel.org Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Chen Ni Subject: [PATCH] ipw2x00: Use kzalloc instead of kmalloc/memset Date: Thu, 4 Jul 2024 17:06:22 +0800 Message-Id: <20240704090622.2260102-1-nichen@iscas.ac.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267690 org.kernel.vger.linux-wireless:85703 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-wireless Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail replace kmalloc + memset to kzalloc for better code readability and simplicity. Signed-off-by: Chen Ni --- drivers/net/wireless/intel/ipw2x00/libipw_tx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_tx.c b/drivers/net/wireless/intel/ipw2x00/libipw_tx.c index 4aec1fce1ae2..e22a6732a4c3 100644 --- a/drivers/net/wireless/intel/ipw2x00/libipw_tx.c +++ b/drivers/net/wireless/intel/ipw2x00/libipw_tx.c @@ -180,11 +180,10 @@ static struct libipw_txb *libipw_alloc_txb(int nr_frags, int txb_size, struct libipw_txb *txb; int i; - txb = kmalloc(struct_size(txb, fragments, nr_frags), gfp_mask); + txb = kzalloc(struct_size(txb, fragments, nr_frags), gfp_mask); if (!txb) return NULL; - memset(txb, 0, sizeof(struct libipw_txb)); txb->nr_frags = nr_frags; txb->frag_size = txb_size; -- 2.25.1 . From: Ryan Roberts To: Andrew Morton , Jonathan Corbet , David Hildenbrand , Barry Song , Baolin Wang , Lance Yang , Yang Shi Cc: Ryan Roberts , linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2] mm: Fix khugepaged activation policy Date: Thu, 4 Jul 2024 10:10:50 +0100 Message-ID: <20240704091051.2411934-1-ryan.roberts@arm.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267692 org.kvack.linux-mm:202526 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.stable,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Since the introduction of mTHP, the docuementation has stated that khugepaged would be enabled when any mTHP size is enabled, and disabled when all mTHP sizes are disabled. There are 2 problems with this; 1. this is not what was implemented by the code and 2. this is not the desirable behavior. Desirable behavior is for khugepaged to be enabled when any PMD-sized THP is enabled, anon or file. (Note that file THP is still controlled by the top-level control so we must always consider that, as well as the PMD-size mTHP control for anon). khugepaged only supports collapsing to PMD-sized THP so there is no value in enabling it when PMD-sized THP is disabled. So let's change the code and documentation to reflect this policy. Further, per-size enabled control modification events were not previously forwarded to khugepaged to give it an opportunity to start or stop. Consequently the following was resulting in khugepaged eroneously not being activated: echo never > /sys/kernel/mm/transparent_hugepage/enabled echo always > /sys/kernel/mm/transparent_hugepage/hugepages-2048kB/enabled Signed-off-by: Ryan Roberts Fixes: 3485b88390b0 ("mm: thp: introduce multi-size THP sysfs interface") Closes: https://lore.kernel.org/linux-mm/7a0bbe69-1e3d-4263-b206-da007791a5c4@redhat.com/ Cc: stable@vger.kernel.org --- Hi All, Applies on top of mm-unstable from a couple of days ago (9bb8753acdd8). No regressions observed in mm selftests. When fixing this I also noticed that khugepaged doesn't get (and never has been) activated/deactivated by `shmem_enabled=`. I've concluded that this is definitely a (separate) bug. But I'm waiting for the conclusion of the conversation at [2] before fixing, so will send separately. Changes since v1 [1] ==================== - hugepage_pmd_enabled() now considers CONFIG_READ_ONLY_THP_FOR_FS as part of decision; means that for kernels without this config, khugepaged will not be started when only the top-level control is enabled. [1] https://lore.kernel.org/linux-mm/20240702144617.2291480-1-ryan.roberts@arm.com/ [2] https://lore.kernel.org/linux-mm/65c37315-2741-481f-b433-cec35ef1af35@arm.com/ Thanks, Ryan Documentation/admin-guide/mm/transhuge.rst | 11 +++++------ include/linux/huge_mm.h | 15 ++++++++------- mm/huge_memory.c | 7 +++++++ mm/khugepaged.c | 13 ++++++------- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst index 709fe10b60f4..fc321d40b8ac 100644 --- a/Documentation/admin-guide/mm/transhuge.rst +++ b/Documentation/admin-guide/mm/transhuge.rst @@ -202,12 +202,11 @@ PMD-mappable transparent hugepage:: cat /sys/kernel/mm/transparent_hugepage/hpage_pmd_size -khugepaged will be automatically started when one or more hugepage -sizes are enabled (either by directly setting "always" or "madvise", -or by setting "inherit" while the top-level enabled is set to "always" -or "madvise"), and it'll be automatically shutdown when the last -hugepage size is disabled (either by directly setting "never", or by -setting "inherit" while the top-level enabled is set to "never"). +khugepaged will be automatically started when PMD-sized THP is enabled +(either of the per-size anon control or the top-level control are set +to "always" or "madvise"), and it'll be automatically shutdown when +PMD-sized THP is disabled (when both the per-size anon control and the +top-level control are "never") Khugepaged controls ------------------- diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 4d155c7a4792..6debd8b6fd7d 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -128,16 +128,17 @@ static inline bool hugepage_global_always(void) (1< 0) { + int err; + + err = start_stop_khugepaged(); + if (err) + ret = err; + } return ret; } diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 409f67a817f1..708d0e74b61f 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -449,7 +449,7 @@ void khugepaged_enter_vma(struct vm_area_struct *vma, unsigned long vm_flags) { if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags) && - hugepage_flags_enabled()) { + hugepage_pmd_enabled()) { if (thp_vma_allowable_order(vma, vm_flags, TVA_ENFORCE_SYSFS, PMD_ORDER)) __khugepaged_enter(vma->vm_mm); @@ -2462,8 +2462,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, static int khugepaged_has_work(void) { - return !list_empty(&khugepaged_scan.mm_head) && - hugepage_flags_enabled(); + return !list_empty(&khugepaged_scan.mm_head) && hugepage_pmd_enabled(); } static int khugepaged_wait_event(void) @@ -2536,7 +2535,7 @@ static void khugepaged_wait_work(void) return; } - if (hugepage_flags_enabled()) + if (hugepage_pmd_enabled()) wait_event_freezable(khugepaged_wait, khugepaged_wait_event()); } @@ -2567,7 +2566,7 @@ static void set_recommended_min_free_kbytes(void) int nr_zones = 0; unsigned long recommended_min; - if (!hugepage_flags_enabled()) { + if (!hugepage_pmd_enabled()) { calculate_min_free_kbytes(); goto update_wmarks; } @@ -2617,7 +2616,7 @@ int start_stop_khugepaged(void) int err = 0; mutex_lock(&khugepaged_mutex); - if (hugepage_flags_enabled()) { + if (hugepage_pmd_enabled()) { if (!khugepaged_thread) khugepaged_thread = kthread_run(khugepaged, NULL, "khugepaged"); @@ -2643,7 +2642,7 @@ int start_stop_khugepaged(void) void khugepaged_min_free_kbytes_update(void) { mutex_lock(&khugepaged_mutex); - if (hugepage_flags_enabled() && khugepaged_thread) + if (hugepage_pmd_enabled() && khugepaged_thread) set_recommended_min_free_kbytes(); mutex_unlock(&khugepaged_mutex); } -- 2.43.0 . Date: Thu, 04 Jul 2024 17:11:27 +0800 From: kernel test robot To: "x86-ml" Cc: linux-kernel@vger.kernel.org Subject: [tip:master] BUILD SUCCESS fbfd4bcefc65041ce0c6352eb5019e73150c0bf1 Message-ID: <202407041725.C9F8WSRB-lkp@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267694 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git master branch HEAD: fbfd4bcefc65041ce0c6352eb5019e73150c0bf1 Merge branch into tip/master: 'x86/vmware' elapsed time: 1446m configs tested: 120 configs skipped: 2 The following configs have been built successfully. More configs may be tested in the coming days. tested configs: alpha allnoconfig gcc-13.2.0 alpha defconfig gcc-13.2.0 arc allnoconfig gcc-13.2.0 arc randconfig-001-20240704 gcc-13.2.0 arc randconfig-002-20240704 gcc-13.2.0 arc vdk_hs38_defconfig gcc-13.2.0 arm allnoconfig clang-19 arm mxs_defconfig clang-19 arm orion5x_defconfig clang-19 arm pxa168_defconfig clang-19 arm randconfig-001-20240704 gcc-13.2.0 arm randconfig-002-20240704 gcc-13.2.0 arm randconfig-003-20240704 clang-19 arm randconfig-004-20240704 gcc-13.2.0 arm64 allnoconfig gcc-13.2.0 arm64 randconfig-001-20240704 clang-19 arm64 randconfig-002-20240704 gcc-13.2.0 arm64 randconfig-003-20240704 clang-19 arm64 randconfig-004-20240704 gcc-13.2.0 csky allnoconfig gcc-13.2.0 csky defconfig gcc-13.2.0 csky randconfig-001-20240704 gcc-13.2.0 csky randconfig-002-20240704 gcc-13.2.0 hexagon alldefconfig clang-15 hexagon allnoconfig clang-19 hexagon randconfig-001-20240704 clang-19 hexagon randconfig-002-20240704 clang-19 i386 buildonly-randconfig-001-20240704 clang-18 i386 buildonly-randconfig-002-20240704 gcc-13 i386 buildonly-randconfig-003-20240704 gcc-13 i386 buildonly-randconfig-004-20240704 gcc-12 i386 buildonly-randconfig-005-20240704 gcc-12 i386 buildonly-randconfig-006-20240704 gcc-12 i386 randconfig-001-20240704 clang-18 i386 randconfig-002-20240704 gcc-13 i386 randconfig-003-20240704 clang-18 i386 randconfig-004-20240704 gcc-13 i386 randconfig-005-20240704 clang-18 i386 randconfig-006-20240704 gcc-12 i386 randconfig-011-20240704 gcc-13 i386 randconfig-012-20240704 clang-18 i386 randconfig-013-20240704 clang-18 i386 randconfig-014-20240704 clang-18 i386 randconfig-015-20240704 clang-18 i386 randconfig-016-20240704 clang-18 loongarch allmodconfig gcc-13.2.0 loongarch allnoconfig gcc-13.2.0 loongarch randconfig-001-20240704 gcc-13.2.0 loongarch randconfig-002-20240704 gcc-13.2.0 m68k allmodconfig gcc-13.2.0 m68k allnoconfig gcc-13.2.0 m68k allyesconfig gcc-13.2.0 microblaze allmodconfig gcc-13.2.0 microblaze allnoconfig gcc-13.2.0 microblaze allyesconfig gcc-13.2.0 mips allnoconfig gcc-13.2.0 mips db1xxx_defconfig clang-19 mips ip28_defconfig gcc-13.2.0 nios2 3c120_defconfig gcc-13.2.0 nios2 allnoconfig gcc-13.2.0 nios2 randconfig-001-20240704 gcc-13.2.0 nios2 randconfig-002-20240704 gcc-13.2.0 openrisc allnoconfig gcc-13.2.0 openrisc defconfig gcc-13.2.0 openrisc virt_defconfig gcc-13.2.0 parisc allnoconfig gcc-13.2.0 parisc defconfig gcc-13.2.0 parisc randconfig-001-20240704 gcc-13.2.0 parisc randconfig-002-20240704 gcc-13.2.0 powerpc allnoconfig gcc-13.2.0 powerpc ksi8560_defconfig gcc-13.2.0 powerpc randconfig-001-20240704 gcc-13.2.0 powerpc randconfig-002-20240704 gcc-13.2.0 powerpc randconfig-003-20240704 clang-19 powerpc sam440ep_defconfig gcc-13.2.0 powerpc sequoia_defconfig clang-19 powerpc64 randconfig-001-20240704 gcc-13.2.0 powerpc64 randconfig-002-20240704 gcc-13.2.0 powerpc64 randconfig-003-20240704 gcc-13.2.0 riscv allnoconfig gcc-13.2.0 riscv defconfig clang-19 riscv randconfig-001-20240704 clang-19 riscv randconfig-002-20240704 clang-16 s390 allmodconfig clang-19 s390 allnoconfig clang-19 s390 allyesconfig gcc-13.2.0 s390 defconfig clang-19 s390 randconfig-001-20240704 clang-19 s390 randconfig-002-20240704 gcc-13.2.0 sh allmodconfig gcc-13.2.0 sh allnoconfig gcc-13.2.0 sh allyesconfig gcc-13.2.0 sh defconfig gcc-13.2.0 sh randconfig-001-20240704 gcc-13.2.0 sh randconfig-002-20240704 gcc-13.2.0 sparc allmodconfig gcc-13.2.0 sparc64 defconfig gcc-13.2.0 sparc64 randconfig-001-20240704 gcc-13.2.0 sparc64 randconfig-002-20240704 gcc-13.2.0 um allnoconfig clang-17 um defconfig clang-19 um i386_defconfig gcc-13 um randconfig-001-20240704 gcc-10 um randconfig-002-20240704 gcc-12 x86_64 allnoconfig clang-18 x86_64 buildonly-randconfig-001-20240704 clang-18 x86_64 buildonly-randconfig-002-20240704 gcc-12 x86_64 buildonly-randconfig-003-20240704 clang-18 x86_64 buildonly-randconfig-004-20240704 gcc-13 x86_64 buildonly-randconfig-005-20240704 gcc-12 x86_64 buildonly-randconfig-006-20240704 gcc-13 x86_64 defconfig gcc-13 x86_64 randconfig-001-20240704 clang-18 x86_64 randconfig-002-20240704 gcc-11 x86_64 randconfig-003-20240704 clang-18 x86_64 randconfig-004-20240704 clang-18 xtensa allnoconfig gcc-13.2.0 xtensa nommu_kc705_defconfig gcc-13.2.0 xtensa randconfig-001-20240704 gcc-13.2.0 xtensa randconfig-002-20240704 gcc-13.2.0 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki . From: Gowthami Thiagarajan To: , , , CC: , , , Gowthami Thiagarajan Subject: [PATCH v6 0/3] Marvell Odyssey uncore performance monitor support Date: Thu, 4 Jul 2024 14:50:19 +0530 Message-ID: <20240704092022.1136805-1-gthiagarajan@marvell.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267699 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Odyssey is a 64 bit ARM based SoC with multiple performance monitor units for various blocks. This series of patches introduces support for uncore performance monitor units (PMUs) on the Marvell Odyssey platform. The PMUs covered in this series include the DDR PMU and LLC-TAD PMU. v5->v6: - Previous patch series didn't apply properly. Fixed the issue. Gowthami Thiagarajan (3): perf/marvell: Refactor to extract platform data - no functional change perf/marvell: perf/marvell: Odyssey DDR Performance monitor support perf/marvell : Odyssey LLC-TAD performance monitor support drivers/perf/marvell_cn10k_ddr_pmu.c | 530 +++++++++++++++++++++++---- drivers/perf/marvell_cn10k_tad_pmu.c | 66 +++- 2 files changed, 521 insertions(+), 75 deletions(-) -- 2.25.1 . From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Thu, 04 Jul 2024 11:28:21 +0200 Subject: [PATCH] scripts: run-clang-tools: add file filtering option X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20240704-clang-tidy-filter-v1-1-8d4556a35b65@bootlin.com> To: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Nick Desaulniers , Bill Wendling , Justin Stitt Cc: llvm@lists.linux.dev, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Petazzoni , =?utf-8?q?Th=C3=A9o_Lebrun?= Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267707 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.llvm,org.kernel.vger.linux-kbuild Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add file filtering feature. We take zero or more filters at the end as positional arguments. If none are given, the default behavior is kept and we run the tool on all files in the datastore. Else, files must match one or more filter to be analysed. The below command runs clang-tidy on drivers/clk/clk.c and all C files inside drivers/reset/. ./scripts/clang-tools/run-clang-tools.py clang-tidy \ compile_commands.json \ 'drivers/clk/clk.c' 'drivers/reset/*' The Python fnmatch builtin module is used. Matching is case-insensitive. See its documentation for allowed syntax: https://docs.python.org/3/library/fnmatch.html Signed-off-by: Théo Lebrun --- Currently, all files in the datastore are analysed. This is not practical for grabbing errors in a subsystem, or relative to a patch series. Add a file filtering feature with wildcard support. Have a nice day, Théo --- scripts/clang-tools/run-clang-tools.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/scripts/clang-tools/run-clang-tools.py b/scripts/clang-tools/run-clang-tools.py index f31ffd09e1ea..b0b3a9c8cdec 100755 --- a/scripts/clang-tools/run-clang-tools.py +++ b/scripts/clang-tools/run-clang-tools.py @@ -10,6 +10,7 @@ compile_commands.json. """ import argparse +import fnmatch import json import multiprocessing import subprocess @@ -32,6 +33,8 @@ def parse_arguments(): help=type_help) path_help = "Path to the compilation database to parse" parser.add_argument("path", type=str, help=path_help) + file_filter_help = "Optional Unix shell-style wildcard file filters" + parser.add_argument("file_filter", type=str, nargs="*", help=file_filter_help) checks_help = "Checks to pass to the analysis" parser.add_argument("-checks", type=str, default=None, help=checks_help) @@ -48,6 +51,22 @@ def init(l, a): args = a +def filter_entries(datastore, filters): + for entry in datastore: + if filters == []: + yield entry + continue + + assert entry['file'].startswith(entry['directory']) + # filepath is relative to the directory, to avoid matching on the absolute path + filepath = entry['file'][len(entry['directory']):].lstrip('/') + + for pattern in filters: + if fnmatch.fnmatch(filepath, pattern): + yield entry + break + + def run_analysis(entry): # Disable all checks, then re-enable the ones we want global args @@ -87,6 +106,7 @@ def main(): # Read JSON data into the datastore variable with open(args.path, "r") as f: datastore = json.load(f) + datastore = filter_entries(datastore, args.file_filter) pool.map(run_analysis, datastore) except BrokenPipeError: # Python flushes standard streams on exit; redirect remaining output --- base-commit: 22a40d14b572deb80c0648557f4bd502d7e83826 change-id: 20240704-clang-tidy-filter-f470377cb2b4 Best regards, -- Théo Lebrun . From: Aleksandr Mishin To: Jordan Crouse CC: Aleksandr Mishin , Rob Clark , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , David Airlie , Daniel Vetter , , , , , Subject: [PATCH] drm/msm: Fix incorrect file name output in adreno_request_fw() Date: Thu, 4 Jul 2024 12:30:02 +0300 Message-ID: <20240704093002.15155-1-amishin@t-argos.ru> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-KSMG-Rule-ID: 1 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 186323 [Jul 04 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: amishin@t-argos.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05, {Tracking_from_domain_doesnt_match_to}, mx1.t-argos.ru.ru:7.1.1;127.0.0.199:7.1.2;t-argos.ru:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2024/07/04 08:06:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2024/07/04 08:45:00 #25843417 X-KSMG-AntiVirus-Status: Clean, skipped Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267719 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-arm-msm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In adreno_request_fw() when debugging information is printed to the log after firmware load, an incorrect filename is printed. 'newname' is used instead of 'fwname', so prefix "qcom/" is being added to filename. Looks like "copy-paste" mistake. Fix this mistake by replacing 'newname' with 'fwname'. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 9fe041f6fdfe ("drm/msm: Add msm_gem_get_and_pin_iova()") Signed-off-by: Aleksandr Mishin --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 074fb498706f..0bb7d66047f8 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -475,7 +475,7 @@ adreno_request_fw(struct adreno_gpu *adreno_gpu, const char *fwname) ret = request_firmware_direct(&fw, fwname, drm->dev); if (!ret) { DRM_DEV_INFO(drm->dev, "loaded %s from legacy location\n", - newname); + fwname); adreno_gpu->fwloc = FW_LOCATION_LEGACY; goto out; } else if (adreno_gpu->fwloc != FW_LOCATION_UNKNOWN) { -- 2.30.2 . From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, pavel@denx.de, jonathanh@nvidia.com, f.fainelli@gmail.com, sudipm.mukherjee@gmail.com, srw@sladewatkins.net, rwarsow@gmx.de, conor@kernel.org, allen.lkml@gmail.com, broonie@kernel.org Subject: [PATCH 5.4 000/183] 5.4.279-rc2 review Date: Thu, 4 Jul 2024 11:48:03 +0200 Message-ID: <20240704094447.657619578@linuxfoundation.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: ignore X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.279-rc2.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.4.279-rc2 X-KernelTest-Deadline: 2024-07-06T09:44+00:00 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267726 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.patches,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is the start of the stable review cycle for the 5.4.279 release. There are 183 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 Sat, 06 Jul 2024 09:44:13 +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.4.279-rc2.gz or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman Linux 5.4.279-rc2 Alex Bee arm64: dts: rockchip: Add sound-dai-cells for RK3368 Johan Jonker ARM: dts: rockchip: rk3066a: add #sound-dai-cells to hdmi node Kuniyuki Iwashima tcp: Fix data races around icsk->icsk_af_ops. Kuniyuki Iwashima ipv6: Fix data races around sk->sk_prot. Eric Dumazet ipv6: annotate some data-races around sk->sk_prot Matthew Wilcox (Oracle) nfs: Leave pages in the pagecache if readpage failed Uwe Kleine-König pwm: stm32: Refuse too small period requests Jaime Liao mtd: spinand: macronix: Add support for serial NAND flash Arnd Bergmann ftruncate: pass a signed offset Niklas Cassel ata: libata-core: Fix double free on error Sven Eckelmann batman-adv: Don't accept TT entries for out-of-spec VIDs Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_hd_modes Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_ld_modes Arnd Bergmann hexagon: fix fadvise64_64 calling conventions Arnd Bergmann csky, hexagon: fix broken sys_sync_file_range Oleksij Rempel net: can: j1939: enhanced error handling for tightly received RTS messages in xtp_rx_rts_session_new Oleksij Rempel net: can: j1939: recover socket queue on CAN bus error during BAM transmission Shigeru Yoshida net: can: j1939: Initialize unused data in j1939_send_one() Jean-Michel Hautbois tty: mcf: MCF54418 has 10 UARTS Nikita Zhandarovich usb: atm: cxacru: fix endpoint checking in cxacru_bind() Dan Carpenter usb: musb: da8xx: fix a resource leak in probe() Oliver Neukum usb: gadget: printer: SS+ support Jose Ignacio Tornos Martinez net: usb: ax88179_178a: improve link status logs Vasileios Amoiridis iio: chemical: bme680: Fix sensor data read operation Vasileios Amoiridis iio: chemical: bme680: Fix overflows in compensate() functions Vasileios Amoiridis iio: chemical: bme680: Fix calibration data variable Vasileios Amoiridis iio: chemical: bme680: Fix pressure value output Fernando Yang iio: adc: ad7266: Fix variable checking bug Adrian Hunter mmc: sdhci: Do not lock spinlock around mmc_gpio_get_ro() Adrian Hunter mmc: sdhci: Do not invert write-protect twice Ilpo Järvinen mmc: sdhci-pci: Convert PCIBIOS_* return codes to errnos Linus Torvalds x86: stop playing stack games in profile_pc() Aleksandr Mishin gpio: davinci: Validate the obtained number of IRQs Hannes Reinecke nvme: fixup comment for nvme RDMA Provider Type Andrew Davis soc: ti: wkup_m3_ipc: Send NULL dummy message instead of pointer message Ricardo Ribalda media: dvbdev: Initialize sbuf Oswald Buddenhagen ALSA: emux: improve patch ioctl data validation Dawei Li net/dpaa2: Avoid explicit cpumask var allocation on stack Dawei Li net/iucv: Avoid explicit cpumask var allocation on stack Denis Arefev mtd: partitions: redboot: Added conversion of operands to a larger type Laurent Pinchart drm/panel: ilitek-ili9881c: Fix warning with GPIO controllers that sleep Pablo Neira Ayuso netfilter: nf_tables: fully validate NFT_DATA_VALUE on store to data registers Arnd Bergmann parisc: use correct compat recv/recvfrom syscalls Arnd Bergmann sparc: fix old compat_sys_select() Enguerrand de Ribaucourt net: phy: micrel: add Microchip KSZ 9477 to the device table Divya Koppera net: phy: mchp: Add support for LAN8814 QUAD PHY Tristram Ha net: dsa: microchip: fix initial port flush problem Elinor Montmasson ASoC: fsl-asoc-card: set priv->pdev before using it Pablo Neira Ayuso netfilter: nf_tables: validate family when identifying table via handle Alex Deucher drm/amdgpu: fix UBSAN warning in kv_dpm.c Huang-Huang Bao pinctrl: rockchip: fix pinmux reset in rockchip_pmx_set Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO3-B pins Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO2-B pins Hagar Hemdan pinctrl: fix deadlock in create_pinctrl() when handling -EPROBE_DEFER Marc Ferland iio: dac: ad5592r: fix temperature channel scaling value Alexandru Ardelean iio: dac: ad5592r: un-indent code-block for scale read Sergiu Cuciurean iio: dac: ad5592r-base: Replace indio_dev->mlock with own device lock Yazen Ghannam x86/amd_nb: Check for invalid SMN reads Naveen Naidu PCI: Add PCI_ERROR_RESPONSE and related definitions Haifeng Xu perf/core: Fix missing wakeup when waiting for context reference Matthias Maennich kheaders: explicitly define file modes for archived headers Masahiro Yamada Revert "kheaders: substituting --sort in archive creation" Jeff Johnson tracing: Add MODULE_DESCRIPTION() to preemptirq_delay_test Johan Hovold arm64: dts: qcom: qcs404: fix bluetooth device address Krzysztof Kozlowski ARM: dts: samsung: smdk4412: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: exynos4412-origen: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: smdkv310: fix keypad no-autorepeat Grygorii Tertychnyi i2c: ocores: set IACK bit after core is enabled Peter Oberparleiter gcov: add support for GCC 14 Alex Deucher drm/radeon: fix UBSAN warning in kv_dpm.c Raju Rangoju ACPICA: Revert "ACPICA: avoid Info: mapping multiple BARs. Your kernel is fine." Nikita Shubin dmaengine: ioatdma: Fix missing kmem_cache_destroy() Biju Das regulator: core: Fix modpost error "regulator_get_regmap" undefined Oliver Neukum net: usb: rtl8150 fix unintiatilzed variables in rtl8150_get_link_ksettings Jozsef Kadlecsik netfilter: ipset: Fix suspicious rcu_dereference_protected() Heng Qi virtio_net: checksum offloading handling fix David Ruth net/sched: act_api: fix possible infinite loop in tcf_idr_check_alloc() Pedro Tammela net/sched: act_api: rely on rcu in tcf_idr_check_alloc Yue Haibing netns: Make get_net_ns() handle zero refcount net Eric Dumazet xfrm6: check ip6_dst_idev() return value in xfrm6_get_saddr() Eric Dumazet ipv6: prevent possible NULL dereference in rt6_probe() Eric Dumazet ipv6: prevent possible NULL deref in fib6_nh_init() Gavrilov Ilia netrom: Fix a memory leak in nr_heartbeat_expiry() Ondrej Mosnacek cipso: fix total option length computation Christian Marangi mips: bmips: BCM6358: make sure CBR is correctly set Ilpo Järvinen MIPS: Routerboard 532: Fix vendor retry check code Songyang Li MIPS: Octeon: Add PCIe link status check Mario Limonciello PCI/PM: Avoid D3cold for HP Pavilion 17 PC/1972 PCIe Ports Roman Smirnov udf: udftime: prevent overflow in udf_disk_stamp_to_time() Alex Henrie usb: misc: uss720: check for incompatible versions of the Belkin F5U002 Michael Ellerman powerpc/io: Avoid clang null pointer arithmetic warnings Nathan Lynch powerpc/pseries: Enforce hcall result buffer validity and size Uri Arev Bluetooth: ath3k: Fix multiple issues reported by checkpatch.pl Manish Rangankar scsi: qedi: Fix crash while reading debugfs attribute Wander Lairson Costa drop_monitor: replace spin_lock by raw_spin_lock Eric Dumazet batman-adv: bypass empty buckets in batadv_purge_orig_ref() Alessandro Carminati (Red Hat) selftests/bpf: Prevent client connect before server bind in test_tc_tunnel.sh Paul E. McKenney rcutorture: Fix rcu_torture_one_read() pipe_count overflow comment Jean Delvare i2c: at91: Fix the functionality flags of the slave-only interface Shichao Lai usb-storage: alauda: Check whether the media is initialized Sicong Huang greybus: Fix use-after-free bug in gb_interface_release due to race condition. Florian Westphal netfilter: nftables: exthdr: fix 4-byte stack OOB write Matthias Goergens hugetlb_encode.h: fix undefined behaviour (34 << 26) Vineeth Pillai hv_utils: drain the timesync packets on onchannelcallback Oleg Nesterov tick/nohz_full: Don't abuse smp_call_function_single() in tick_setup_device() Ryusuke Konishi nilfs2: fix potential kernel bug due to lack of writeback flag waiting Alexander Shishkin intel_th: pci: Add Lunar Lake support Alexander Shishkin intel_th: pci: Add Meteor Lake-S support Alexander Shishkin intel_th: pci: Add Sapphire Rapids SOC support Alexander Shishkin intel_th: pci: Add Granite Rapids SOC support Alexander Shishkin intel_th: pci: Add Granite Rapids support Nuno Sa dmaengine: axi-dmac: fix possible race in remove() Rick Wertenbroek PCI: rockchip-ep: Remove wrong mask on subsys_vendor_id Su Yue ocfs2: fix races between hole punching and AIO+DIO Su Yue ocfs2: use coarse time for new created files Rik van Riel fs/proc: fix softlockup in __read_vmcore Hagar Gamal Halim Hemdan vmci: prevent speculation leaks by sanitizing event in event_deliver() Steven Rostedt (Google) tracing/selftests: Fix kprobe event name test for .isra. functions Marek Szyprowski drm/exynos: hdmi: report safe 640x480 mode as a fallback when no EDID found Jani Nikula drm/exynos/vidi: fix memory leak in .get_modes() Dirk Behme drivers: core: synchronize really_probe() and dev_uevent() Taehee Yoo ionic: fix use after netif_napi_del() Petr Pavlu net/ipv6: Fix the RT cache flush via sysctl using a previous delay Jozsef Kadlecsik netfilter: ipset: Fix race between namespace cleanup and gc in the list:set type Luiz Augusto von Dentz Bluetooth: L2CAP: Fix rejecting L2CAP_CONN_PARAM_UPDATE_REQ Gal Pressman net/mlx5e: Fix features validation check for tunneled UDP (non-VXLAN) packets Eric Dumazet tcp: fix race in tcp_v6_syn_recv_sock() Adam Miotk drm/bridge/panel: Fix runtime warning on panel bridge release Amjad Ouled-Ameur drm/komeda: check for error-valued pointer Aleksandr Mishin liquidio: Adjust a NULL pointer handling path in lio_vf_rep_copy_packet José Expósito HID: logitech-dj: Fix memory leak in logi_dj_recv_switch_to_dj_mode() Lu Baolu iommu: Return right value in iommu_sva_bind_device() Kun(llfl) iommu/amd: Fix sysfs leak in iommu init Nikita Zhandarovich HID: core: remove unnecessary WARN_ON() in implement() Gregor Herburger gpio: tqmx86: fix typo in Kconfig label Chen Hanxiao SUNRPC: return proper error from gss_wrap_req_priv Dmitry Torokhov Input: try trimming too long modalias strings Breno Leitao scsi: mpt3sas: Avoid test/set_bit() operating in non-allocated memory Kuangyi Chiang xhci: Apply broken streams quirk to Etron EJ188 xHCI host Kuangyi Chiang xhci: Apply reset resume quirk to Etron EJ188 xHCI host Mathias Nyman xhci: Set correct transferred length for cancelled bulk transfers Greg Kroah-Hartman jfs: xattr: fix buffer overflow for invalid xattr Tomas Winkler mei: me: release irq in mei_me_pci_resume error path Alan Stern USB: class: cdc-wdm: Fix CPU lockup caused by excessive log messages Ryusuke Konishi nilfs2: fix nilfs_empty_dir() misjudgment and long loop on I/O errors Matthew Wilcox (Oracle) nilfs2: return the mapped address from nilfs_get_page() Matthew Wilcox (Oracle) nilfs2: Remove check for PageError Dev Jain selftests/mm: compaction_test: fix bogus test success on Aarch64 Muhammad Usama Anjum selftests/mm: conform test to TAP format output Dev Jain selftests/mm: compaction_test: fix incorrect write of zero to nr_hugepages Hugo Villeneuve serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler Hugo Villeneuve serial: sc16is7xx: replace hardcoded divisor value with BIT() macro George Shen drm/amd/display: Handle Y carry-over in VCP X.Y calculation Joao Paulo Goncalves ASoC: ti: davinci-mcasp: Fix race condition during probe Peter Ujfalusi ASoC: ti: davinci-mcasp: Handle missing required DT properties Peter Ujfalusi ASoC: ti: davinci-mcasp: Simplify the configuration parameter handling Peter Ujfalusi ASoC: ti: davinci-mcasp: Remove legacy dma_request parsing Peter Ujfalusi ASoC: ti: davinci-mcasp: Use platform_get_irq_byname_optional Zhang Qilong ASoC: ti: davinci-mcasp: remove always zero of davinci_mcasp_get_dt_params Colin Ian King ASoC: ti: davinci-mcasp: remove redundant assignment to variable ret Wesley Cheng usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete Eric Dumazet ipv6: fix possible race in __fib6_drop_pcpu_from() Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_shutdown in sk_diag_fill(). Kuniyuki Iwashima af_unix: Use skb_queue_len_lockless() in sk_diag_show_rqlen(). Kuniyuki Iwashima af_unix: Use unix_recvq_full_lockless() in unix_stream_connect(). Kuniyuki Iwashima af_unix: Annotate data-race of net->unx.sysctl_max_dgram_qlen. Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in UNIX_DIAG. Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in sendmsg() and recvmsg(). Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in unix_write_space() and poll(). Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_state in unix_inq_len(). Karol Kolacinski ptp: Fix error message on failed pin verification Eric Dumazet net/sched: taprio: always validate TCA_TAPRIO_ATTR_PRIOMAP Moshe Shemesh net/mlx5: Stop waiting for PCI if pci channel is offline Jason Xing tcp: count CLOSE-WAIT sockets for TCP_MIB_CURRESTAB Daniel Borkmann vxlan: Fix regression when dropping packets due to invalid src addresses Hangyu Hua net: sched: sch_multiq: fix possible OOB write in multiq_tune() Eric Dumazet ipv6: sr: block BH in seg6_output_core() and seg6_input_core() Emmanuel Grumbach wifi: iwlwifi: mvm: don't read past the mfuart notifcation Shahar S Matityahu wifi: iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef Johannes Berg wifi: iwlwifi: mvm: revert gen2 TX A-MPDU size to 64 Lin Ma wifi: cfg80211: pmsr: use correct nla_get_uX functions Remi Pommarel wifi: mac80211: Fix deadlock in ieee80211_sta_ps_deliver_wakeup() Nicolas Escande wifi: mac80211: mesh: Fix leak of mesh_preq_queue objects ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +- arch/arm/boot/dts/rk3066a.dtsi | 1 + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 3 + arch/csky/include/uapi/asm/unistd.h | 1 + arch/hexagon/include/asm/syscalls.h | 6 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/hexagon/kernel/syscalltab.c | 7 + arch/mips/bmips/setup.c | 3 +- arch/mips/pci/ops-rc32434.c | 4 +- arch/mips/pci/pcie-octeon.c | 6 + arch/parisc/kernel/syscalls/syscall.tbl | 4 +- arch/powerpc/include/asm/hvcall.h | 8 +- arch/powerpc/include/asm/io.h | 24 +- arch/sparc/kernel/syscalls/syscall.tbl | 2 +- arch/x86/kernel/amd_nb.c | 9 +- arch/x86/kernel/time.c | 20 +- drivers/acpi/acpica/exregion.c | 23 +- drivers/ata/libata-core.c | 8 +- drivers/base/core.c | 3 + drivers/bluetooth/ath3k.c | 25 +- drivers/dma/dma-axi-dmac.c | 2 +- drivers/dma/ioat/init.c | 1 + drivers/gpio/Kconfig | 2 +- drivers/gpio/gpio-davinci.c | 5 + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 2 + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 6 + .../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +- drivers/gpu/drm/bridge/panel.c | 7 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 7 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 7 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +- drivers/gpu/drm/radeon/sumo_dpm.c | 2 + drivers/greybus/interface.c | 1 + drivers/hid/hid-core.c | 1 - drivers/hid/hid-logitech-dj.c | 4 +- drivers/hv/hv_util.c | 19 +- drivers/hwtracing/intel_th/pci.c | 25 ++ drivers/i2c/busses/i2c-at91-slave.c | 3 +- drivers/i2c/busses/i2c-ocores.c | 2 +- drivers/iio/adc/ad7266.c | 2 + drivers/iio/chemical/bme680.h | 2 + drivers/iio/chemical/bme680_core.c | 62 +++- drivers/iio/dac/ad5592r-base.c | 62 ++-- drivers/iio/dac/ad5592r-base.h | 1 + drivers/input/input.c | 105 ++++++- drivers/iommu/amd_iommu_init.c | 9 + drivers/media/dvb-core/dvbdev.c | 2 +- drivers/misc/mei/pci-me.c | 4 +- drivers/misc/vmw_vmci/vmci_event.c | 6 +- drivers/mmc/host/sdhci-pci-core.c | 11 +- drivers/mmc/host/sdhci.c | 25 +- drivers/mtd/nand/spi/macronix.c | 99 +++++++ drivers/mtd/parsers/redboot.c | 2 +- drivers/net/dsa/microchip/ksz9477.c | 6 +- drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 11 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 14 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/fw.c | 4 + drivers/net/ethernet/mellanox/mlx5/core/health.c | 8 + .../net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c | 4 + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +- drivers/net/phy/micrel.c | 15 + drivers/net/usb/ax88179_178a.c | 6 +- drivers/net/usb/rtl8150.c | 3 +- drivers/net/virtio_net.c | 12 +- drivers/net/vxlan.c | 4 + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 10 - drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 9 +- drivers/pci/controller/pcie-rockchip-ep.c | 6 +- drivers/pci/pci.c | 12 + drivers/pinctrl/core.c | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 63 ++++- drivers/ptp/ptp_chardev.c | 3 +- drivers/pwm/pwm-stm32.c | 3 + drivers/regulator/core.c | 1 + drivers/scsi/mpt3sas/mpt3sas_base.c | 19 ++ drivers/scsi/qedi/qedi_debugfs.c | 12 +- drivers/soc/ti/wkup_m3_ipc.c | 7 +- drivers/tty/serial/mcf.c | 2 +- drivers/tty/serial/sc16is7xx.c | 25 +- drivers/usb/atm/cxacru.c | 14 + drivers/usb/class/cdc-wdm.c | 4 +- drivers/usb/gadget/function/f_fs.c | 4 + drivers/usb/gadget/function/f_printer.c | 1 + drivers/usb/host/xhci-pci.c | 7 + drivers/usb/host/xhci-ring.c | 5 +- drivers/usb/misc/uss720.c | 22 +- drivers/usb/musb/da8xx.c | 8 +- drivers/usb/storage/alauda.c | 9 +- fs/jfs/xattr.c | 4 +- fs/nfs/read.c | 4 - fs/nilfs2/dir.c | 59 ++-- fs/nilfs2/segment.c | 3 + fs/ocfs2/file.c | 2 + fs/ocfs2/namei.c | 2 +- fs/open.c | 4 +- fs/proc/vmcore.c | 2 + fs/udf/udftime.c | 11 +- include/linux/compat.h | 2 +- include/linux/iommu.h | 2 +- include/linux/micrel_phy.h | 1 + include/linux/nvme.h | 4 +- include/linux/pci.h | 9 + include/linux/syscalls.h | 2 +- include/net/bluetooth/hci_core.h | 36 ++- include/net/netfilter/nf_tables.h | 5 + include/uapi/asm-generic/hugetlb_encode.h | 24 +- kernel/events/core.c | 13 + kernel/gcov/gcc_4_7.c | 4 +- kernel/gen_kheaders.sh | 9 +- kernel/rcu/rcutorture.c | 3 +- kernel/time/tick-common.c | 42 +-- kernel/trace/preemptirq_delay_test.c | 1 + net/batman-adv/originator.c | 29 ++ net/bluetooth/l2cap_core.c | 8 +- net/can/j1939/main.c | 6 +- net/can/j1939/transport.c | 21 +- net/core/drop_monitor.c | 20 +- net/core/net_namespace.c | 9 +- net/core/sock.c | 6 +- net/ipv4/af_inet.c | 23 +- net/ipv4/cipso_ipv4.c | 12 +- net/ipv4/tcp.c | 16 +- net/ipv6/af_inet6.c | 24 +- net/ipv6/ip6_fib.c | 6 +- net/ipv6/ipv6_sockglue.c | 9 +- net/ipv6/route.c | 9 +- net/ipv6/seg6_iptunnel.c | 14 +- net/ipv6/tcp_ipv6.c | 9 +- net/ipv6/xfrm6_policy.c | 8 +- net/iucv/iucv.c | 26 +- net/mac80211/mesh_pathtbl.c | 13 + net/mac80211/sta_info.c | 4 +- net/netfilter/ipset/ip_set_core.c | 104 ++++--- net/netfilter/ipset/ip_set_list_set.c | 30 +- net/netfilter/nf_tables_api.c | 13 +- net/netfilter/nft_exthdr.c | 17 +- net/netfilter/nft_lookup.c | 3 +- net/netrom/nr_timer.c | 3 +- net/sched/act_api.c | 66 +++-- net/sched/sch_multiq.c | 2 +- net/sched/sch_taprio.c | 15 +- net/sunrpc/auth_gss/auth_gss.c | 4 +- net/unix/af_unix.c | 47 ++-- net/unix/diag.c | 12 +- net/wireless/pmsr.c | 8 +- sound/soc/fsl/fsl-asoc-card.c | 3 +- sound/soc/ti/davinci-mcasp.c | 312 +++++++++------------ sound/synth/emux/soundfont.c | 17 +- tools/include/asm-generic/hugetlb_encode.h | 20 +- tools/testing/selftests/bpf/test_tc_tunnel.sh | 13 +- .../ftrace/test.d/kprobe/kprobe_eventname.tc | 3 +- tools/testing/selftests/vm/compaction_test.c | 103 +++---- 159 files changed, 1478 insertions(+), 853 deletions(-) . From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, pavel@denx.de, jonathanh@nvidia.com, f.fainelli@gmail.com, sudipm.mukherjee@gmail.com, srw@sladewatkins.net, rwarsow@gmx.de, conor@kernel.org, allen.lkml@gmail.com, broonie@kernel.org Subject: [PATCH 5.10 000/284] 5.10.221-rc2 review Date: Thu, 4 Jul 2024 11:48:18 +0200 Message-ID: <20240704094505.095988824@linuxfoundation.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: ignore X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.221-rc2.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.10.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.10.221-rc2 X-KernelTest-Deadline: 2024-07-06T09:45+00:00 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267727 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.patches,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is the start of the stable review cycle for the 5.10.221 release. There are 284 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 Sat, 06 Jul 2024 09:44:13 +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.10.221-rc2.gz or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman Linux 5.10.221-rc2 Yunseong Kim tracing/net_sched: NULL pointer dereference in perf_trace_qdisc_reset() Udit Kumar serial: 8250_omap: Fix Errata i2310 with RX FIFO level check Sebastian Andrzej Siewior xdp: xdp_mem_allocator can be NULL in trace_mem_connect(). Alex Bee arm64: dts: rockchip: Add sound-dai-cells for RK3368 Johan Jonker ARM: dts: rockchip: rk3066a: add #sound-dai-cells to hdmi node Marc Zyngier KVM: arm64: vgic-v4: Make the doorbell request robust w.r.t preemption Ard Biesheuvel efi/x86: Free EFI memory map only when installing a new one. Ard Biesheuvel efi: xen: Set EFI_PARAVIRT for Xen dom0 boot on all architectures Ard Biesheuvel efi: memmap: Move manipulation routines into x86 arch tree Liu Zixian efi: Correct comment on efi_memmap_alloc Zheng Zhi Yuan drivers: fix typo in firmware/efi/memmap.c Kuniyuki Iwashima tcp: Fix data races around icsk->icsk_af_ops. Kuniyuki Iwashima ipv6: Fix data races around sk->sk_prot. Eric Dumazet ipv6: annotate some data-races around sk->sk_prot Matthew Wilcox (Oracle) nfs: Leave pages in the pagecache if readpage failed Uwe Kleine-König pwm: stm32: Refuse too small period requests Jaime Liao mtd: spinand: macronix: Add support for serial NAND flash Arnd Bergmann syscalls: fix compat_sys_io_pgetevents_time64 usage Arnd Bergmann ftruncate: pass a signed offset Niklas Cassel ata: libata-core: Fix double free on error Niklas Cassel ata: ahci: Clean up sysfs file on error Sven Eckelmann batman-adv: Don't accept TT entries for out-of-spec VIDs Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_hd_modes Janusz Krzysztofik drm/i915/gt: Fix potential UAF by revoke of fence registers Ma Ke drm/nouveau/dispnv04: fix null pointer dereference in nv17_tv_get_ld_modes Arnd Bergmann hexagon: fix fadvise64_64 calling conventions Arnd Bergmann csky, hexagon: fix broken sys_sync_file_range Dragan Simic kbuild: Install dtb files as 0644 in Makefile.dtbinst Oleksij Rempel net: can: j1939: enhanced error handling for tightly received RTS messages in xtp_rx_rts_session_new Oleksij Rempel net: can: j1939: recover socket queue on CAN bus error during BAM transmission Shigeru Yoshida net: can: j1939: Initialize unused data in j1939_send_one() Jean-Michel Hautbois tty: mcf: MCF54418 has 10 UARTS Udit Kumar serial: 8250_omap: Implementation of Errata i2310 Nikita Zhandarovich usb: atm: cxacru: fix endpoint checking in cxacru_bind() Dan Carpenter usb: musb: da8xx: fix a resource leak in probe() Oliver Neukum usb: gadget: printer: fix races against disable Oliver Neukum usb: gadget: printer: SS+ support Jose Ignacio Tornos Martinez net: usb: ax88179_178a: improve link status logs Vasileios Amoiridis iio: chemical: bme680: Fix sensor data read operation Vasileios Amoiridis iio: chemical: bme680: Fix overflows in compensate() functions Vasileios Amoiridis iio: chemical: bme680: Fix calibration data variable Vasileios Amoiridis iio: chemical: bme680: Fix pressure value output Fernando Yang iio: adc: ad7266: Fix variable checking bug David Lechner counter: ti-eqep: enable clock at probe Adrian Hunter mmc: sdhci: Do not lock spinlock around mmc_gpio_get_ro() Adrian Hunter mmc: sdhci: Do not invert write-protect twice Ilpo Järvinen mmc: sdhci-pci: Convert PCIBIOS_* return codes to errnos Jan Kara ocfs2: fix DIO failure due to insufficient transaction credits Linus Torvalds x86: stop playing stack games in profile_pc() Kent Gibson gpiolib: cdev: Disallow reconfiguration without direction (uAPI v1) Aleksandr Mishin gpio: davinci: Validate the obtained number of IRQs Liu Ying drm/panel: simple: Add missing display timing flags for KOE TX26D202VM0BWA Hannes Reinecke nvme: fixup comment for nvme RDMA Provider Type Erick Archer drm/radeon/radeon_display: Decrease the size of allocated memory Andrew Davis soc: ti: wkup_m3_ipc: Send NULL dummy message instead of pointer message Ricardo Ribalda media: dvbdev: Initialize sbuf Oswald Buddenhagen ALSA: emux: improve patch ioctl data validation Dawei Li net/dpaa2: Avoid explicit cpumask var allocation on stack Dawei Li net/iucv: Avoid explicit cpumask var allocation on stack Anton Protopopov bpf: Add a check for struct bpf_fib_lookup size Denis Arefev mtd: partitions: redboot: Added conversion of operands to a larger type Laurent Pinchart drm/panel: ilitek-ili9881c: Fix warning with GPIO controllers that sleep Pablo Neira Ayuso netfilter: nf_tables: fully validate NFT_DATA_VALUE on store to data registers Arnd Bergmann parisc: use correct compat recv/recvfrom syscalls Arnd Bergmann sparc: fix compat recv/recvfrom syscalls Arnd Bergmann sparc: fix old compat_sys_select() Daniil Dulov xdp: Remove WARN() from __xdp_reg_mem_model() Toke Høiland-Jørgensen xdp: Allow registering memory model without rxq reference Jakub Kicinski xdp: Move the rxq_info.mem clearing to unreg_mem_model() Enguerrand de Ribaucourt net: phy: micrel: add Microchip KSZ 9477 to the device table Tristram Ha net: dsa: microchip: fix initial port flush problem Elinor Montmasson ASoC: fsl-asoc-card: set priv->pdev before using it Jeff Layton nfsd: hold a lighter-weight client reference over CB_RECALL_ANY Chuck Lever SUNRPC: Fix svcxdr_init_encode's buflen calculation Chuck Lever SUNRPC: Fix svcxdr_init_decode's end-of-buffer calculation Chuck Lever SUNRPC: Fix a NULL pointer deref in trace_svc_stats_latency() Yunjian Wang SUNRPC: Fix null pointer dereference in svc_rqst_free() Pablo Neira Ayuso netfilter: nf_tables: validate family when identifying table via handle Alex Deucher drm/amdgpu: fix UBSAN warning in kv_dpm.c Huang-Huang Bao pinctrl: rockchip: fix pinmux reset in rockchip_pmx_set Huang-Huang Bao pinctrl: rockchip: use dedicated pinctrl type for RK3328 Jianqun Xu pinctrl/rockchip: separate struct rockchip_pin_bank to a head file Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO3-B pins Huang-Huang Bao pinctrl: rockchip: fix pinmux bits for RK3328 GPIO2-B pins Hagar Hemdan pinctrl: fix deadlock in create_pinctrl() when handling -EPROBE_DEFER John Keeping Input: ili210x - fix ili251x_read_touch_data() return value Mario Limonciello ACPI: x86: Force StorageD3Enable on more products Mario Limonciello ACPI: x86: utils: Add Picasso to the list for forcing StorageD3Enable Mario Limonciello ACPI: x86: utils: Add Cezanne to the list for forcing StorageD3Enable Mario Limonciello ACPI: x86: Add another system to quirk list for forcing StorageD3Enable Mario Limonciello ACPI: x86: Add a quirk for Dell Inspiron 14 2-in-1 for StorageD3Enable Mario Limonciello ACPI: Add quirks for AMD Renoir/Lucienne CPUs to force the D3 hint Enzo Matsumiya smb: client: fix deadlock in smb2_find_smb_tcon() Shyam Prasad N cifs: missed ref-counting smb session in find Yazen Ghannam x86/amd_nb: Check for invalid SMN reads Naveen Naidu PCI: Add PCI_ERROR_RESPONSE and related definitions Haifeng Xu perf/core: Fix missing wakeup when waiting for context reference Matthias Maennich kheaders: explicitly define file modes for archived headers Masahiro Yamada Revert "kheaders: substituting --sort in archive creation" Ken Milmore r8169: Fix possible ring buffer corruption on fragmented Tx packets. Heiner Kallweit r8169: remove not needed check in rtl8169_start_xmit Heiner Kallweit r8169: remove nr_frags argument from rtl_tx_slots_avail Heiner Kallweit r8169: improve rtl8169_start_xmit Heiner Kallweit r8169: improve rtl_tx Heiner Kallweit r8169: remove unneeded memory barrier in rtl_tx Tony Luck x86/cpu: Fix x86_match_cpu() to match just X86_VENDOR_INTEL Tony Luck x86/cpu/vfm: Add new macros to work with (vendor/family/model) values Jeff Johnson tracing: Add MODULE_DESCRIPTION() to preemptirq_delay_test Matthew Mirvish bcache: fix variable length array abuse in btree_iter Vamshi Gajjela spmi: hisi-spmi-controller: Do not override device identifier Trond Myklebust knfsd: LOOKUP can return an illegal error value Tomi Valkeinen pmdomain: ti-sci: Fix duplicate PD referrals Bitterblue Smith wifi: rtlwifi: rtl8192de: Fix 5 GHz TX power Kees Cook rtlwifi: rtl8192de: Style clean-ups Krzysztof Kozlowski ARM: dts: samsung: smdk4412: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: exynos4412-origen: fix keypad no-autorepeat Krzysztof Kozlowski ARM: dts: samsung: smdkv310: fix keypad no-autorepeat Martin Leung drm/amd/display: revert Exit idle optimizations before HDCP execution Krzysztof Kozlowski dt-bindings: i2c: google,cros-ec-i2c-tunnel: correct path to i2c-controller schema Grygorii Tertychnyi i2c: ocores: set IACK bit after core is enabled Aleksandr Nogikh kcov: don't lose track of remote references during softirqs Peter Oberparleiter gcov: add support for GCC 14 Alex Deucher drm/radeon: fix UBSAN warning in kv_dpm.c Edson Juliano Drosdeck ALSA: hda/realtek: Limit mic boost on N14AP7 Patrisious Haddad RDMA/mlx5: Add check for srq max_sge attribute Raju Rangoju ACPICA: Revert "ACPICA: avoid Info: mapping multiple BARs. Your kernel is fine." Nikita Shubin dmaengine: ioatdma: Fix missing kmem_cache_destroy() Nikita Shubin dmaengine: ioatdma: Fix kmemleak in ioat_pci_probe() Nikita Shubin dmaengine: ioatdma: Fix error path in ioat3_dma_probe() Bjorn Helgaas dmaengine: ioat: use PCI core macros for PCIe Capability Nikita Shubin dmaengine: ioatdma: Fix leaking on version mismatch Bjorn Helgaas dmaengine: ioat: Drop redundant pci_enable_pcie_error_reporting() Qing Wang dmaengine: ioat: switch from 'pci_' to 'dma_' API Biju Das regulator: core: Fix modpost error "regulator_get_regmap" undefined Oliver Neukum net: usb: rtl8150 fix unintiatilzed variables in rtl8150_get_link_ksettings Jozsef Kadlecsik netfilter: ipset: Fix suspicious rcu_dereference_protected() Heng Qi virtio_net: checksum offloading handling fix Xiaolei Wang net: stmmac: No need to calculate speed divider when offload is disabled Xin Long sched: act_ct: add netns into the key of tcf_ct_flow_table Vlad Buslov net/sched: act_ct: set 'net' pointer when creating new nf_flow_table Xin Long tipc: force a dst refcount before doing decryption David Ruth net/sched: act_api: fix possible infinite loop in tcf_idr_check_alloc() Pedro Tammela net/sched: act_api: rely on rcu in tcf_idr_check_alloc Stefan Wahren qca_spi: Make interrupt remembering atomic Yue Haibing netns: Make get_net_ns() handle zero refcount net Eric Dumazet xfrm6: check ip6_dst_idev() return value in xfrm6_get_saddr() Eric Dumazet ipv6: prevent possible NULL dereference in rt6_probe() Eric Dumazet ipv6: prevent possible NULL deref in fib6_nh_init() Gavrilov Ilia netrom: Fix a memory leak in nr_heartbeat_expiry() Ondrej Mosnacek cipso: fix total option length computation Masami Hiramatsu (Google) tracing: Build event generation tests only as modules Christian Marangi mips: bmips: BCM6358: make sure CBR is correctly set Ilpo Järvinen MIPS: Routerboard 532: Fix vendor retry check code Parker Newman serial: exar: adding missing CTI and Exar PCI ids Songyang Li MIPS: Octeon: Add PCIe link status check Mario Limonciello PCI/PM: Avoid D3cold for HP Pavilion 17 PC/1972 PCIe Ports Roman Smirnov udf: udftime: prevent overflow in udf_disk_stamp_to_time() Alex Henrie usb: misc: uss720: check for incompatible versions of the Belkin F5U002 Yunlei He f2fs: remove clear SB_INLINECRYPT flag in default_options Aleksandr Aprelkov iommu/arm-smmu-v3: Free MSIs in case of ENOMEM Tzung-Bi Shih power: supply: cros_usbpd: provide ID table for avoiding fallback match Michael Ellerman powerpc/io: Avoid clang null pointer arithmetic warnings Nathan Lynch powerpc/pseries: Enforce hcall result buffer validity and size Erico Nunes drm/lima: mask irqs in timeout path before hard reset Erico Nunes drm/lima: add mask irq callback to gp and pp Pierre-Louis Bossart ASoC: Intel: sof_sdw: add JD2 quirk for HP Omen 14 Nicholas Kazlauskas drm/amd/display: Exit idle optimizations before HDCP execution Uri Arev Bluetooth: ath3k: Fix multiple issues reported by checkpatch.pl Takashi Iwai ACPI: video: Add backlight=native quirk for Lenovo Slim 7 16ARH7 Sean O'Brien HID: Add quirk for Logitech Casa touchpad Breno Leitao netpoll: Fix race condition in netpoll_owner_active Kunwu Chan kselftest: arm64: Add a null pointer check Manish Rangankar scsi: qedi: Fix crash while reading debugfs attribute Wander Lairson Costa drop_monitor: replace spin_lock by raw_spin_lock Eric Dumazet af_packet: avoid a false positive warning in packet_setsockopt() Arnd Bergmann wifi: ath9k: work around memset overflow warning Eric Dumazet batman-adv: bypass empty buckets in batadv_purge_orig_ref() Yonghong Song selftests/bpf: Fix flaky test btf_map_in_map/lookup_update Alessandro Carminati (Red Hat) selftests/bpf: Prevent client connect before server bind in test_tc_tunnel.sh Justin Stitt block/ioctl: prefer different overflow check Zqiang rcutorture: Fix invalid context warning when enable srcu barrier testing Paul E. McKenney rcutorture: Fix rcu_torture_one_read() pipe_count overflow comment Herbert Xu padata: Disable BH when taking works lock on MT path Oleg Nesterov zap_pid_ns_processes: clear TIF_NOTIFY_SIGNAL along with TIF_SIGPENDING Jean Delvare i2c: designware: Fix the functionality flags of the slave-only interface Jean Delvare i2c: at91: Fix the functionality flags of the slave-only interface Shichao Lai usb-storage: alauda: Check whether the media is initialized Sicong Huang greybus: Fix use-after-free bug in gb_interface_release due to race condition. Beleswar Padhi remoteproc: k3-r5: Jump to error handling labels in start/stop errors YonglongLi mptcp: pm: update add_addr counters after connect YonglongLi mptcp: pm: inc RmAddr MIB counter once per RM_ADDR ID Paolo Abeni mptcp: ensure snd_una is properly initialized on connect Matthias Goergens hugetlb_encode.h: fix undefined behaviour (34 << 26) Doug Brown serial: 8250_pxa: Configure tx_loadsz to match FIFO IRQ level Oleg Nesterov tick/nohz_full: Don't abuse smp_call_function_single() in tick_setup_device() Ryusuke Konishi nilfs2: fix potential kernel bug due to lack of writeback flag waiting Alexander Shishkin intel_th: pci: Add Lunar Lake support Alexander Shishkin intel_th: pci: Add Meteor Lake-S support Alexander Shishkin intel_th: pci: Add Sapphire Rapids SOC support Alexander Shishkin intel_th: pci: Add Granite Rapids SOC support Alexander Shishkin intel_th: pci: Add Granite Rapids support Beleswar Padhi remoteproc: k3-r5: Do not allow core1 to power up before core0 via sysfs Nuno Sa dmaengine: axi-dmac: fix possible race in remove() Rick Wertenbroek PCI: rockchip-ep: Remove wrong mask on subsys_vendor_id Su Yue ocfs2: fix races between hole punching and AIO+DIO Su Yue ocfs2: use coarse time for new created files Rik van Riel fs/proc: fix softlockup in __read_vmcore Hagar Gamal Halim Hemdan vmci: prevent speculation leaks by sanitizing event in event_deliver() Marek Szyprowski drm/exynos: hdmi: report safe 640x480 mode as a fallback when no EDID found Jani Nikula drm/exynos/vidi: fix memory leak in .get_modes() Dirk Behme drivers: core: synchronize really_probe() and dev_uevent() Jean-Baptiste Maneyrol iio: imu: inv_icm42600: delete unneeded update watermark call Marc Ferland iio: dac: ad5592r: fix temperature channel scaling value David Lechner iio: adc: ad9467: fix scan type sign Taehee Yoo ionic: fix use after netif_napi_del() Petr Pavlu net/ipv6: Fix the RT cache flush via sysctl using a previous delay Xiaolei Wang net: stmmac: replace priv->speed with the portTransmitRate from the tc-cbs parameters Jozsef Kadlecsik netfilter: ipset: Fix race between namespace cleanup and gc in the list:set type Luiz Augusto von Dentz Bluetooth: L2CAP: Fix rejecting L2CAP_CONN_PARAM_UPDATE_REQ Gal Pressman net/mlx5e: Fix features validation check for tunneled UDP (non-VXLAN) packets Eric Dumazet tcp: fix race in tcp_v6_syn_recv_sock() Adam Miotk drm/bridge/panel: Fix runtime warning on panel bridge release Amjad Ouled-Ameur drm/komeda: check for error-valued pointer Aleksandr Mishin liquidio: Adjust a NULL pointer handling path in lio_vf_rep_copy_packet Jie Wang net: hns3: add cond_resched() to hns3 ring buffer init process Csókás, Bence net: sfp: Always call `sfp_sm_mod_remove()` on remove Ian Forbes drm/vmwgfx: 3D disabled should not effect STDU memory limits José Expósito HID: logitech-dj: Fix memory leak in logi_dj_recv_switch_to_dj_mode() Lu Baolu iommu: Return right value in iommu_sva_bind_device() Kun(llfl) iommu/amd: Fix sysfs leak in iommu init Vasant Hegde iommu/amd: Introduce pci segment structure Matthias Schiffer gpio: tqmx86: store IRQ trigger type and unmask status separately Nikita Zhandarovich HID: core: remove unnecessary WARN_ON() in implement() Gregor Herburger gpio: tqmx86: fix typo in Kconfig label Chen Hanxiao SUNRPC: return proper error from gss_wrap_req_priv Dmitry Torokhov Input: try trimming too long modalias strings Michael Ellerman powerpc/uaccess: Fix build errors seen with GCC 13/14 Breno Leitao scsi: mpt3sas: Avoid test/set_bit() operating in non-allocated memory Kuangyi Chiang xhci: Apply broken streams quirk to Etron EJ188 xHCI host Kuangyi Chiang xhci: Apply reset resume quirk to Etron EJ188 xHCI host Mathias Nyman xhci: Set correct transferred length for cancelled bulk transfers Greg Kroah-Hartman jfs: xattr: fix buffer overflow for invalid xattr Tomas Winkler mei: me: release irq in mei_me_pci_resume error path Alan Stern USB: class: cdc-wdm: Fix CPU lockup caused by excessive log messages Ryusuke Konishi nilfs2: fix nilfs_empty_dir() misjudgment and long loop on I/O errors Matthew Wilcox (Oracle) nilfs2: return the mapped address from nilfs_get_page() Matthew Wilcox (Oracle) nilfs2: Remove check for PageError Filipe Manana btrfs: fix leak of qgroup extent records after transaction abort Dev Jain selftests/mm: compaction_test: fix bogus test success on Aarch64 Muhammad Usama Anjum selftests/mm: conform test to TAP format output Dev Jain selftests/mm: compaction_test: fix incorrect write of zero to nr_hugepages Uwe Kleine-König mmc: davinci: Don't strip remove function when driver is builtin Hugo Villeneuve serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler Hugo Villeneuve serial: sc16is7xx: replace hardcoded divisor value with BIT() macro George Shen drm/amd/display: Handle Y carry-over in VCP X.Y calculation Wesley Cheng usb: gadget: f_fs: Fix race between aio_cancel() and AIO request complete Eric Dumazet ipv6: fix possible race in __fib6_drop_pcpu_from() Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_shutdown in sk_diag_fill(). Kuniyuki Iwashima af_unix: Use skb_queue_len_lockless() in sk_diag_show_rqlen(). Kuniyuki Iwashima af_unix: Use unix_recvq_full_lockless() in unix_stream_connect(). Kuniyuki Iwashima af_unix: Annotate data-race of net->unx.sysctl_max_dgram_qlen. Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in UNIX_DIAG. Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in sendmsg() and recvmsg(). Kuniyuki Iwashima af_unix: Annotate data-races around sk->sk_state in unix_write_space() and poll(). Kuniyuki Iwashima af_unix: Annotate data-race of sk->sk_state in unix_inq_len(). Karol Kolacinski ptp: Fix error message on failed pin verification Eric Dumazet net/sched: taprio: always validate TCA_TAPRIO_ATTR_PRIOMAP Jason Xing tcp: count CLOSE-WAIT sockets for TCP_MIB_CURRESTAB Daniel Borkmann vxlan: Fix regression when dropping packets due to invalid src addresses Hangyu Hua net: sched: sch_multiq: fix possible OOB write in multiq_tune() Eric Dumazet ipv6: sr: block BH in seg6_output_core() and seg6_input_core() DelphineCCChiu net/ncsi: Fix the multi thread manner of NCSI driver Peter Delevoryas net/ncsi: Simplify Kconfig/dts control flow Ivan Mikhaylov net/ncsi: add NCSI Intel OEM command to keep PHY up Lingbo Kong wifi: mac80211: correctly parse Spatial Reuse Parameter Set element Emmanuel Grumbach wifi: iwlwifi: mvm: don't read past the mfuart notifcation Miri Korenblit wifi: iwlwifi: mvm: check n_ssids before accessing the ssids Shahar S Matityahu wifi: iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef Johannes Berg wifi: iwlwifi: mvm: revert gen2 TX A-MPDU size to 64 Lin Ma wifi: cfg80211: pmsr: use correct nla_get_uX functions Remi Pommarel wifi: mac80211: Fix deadlock in ieee80211_sta_ps_deliver_wakeup() Nicolas Escande wifi: mac80211: mesh: Fix leak of mesh_preq_queue objects Damien Le Moal null_blk: Print correct max open zones limit in null_init_zoned_dev() Steven Rostedt (Google) tracing/selftests: Fix kprobe event name test for .isra. functions ------------- Diffstat: .../bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 2 +- Makefile | 4 +- arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +- arch/arm/boot/dts/rk3066a.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 3 + arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/include/asm/unistd32.h | 2 +- arch/arm64/kvm/arm.c | 6 +- arch/arm64/kvm/vgic/vgic-v3.c | 2 +- arch/arm64/kvm/vgic/vgic-v4.c | 8 +- arch/csky/include/uapi/asm/unistd.h | 1 + arch/hexagon/include/asm/syscalls.h | 6 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/hexagon/kernel/syscalltab.c | 7 + arch/mips/bmips/setup.c | 3 +- arch/mips/kernel/syscalls/syscall_n32.tbl | 2 +- arch/mips/kernel/syscalls/syscall_o32.tbl | 2 +- arch/mips/pci/ops-rc32434.c | 4 +- arch/mips/pci/pcie-octeon.c | 6 + arch/parisc/kernel/syscalls/syscall.tbl | 4 +- arch/powerpc/include/asm/hvcall.h | 8 +- arch/powerpc/include/asm/io.h | 24 +- arch/powerpc/include/asm/uaccess.h | 15 +- arch/powerpc/kernel/syscalls/syscall.tbl | 2 +- arch/s390/kernel/syscalls/syscall.tbl | 2 +- arch/sparc/kernel/sys32.S | 221 ---------------- arch/sparc/kernel/syscalls/syscall.tbl | 8 +- arch/x86/entry/syscalls/syscall_32.tbl | 2 +- arch/x86/include/asm/cpu_device_id.h | 98 +++++++ arch/x86/include/asm/efi.h | 11 + arch/x86/kernel/amd_nb.c | 9 +- arch/x86/kernel/cpu/match.c | 4 +- arch/x86/kernel/time.c | 20 +- arch/x86/platform/efi/Makefile | 3 +- arch/x86/platform/efi/efi.c | 8 +- arch/x86/platform/efi/memmap.c | 249 +++++++++++++++++ block/ioctl.c | 2 +- drivers/acpi/acpica/exregion.c | 23 +- drivers/acpi/device_pm.c | 3 + drivers/acpi/internal.h | 9 + drivers/acpi/video_detect.c | 8 + drivers/acpi/x86/utils.c | 34 +++ drivers/ata/ahci.c | 17 +- drivers/ata/libata-core.c | 8 +- drivers/base/core.c | 3 + drivers/block/null_blk/zoned.c | 2 +- drivers/bluetooth/ath3k.c | 25 +- drivers/counter/ti-eqep.c | 6 + drivers/dma/dma-axi-dmac.c | 2 +- drivers/dma/ioat/init.c | 73 +++-- drivers/dma/ioat/registers.h | 7 - drivers/firmware/efi/fdtparams.c | 4 + drivers/firmware/efi/memmap.c | 239 +---------------- drivers/gpio/Kconfig | 2 +- drivers/gpio/gpio-davinci.c | 5 + drivers/gpio/gpio-tqmx86.c | 46 ++-- drivers/gpio/gpiolib-cdev.c | 16 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 6 + drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c | 2 + .../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +- drivers/gpu/drm/bridge/panel.c | 7 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 7 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 7 +- drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 + drivers/gpu/drm/lima/lima_bcast.c | 12 + drivers/gpu/drm/lima/lima_bcast.h | 3 + drivers/gpu/drm/lima/lima_gp.c | 8 + drivers/gpu/drm/lima/lima_pp.c | 18 ++ drivers/gpu/drm/lima/lima_sched.c | 7 + drivers/gpu/drm/lima/lima_sched.h | 1 + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +- drivers/gpu/drm/panel/panel-simple.c | 1 + drivers/gpu/drm/radeon/radeon.h | 1 - drivers/gpu/drm/radeon/radeon_display.c | 8 +- drivers/gpu/drm/radeon/sumo_dpm.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 - drivers/greybus/interface.c | 1 + drivers/hid/hid-core.c | 1 - drivers/hid/hid-ids.h | 1 + drivers/hid/hid-logitech-dj.c | 4 +- drivers/hid/hid-multitouch.c | 6 + drivers/hwtracing/intel_th/pci.c | 25 ++ drivers/i2c/busses/i2c-at91-slave.c | 3 +- drivers/i2c/busses/i2c-designware-slave.c | 2 +- drivers/i2c/busses/i2c-ocores.c | 2 +- drivers/iio/adc/ad7266.c | 2 + drivers/iio/adc/ad9467.c | 4 +- drivers/iio/chemical/bme680.h | 2 + drivers/iio/chemical/bme680_core.c | 62 ++++- drivers/iio/dac/ad5592r-base.c | 2 +- drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 4 - drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 4 - drivers/infiniband/hw/mlx5/srq.c | 13 +- drivers/input/input.c | 105 ++++++-- drivers/input/touchscreen/ili210x.c | 4 +- drivers/iommu/amd/amd_iommu_types.h | 24 +- drivers/iommu/amd/init.c | 55 +++- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- drivers/md/bcache/bset.c | 44 +-- drivers/md/bcache/bset.h | 28 +- drivers/md/bcache/btree.c | 40 +-- drivers/md/bcache/super.c | 5 +- drivers/md/bcache/sysfs.c | 2 +- drivers/md/bcache/writeback.c | 10 +- drivers/media/dvb-core/dvbdev.c | 2 +- drivers/misc/mei/pci-me.c | 4 +- drivers/misc/vmw_vmci/vmci_event.c | 6 +- drivers/mmc/host/davinci_mmc.c | 4 +- drivers/mmc/host/sdhci-pci-core.c | 11 +- drivers/mmc/host/sdhci.c | 25 +- drivers/mtd/nand/spi/macronix.c | 112 ++++++++ drivers/mtd/parsers/redboot.c | 2 +- drivers/net/dsa/microchip/ksz9477.c | 6 +- drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 11 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 14 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 +- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +- drivers/net/ethernet/qualcomm/qca_debug.c | 6 +- drivers/net/ethernet/qualcomm/qca_spi.c | 16 +- drivers/net/ethernet/qualcomm/qca_spi.h | 3 +- drivers/net/ethernet/realtek/r8169_main.c | 48 ++-- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 55 ++-- drivers/net/phy/micrel.c | 1 + drivers/net/phy/sfp.c | 3 +- drivers/net/usb/ax88179_178a.c | 6 +- drivers/net/usb/rtl8150.c | 3 +- drivers/net/virtio_net.c | 12 +- drivers/net/vxlan/vxlan_core.c | 4 + drivers/net/wireless/ath/ath.h | 6 +- drivers/net/wireless/ath/ath9k/main.c | 3 +- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 10 - drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 9 +- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 +- .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 19 +- drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 - drivers/pci/controller/pcie-rockchip-ep.c | 6 +- drivers/pci/pci.c | 12 + drivers/pinctrl/core.c | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 294 +++++---------------- drivers/pinctrl/pinctrl-rockchip.h | 246 +++++++++++++++++ drivers/power/supply/cros_usbpd-charger.c | 11 +- drivers/ptp/ptp_chardev.c | 3 +- drivers/pwm/pwm-stm32.c | 3 + drivers/regulator/core.c | 1 + drivers/remoteproc/ti_k3_r5_remoteproc.c | 25 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 19 ++ drivers/scsi/qedi/qedi_debugfs.c | 12 +- drivers/soc/ti/ti_sci_pm_domains.c | 20 +- drivers/soc/ti/wkup_m3_ipc.c | 7 +- drivers/staging/hikey9xx/hisi-spmi-controller.c | 1 - drivers/tty/serial/8250/8250_exar.c | 42 +++ drivers/tty/serial/8250/8250_omap.c | 22 +- drivers/tty/serial/8250/8250_pxa.c | 1 + drivers/tty/serial/mcf.c | 2 +- drivers/tty/serial/sc16is7xx.c | 25 +- drivers/usb/atm/cxacru.c | 14 + drivers/usb/class/cdc-wdm.c | 4 +- drivers/usb/gadget/function/f_fs.c | 4 + drivers/usb/gadget/function/f_printer.c | 40 ++- drivers/usb/host/xhci-pci.c | 7 + drivers/usb/host/xhci-ring.c | 5 +- drivers/usb/misc/uss720.c | 22 +- drivers/usb/musb/da8xx.c | 8 +- drivers/usb/storage/alauda.c | 9 +- fs/btrfs/disk-io.c | 10 +- fs/cifs/smb2transport.c | 12 +- fs/f2fs/super.c | 2 - fs/jfs/xattr.c | 4 +- fs/nfs/read.c | 4 - fs/nfsd/nfs4state.c | 7 +- fs/nfsd/nfsfh.c | 4 +- fs/nilfs2/dir.c | 59 ++--- fs/nilfs2/segment.c | 3 + fs/ocfs2/aops.c | 5 + fs/ocfs2/file.c | 2 + fs/ocfs2/journal.c | 17 ++ fs/ocfs2/journal.h | 2 + fs/ocfs2/namei.c | 2 +- fs/ocfs2/ocfs2_trace.h | 2 + fs/open.c | 4 +- fs/proc/vmcore.c | 2 + fs/udf/udftime.c | 11 +- include/kvm/arm_vgic.h | 2 +- include/linux/compat.h | 2 +- include/linux/efi.h | 10 +- include/linux/iommu.h | 2 +- include/linux/kcov.h | 2 + include/linux/mod_devicetable.h | 2 + include/linux/nvme.h | 4 +- include/linux/pci.h | 9 + include/linux/sunrpc/svc.h | 20 +- include/linux/syscalls.h | 2 +- include/net/bluetooth/hci_core.h | 36 ++- include/net/netfilter/nf_tables.h | 5 + include/net/xdp.h | 3 + include/trace/events/qdisc.h | 4 +- include/trace/events/sunrpc.h | 8 +- include/uapi/asm-generic/hugetlb_encode.h | 26 +- include/uapi/asm-generic/unistd.h | 2 +- kernel/events/core.c | 13 + kernel/gcov/gcc_4_7.c | 4 +- kernel/gen_kheaders.sh | 9 +- kernel/kcov.c | 1 + kernel/padata.c | 8 +- kernel/pid_namespace.c | 1 + kernel/rcu/rcutorture.c | 12 +- kernel/sys_ni.c | 2 +- kernel/time/tick-common.c | 42 +-- kernel/trace/Kconfig | 4 +- kernel/trace/preemptirq_delay_test.c | 1 + net/batman-adv/originator.c | 29 ++ net/bluetooth/l2cap_core.c | 8 +- net/can/j1939/main.c | 6 +- net/can/j1939/transport.c | 21 +- net/core/drop_monitor.c | 20 +- net/core/filter.c | 3 + net/core/net_namespace.c | 9 +- net/core/netpoll.c | 2 +- net/core/sock.c | 6 +- net/core/xdp.c | 100 ++++--- net/ipv4/af_inet.c | 23 +- net/ipv4/cipso_ipv4.c | 12 +- net/ipv4/tcp.c | 16 +- net/ipv6/af_inet6.c | 24 +- net/ipv6/ip6_fib.c | 6 +- net/ipv6/ipv6_sockglue.c | 9 +- net/ipv6/route.c | 9 +- net/ipv6/seg6_iptunnel.c | 14 +- net/ipv6/tcp_ipv6.c | 9 +- net/ipv6/xfrm6_policy.c | 8 +- net/iucv/iucv.c | 26 +- net/mac80211/he.c | 10 +- net/mac80211/mesh_pathtbl.c | 13 + net/mac80211/sta_info.c | 4 +- net/mptcp/pm_netlink.c | 18 +- net/mptcp/protocol.c | 1 + net/ncsi/Kconfig | 6 + net/ncsi/internal.h | 7 + net/ncsi/ncsi-manage.c | 112 +++++--- net/ncsi/ncsi-rsp.c | 4 +- net/netfilter/ipset/ip_set_core.c | 104 ++++---- net/netfilter/ipset/ip_set_list_set.c | 30 +-- net/netfilter/nf_tables_api.c | 13 +- net/netfilter/nft_lookup.c | 3 +- net/netrom/nr_timer.c | 3 +- net/packet/af_packet.c | 26 +- net/sched/act_api.c | 66 +++-- net/sched/act_ct.c | 21 +- net/sched/sch_multiq.c | 2 +- net/sched/sch_taprio.c | 15 +- net/sunrpc/auth_gss/auth_gss.c | 4 +- net/sunrpc/svc.c | 18 +- net/tipc/node.c | 1 + net/unix/af_unix.c | 47 ++-- net/unix/diag.c | 12 +- net/wireless/pmsr.c | 8 +- scripts/Makefile.dtbinst | 2 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/fsl/fsl-asoc-card.c | 3 +- sound/soc/intel/boards/sof_sdw.c | 9 + sound/synth/emux/soundfont.c | 17 +- tools/include/asm-generic/hugetlb_encode.h | 20 +- tools/testing/selftests/arm64/tags/tags_test.c | 4 + .../selftests/bpf/prog_tests/btf_map_in_map.c | 26 +- tools/testing/selftests/bpf/test_tc_tunnel.sh | 13 +- .../ftrace/test.d/kprobe/kprobe_eventname.tc | 3 +- tools/testing/selftests/vm/compaction_test.c | 103 ++++---- 273 files changed, 2839 insertions(+), 1804 deletions(-) . From: Shenghao Ding To: CC: , , , , <13916275206@139.com>, , , , , , , , , , , , , , , , , , , , , , , , , Shenghao Ding Subject: [PATCH v1] ASoc: tas2781: Set "Speaker Force Firmware Load" as the common kcontrol for both tas27871 and tas2563 Date: Thu, 4 Jul 2024 17:49:37 +0800 Message-ID: <20240704094939.1824-1-shenghao-ding@ti.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267732 Newsgroups: org.kernel.vger.linux-kernel,org.alsa-project.alsa-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Set "Speaker Force Firmware Load" as the common kcontrol for both tas27871 and tas2563 and move it into newly-created tasdevice_snd_controls, and keep the digital gain and analog gain in tas2781_snd_controls. Signed-off-by: Shenghao Ding --- v1: - Rename driver_name from tas2781-codec to tasdev-codec, request from some tas2563 users since the driver supports both tas2563 and tas2781, the drvier name seemed unfair to tas2563. - Set "Speaker Force Firmware Load" as the common kcontrol for both tas27871 and tas2563 and move it into newly-created tasdevice_snd_controls. --- sound/soc/codecs/tas2781-i2c.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index e0e630f66101..b412f8f2e5d5 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -104,7 +104,7 @@ static int tas2781_amp_putvol(struct snd_kcontrol *kcontrol, return tasdevice_amp_putvol(tas_priv, ucontrol, mc); } -static int tas2781_force_fwload_get(struct snd_kcontrol *kcontrol, +static int tasdev_force_fwload_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_component *component = @@ -119,7 +119,7 @@ static int tas2781_force_fwload_get(struct snd_kcontrol *kcontrol, return 0; } -static int tas2781_force_fwload_put(struct snd_kcontrol *kcontrol, +static int tasdev_force_fwload_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_component *component = @@ -140,6 +140,11 @@ static int tas2781_force_fwload_put(struct snd_kcontrol *kcontrol, return change; } +static const struct snd_kcontrol_new tasdevice_snd_controls[] = { + SOC_SINGLE_BOOL_EXT("Speaker Force Firmware Load", 0, + tasdev_force_fwload_get, tasdev_force_fwload_put), +}; + static const struct snd_kcontrol_new tas2781_snd_controls[] = { SOC_SINGLE_RANGE_EXT_TLV("Speaker Analog Gain", TAS2781_AMP_LEVEL, 1, 0, 20, 0, tas2781_amp_getvol, @@ -147,8 +152,6 @@ static const struct snd_kcontrol_new tas2781_snd_controls[] = { SOC_SINGLE_RANGE_EXT_TLV("Speaker Digital Gain", TAS2781_DVC_LVL, 0, 0, 200, 1, tas2781_digital_getvol, tas2781_digital_putvol, dvc_tlv), - SOC_SINGLE_BOOL_EXT("Speaker Force Firmware Load", 0, - tas2781_force_fwload_get, tas2781_force_fwload_put), }; static int tasdevice_set_profile_id(struct snd_kcontrol *kcontrol, @@ -590,6 +593,18 @@ static struct snd_soc_dai_driver tasdevice_dai_driver[] = { static int tasdevice_codec_probe(struct snd_soc_component *codec) { struct tasdevice_priv *tas_priv = snd_soc_component_get_drvdata(codec); + int rc; + + if (tas_priv->chip_id == TAS2781) { + rc = snd_soc_add_component_controls(codec, + tas2781_snd_controls, + ARRAY_SIZE(tas2781_snd_controls)); + if (rc < 0) { + dev_err(tas_priv->dev, "%s: Add control err rc = %d", + __func__, rc); + return rc; + } + } tas_priv->name_prefix = codec->name_prefix; return tascodec_init(tas_priv, codec, THIS_MODULE, tasdevice_fw_ready); @@ -617,8 +632,8 @@ static const struct snd_soc_component_driver soc_codec_driver_tasdevice = { .probe = tasdevice_codec_probe, .remove = tasdevice_codec_remove, - .controls = tas2781_snd_controls, - .num_controls = ARRAY_SIZE(tas2781_snd_controls), + .controls = tasdevice_snd_controls, + .num_controls = ARRAY_SIZE(tasdevice_snd_controls), .dapm_widgets = tasdevice_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(tasdevice_dapm_widgets), .dapm_routes = tasdevice_audio_map, @@ -759,7 +774,7 @@ MODULE_DEVICE_TABLE(acpi, tasdevice_acpi_match); static struct i2c_driver tasdevice_i2c_driver = { .driver = { - .name = "tas2781-codec", + .name = "tasdev-codec", .of_match_table = of_match_ptr(tasdevice_of_match), #ifdef CONFIG_ACPI .acpi_match_table = ACPI_PTR(tasdevice_acpi_match), -- 2.34.1 . From: Heiko Stuebner To: heiko@sntech.de Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, dsimic@manjaro.org Subject: [PATCH v2 0/2] ROCK 5 ITX devicetree Date: Thu, 4 Jul 2024 11:55:22 +0200 Message-Id: <20240704095524.788607-1-heiko@sntech.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267733 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-rockchip,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add a basic support for the Rock 5 ITX board. After struggling a bit with the pcie3 ports, thankfully they seem to run pretty nice now thanks to me finding the property for the shared-rx-clk for the pcie3 phy. changes in v2: - update naming to include a space/dash between 5 and ITX. As Dragan wrote "the name of this board deviates from the standard Radxa naming scheme, which is something like "ROCK " thus, "rock-5a" is fine, but it should be "rock-5-itx", simply because there's a space between "5" and "ITX" in "ROCK 5 ITX" - spelling fixes (Dragan) - removed status from adc-keys (Krzysztof) - added Krzysztof's binding Ack, after asking on IRC about the added "-" - updated copyright statement to something correct Heiko Stuebner (2): dt-bindings: arm: rockchip: Add ROCK 5 ITX board arm64: dts: rockchip: add rock5 itx board .../devicetree/bindings/arm/rockchip.yaml | 5 + arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3588-rock-5-itx.dts | 1186 +++++++++++++++++ 3 files changed, 1192 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts -- 2.39.2 . From: Neha Malcom Francis To: , , , , , CC: , , , , Subject: [PATCH] arm64: dts: ti: k3-j721e: Add bootph-all to chipid Date: Thu, 4 Jul 2024 15:33:56 +0530 Message-ID: <20240704100356.1078195-1-n-francis@ti.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267743 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add bootph-all property to the chipid node so that it is available at bootloader stage for obtaining the SoC ID and revision. Signed-off-by: Neha Malcom Francis --- Changes since v1: - correct $subject prefix (Vignesh) arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi index 9349ae07c046..c2417ef614cf 100644 --- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi @@ -57,6 +57,7 @@ wkup_conf: bus@43000000 { chipid: chipid@14 { compatible = "ti,am654-chipid"; reg = <0x14 0x4>; + bootph-all; }; }; -- 2.34.1 . X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Thu, 04 Jul 2024 03:10:20 -0700 Message-ID: <0000000000008ccc65061c6927f5@google.com> Subject: [syzbot] [bcachefs?] WARNING in __virt_to_phys (4) From: syzbot To: bfoster@redhat.com, kent.overstreet@linux.dev, linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267748 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-bcachefs Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, syzbot found the following issue on: HEAD commit: 5e456a31d1ac Merge branch 'for-next/core', remote-tracking.. git tree: git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git for-kernelci console output: https://syzkaller.appspot.com/x/log.txt?x=105c2e71980000 kernel config: https://syzkaller.appspot.com/x/.config?x=94594c6c92300e dashboard link: https://syzkaller.appspot.com/bug?extid=53a6240f92421be04a12 compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40 userspace arch: arm64 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=16a86fa6980000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1069e4be980000 Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/f89c6438e363/disk-5e456a31.raw.xz vmlinux: https://storage.googleapis.com/syzbot-assets/39d1dcfa82c4/vmlinux-5e456a31.xz kernel image: https://storage.googleapis.com/syzbot-assets/6bbd2a0d874f/Image-5e456a31.gz.xz mounted in repro: https://storage.googleapis.com/syzbot-assets/3e164c5b3bcc/mount_0.gz IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+53a6240f92421be04a12@syzkaller.appspotmail.com bcachefs (loop0): going read-write bcachefs (loop0): done starting filesystem ------------[ cut here ]------------ virt_to_phys used for non-linear address: fffffffffffffff2 (0xfffffffffffffff2) WARNING: CPU: 0 PID: 6287 at arch/arm64/mm/physaddr.c:15 __virt_to_phys+0xc4/0x138 arch/arm64/mm/physaddr.c:12 Modules linked in: CPU: 0 PID: 6287 Comm: syz-executor202 Not tainted 6.10.0-rc5-syzkaller-g5e456a31d1ac #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/02/2024 pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : __virt_to_phys+0xc4/0x138 arch/arm64/mm/physaddr.c:12 lr : __virt_to_phys+0xc4/0x138 arch/arm64/mm/physaddr.c:12 sp : ffff80009af36c00 x29: ffff80009af36c00 x28: 0000000000000002 x27: 1ffff000135e6d98 x26: 1ffff000135e6d94 x25: dfff800000000000 x24: fffffffffffffff2 x23: ffff0000db557a20 x22: 000f600000000000 x21: 000000000000002d x20: fffffffffffffff2 x19: 000ffffffffffff2 x18: 0000000000000008 x17: 6666783028203266 x16: ffff800082fca0f0 x15: 0000000000000001 x14: 1fffe000367a9e4a x13: 0000000000000000 x12: 0000000000000000 x11: 0000000000000002 x10: 0000000000ff0100 x9 : 6df737eb5149e300 x8 : 6df737eb5149e300 x7 : 0000000000000001 x6 : 0000000000000001 x5 : ffff80009af36358 x4 : ffff80008f295100 x3 : ffff8000805f0fe4 x2 : 0000000000000001 x1 : 0000000100000000 x0 : 0000000000000000 Call trace: __virt_to_phys+0xc4/0x138 arch/arm64/mm/physaddr.c:12 virt_to_phys arch/arm64/include/asm/memory.h:368 [inline] virt_to_pfn arch/arm64/include/asm/memory.h:382 [inline] virt_to_folio include/linux/mm.h:1313 [inline] kfree+0x9c/0x3e0 mm/slub.c:4550 bch2_ioctl_fsck_online+0x358/0x580 fs/bcachefs/chardev.c:853 bch2_fs_ioctl+0x23ec/0x3980 fs/bcachefs/chardev.c:927 bch2_fs_file_ioctl+0x78c/0x2334 fs/bcachefs/fs-ioctl.c:532 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:907 [inline] __se_sys_ioctl fs/ioctl.c:893 [inline] __arm64_sys_ioctl+0x14c/0x1c8 fs/ioctl.c:893 __invoke_syscall arch/arm64/kernel/syscall.c:34 [inline] invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:48 el0_svc_common+0x130/0x23c arch/arm64/kernel/syscall.c:133 do_el0_svc+0x48/0x58 arch/arm64/kernel/syscall.c:152 el0_svc+0x54/0x168 arch/arm64/kernel/entry-common.c:712 el0t_64_sync_handler+0x84/0xfc arch/arm64/kernel/entry-common.c:730 el0t_64_sync+0x190/0x194 arch/arm64/kernel/entry.S:598 irq event stamp: 76418 hardirqs last enabled at (76417): [] __up_console_sem kernel/printk/printk.c:341 [inline] hardirqs last enabled at (76417): [] __console_unlock kernel/printk/printk.c:2746 [inline] hardirqs last enabled at (76417): [] console_unlock+0x18c/0x3d4 kernel/printk/printk.c:3065 hardirqs last disabled at (76418): [] el1_dbg+0x24/0x80 arch/arm64/kernel/entry-common.c:470 softirqs last enabled at (76054): [] local_bh_enable+0x10/0x34 include/linux/bottom_half.h:32 softirqs last disabled at (76052): [] local_bh_disable+0x10/0x34 include/linux/bottom_half.h:19 ---[ end trace 0000000000000000 ]--- Unable to handle kernel paging request at virtual address ffffffffc377ffc8 KASAN: maybe wild-memory-access in range [0x0003fffe1bbffe40-0x0003fffe1bbffe47] Mem abort info: ESR = 0x0000000096000006 EC = 0x25: DABT (current EL), IL = 32 bits SET = 0, FnV = 0 EA = 0, S1PTW = 0 FSC = 0x06: level 2 translation fault Data abort info: ISV = 0, ISS = 0x00000006, ISS2 = 0x00000000 CM = 0, WnR = 0, TnD = 0, TagAccess = 0 GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 swapper pgtable: 4k pages, 48-bit VAs, pgdp=00000001acce6000 [ffffffffc377ffc8] pgd=0000000000000000, p4d=00000001b058e003, pud=00000001b058f003, pmd=0000000000000000 Internal error: Oops: 0000000096000006 [#1] PREEMPT SMP Modules linked in: CPU: 1 PID: 6287 Comm: syz-executor202 Tainted: G W 6.10.0-rc5-syzkaller-g5e456a31d1ac #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/02/2024 pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : _compound_head include/linux/page-flags.h:245 [inline] pc : virt_to_folio include/linux/mm.h:1315 [inline] pc : kfree+0xb4/0x3e0 mm/slub.c:4550 lr : virt_to_phys arch/arm64/include/asm/memory.h:368 [inline] lr : virt_to_pfn arch/arm64/include/asm/memory.h:382 [inline] lr : virt_to_folio include/linux/mm.h:1313 [inline] lr : kfree+0x9c/0x3e0 mm/slub.c:4550 sp : ffff80009af36c30 x29: ffff80009af36c40 x28: 0000000000000002 x27: 1ffff000135e6d98 x26: 1ffff000135e6d94 x25: dfff800000000000 x24: fffffffffffffff2 x23: ffff0000db557a20 x22: ffff0000dd64a2d0 x21: fffffffffffffff2 x20: ffffffffc377ffc0 x19: ffff800082801fec x18: 0000000000000008 x17: 6666783028203266 x16: ffff800082fca0f0 x15: 0000000000000001 x14: 1fffe000367a9e4a x13: 0000000000000000 x12: 0000000000000000 x11: 0000000000000002 x10: 0000000000ff0100 x9 : 00003e000377ffc0 x8 : ffffc1ffc0000000 x7 : 0000000000000001 x6 : 0000000000000001 x5 : ffff80009af36358 x4 : ffff80008f295100 x3 : ffff8000805f0fe4 x2 : 0000000000000001 x1 : 0000000100000000 x0 : 000080011dfffff2 Call trace: virt_to_folio include/linux/mm.h:1313 [inline] kfree+0xb4/0x3e0 mm/slub.c:4550 bch2_ioctl_fsck_online+0x358/0x580 fs/bcachefs/chardev.c:853 bch2_fs_ioctl+0x23ec/0x3980 fs/bcachefs/chardev.c:927 bch2_fs_file_ioctl+0x78c/0x2334 fs/bcachefs/fs-ioctl.c:532 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:907 [inline] __se_sys_ioctl fs/ioctl.c:893 [inline] __arm64_sys_ioctl+0x14c/0x1c8 fs/ioctl.c:893 __invoke_syscall arch/arm64/kernel/syscall.c:34 [inline] invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:48 el0_svc_common+0x130/0x23c arch/arm64/kernel/syscall.c:133 do_el0_svc+0x48/0x58 arch/arm64/kernel/syscall.c:152 el0_svc+0x54/0x168 arch/arm64/kernel/entry-common.c:712 el0t_64_sync_handler+0x84/0xfc arch/arm64/kernel/entry-common.c:730 el0t_64_sync+0x190/0x194 arch/arm64/kernel/entry.S:598 Code: 927acd29 f2d83fe8 cb141929 8b080134 (f9400688) ---[ end trace 0000000000000000 ]--- ---------------- Code disassembly (best guess): 0: 927acd29 and x9, x9, #0x3ffffffffffffc0 4: f2d83fe8 movk x8, #0xc1ff, lsl #32 8: cb141929 sub x9, x9, x20, lsl #6 c: 8b080134 add x20, x9, x8 * 10: f9400688 ldr x8, [x20, #8] <-- trapping instruction --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. If the report is already addressed, let syzbot know by replying with: #syz fix: exact-commit-title If you want syzbot to run the reproducer, reply with: #syz test: git://repo/address.git branch-or-commit-hash If you attach or paste a git patch, syzbot will apply it before testing. If you want to overwrite report's subsystems, reply with: #syz set subsystems: new-subsystem (See the list of subsystem names on the web dashboard) If the report is a duplicate of another one, reply with: #syz dup: exact-subject-of-another-report If you want to undo deduplication, reply with: #syz undup . From: Johan Hovold To: Greg Kroah-Hartman , Jiri Slaby Cc: Douglas Anderson , Konrad Dybcio , Bjorn Andersson , linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 0/3] serial: qcom-geni: fix lockups Date: Thu, 4 Jul 2024 12:18:02 +0200 Message-ID: <20240704101805.30612-1-johan+linaro@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267754 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-serial Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Since 6.10-rc1, Qualcomm machines with a serial port can easily lock up hard, for example, when stopping a getty on reboot. This was triggered by the kfifo conversion, which turned an existing bug that caused the driver to print discarded characters after a buffer flush into a hard lockup. This series fixes the regression and a related soft lockup issue that can be triggered on software flow control and on suspend. Doug has posted an alternative series of fixes here that depends on reworking the driver a fair bit here: https://lore.kernel.org/lkml/20240610222515.3023730-1-dianders@chromium.org/ This rework has a significant impact on performance on some platforms, but fortunately it seems such a rework can be avoided. There are further bugs in the console code (e.g. that can lead to lost characters) that this series does not address, but those can be fixed separately (and I've started working on that). Johan Changes in v2 - restart tx by issuing a transfer command when there is stale data in the fifo - reorder and rename patches - rename cancel tx helper Johan Hovold (3): serial: qcom-geni: fix soft lockup on sw flow control and suspend serial: qcom-geni: fix hard lockup on buffer flush serial: qcom-geni: do not kill the machine on fifo underrun drivers/tty/serial/qcom_geni_serial.c | 51 ++++++++++++++++++++------- 1 file changed, 38 insertions(+), 13 deletions(-) -- 2.44.1 . Subject: [PATCH] powerpc/pseries/iommu: Define spapr_tce_table_group_ops only with CONFIG_IOMMU_API From: Shivaprasad G Bhat To: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org Cc: npiggin@gmail.com, christophe.leroy@csgroup.eu, gbatra@linux.vnet.ibm.com, sbhat@linux.ibm.com, jgg@ziepe.ca, ruscur@russell.cc, linux-kernel@vger.kernel.org, tpearson@raptorengineering.com, msuchanek@suse.de, vaibhav@linux.ibm.com Date: Thu, 04 Jul 2024 10:22:37 +0000 Message-ID: <172008854222.784.13666247605789409729.stgit@linux.ibm.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267761 Newsgroups: org.kernel.vger.linux-kernel,org.ozlabs.lists.linuxppc-dev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The patch fixes the below warning, arch/powerpc/platforms/pseries/iommu.c:1824:37: warning: 'spapr_tce_table_group_ops' defined but not used [-Wunused-variable] The other error reported by the test robot no longer exists on the top of the tree due to later changes on the file. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202407020357.Hz8kQkKf-lkp@intel.com/ Fixes: b09c031d9433 ("powerpc/iommu: Move pSeries specific functions to pseries/iommu.c") Signed-off-by: Shivaprasad G Bhat --- arch/powerpc/platforms/pseries/iommu.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index 672199ba7400..534cd159e9ab 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c @@ -68,7 +68,9 @@ static struct iommu_table *iommu_pseries_alloc_table(int node) return tbl; } +#ifdef CONFIG_IOMMU_API static struct iommu_table_group_ops spapr_tce_table_group_ops; +#endif static struct iommu_table_group *iommu_pseries_alloc_group(int node) { @@ -165,6 +167,7 @@ static unsigned long tce_get_pseries(struct iommu_table *tbl, long index) return be64_to_cpu(*tcep); } +#ifdef CONFIG_IOMMU_API static long pseries_tce_iommu_userspace_view_alloc(struct iommu_table *tbl) { unsigned long cb = ALIGN(sizeof(tbl->it_userspace[0]) * tbl->it_size, PAGE_SIZE); @@ -183,6 +186,7 @@ static long pseries_tce_iommu_userspace_view_alloc(struct iommu_table *tbl) return 0; } +#endif static void tce_iommu_userspace_view_free(struct iommu_table *tbl) { @@ -738,6 +742,7 @@ struct iommu_table_ops iommu_table_lpar_multi_ops = { .free = tce_free_pSeries }; +#ifdef CONFIG_IOMMU_API /* * When the DMA window properties might have been removed, * the parent node has the table_group setup on it. @@ -757,6 +762,7 @@ static struct device_node *pci_dma_find_parent_node(struct pci_dev *dev, return NULL; } +#endif /* * Find nearest ibm,dma-window (default DMA window) or direct DMA window or @@ -1845,6 +1851,7 @@ static bool iommu_bypass_supported_pSeriesLP(struct pci_dev *pdev, u64 dma_mask) return false; } +#ifdef CONFIG_IOMMU_API /* * A simple iommu_table_group_ops which only allows reusing the existing * iommu_table. This handles VFIO for POWER7 or the nested KVM. @@ -2327,6 +2334,7 @@ static struct iommu_table_group_ops spapr_tce_table_group_ops = { .take_ownership = spapr_tce_take_ownership, .release_ownership = spapr_tce_release_ownership, }; +#endif static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action, void *data) . From: Utsav Agarwal via B4 Relay Subject: [PATCH v6 0/3] adp5588-keys: Support for dedicated gpio operation Date: Thu, 04 Jul 2024 11:45:44 +0100 Message-Id: <20240704-adp5588_gpio_support-v6-0-cb65514d714b@analog.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Utsav Agarwal , Michael Hennerich , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , =?utf-8?q?Nuno_S=C3=A1?= Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Arturs Artamonovs , Vasileios Bimpikas , Oliver Gaskell X-Original-From: Utsav Agarwal Reply-To: utsav.agarwal@analog.com Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267781 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.feeds.b4-sent,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-input Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Current state of the driver for the ADP5588/87 only allows partial I/O to be used as GPIO. This support was previously present as a separate gpio driver, which was dropped with the commit 5ddc896088b0 ("gpio: gpio-adp5588: drop the driver") since the functionality was deemed to have been merged with adp5588-keys. This series of patches re-enables this support by allowing the driver to relax the requirement for registering a keymap and enable pure GPIO operation. Changelog ========== V2: - Changed gpio_only from a local variable to a member of struct adp5588_kpad - Removed condition from adp5588_probe() to skip adp5588_fw_parse() if gpio-only specified. adp558_fw_parse() now handles and returns 0 if gpio-only has been specified. - Added a check in adp5588_fw_parse() to make sure keypad properties(keypad,num-columns and keypad,num-rows) were not defined when gpio-only specified V3: - Moved device_property_present() for reading "gpio-only" into adp558_fw_parse() - Added print statements in case of error V4: - Added dt-bindings patch Signed-off-by: Utsav Agarwal --- V5: - Removed extra property "gpio-only", now pure gpio mode is detected via the adbsence of keypad specific properties. - Added dependencies for keypad properties to preserve the original requirements in case a pure gpio mode is not being used. - Added additional description for why the "interrupts" property was made optional - Rebased current work based on https://lore.kernel.org/linux-input/ZoLt_qBCQS-tG8Ar@google.com/ - Link to v4: https://lore.kernel.org/r/20240701-adp5588_gpio_support-v4-0-44bba0445e90@analog.com --- Changes in v6: - Restored functionality to register interrupts in GPIO mode(i.e, these are optional but not exclusive to keypad mode since even in pure gpio mode, they can be used as inputs via gpio-keys) - Updated dt-bindings such that each keypad property depends on the others. Interrupts, although optional are now required by keypad mode but are not limited to it. - Link to v5: https://lore.kernel.org/r/20240703-adp5588_gpio_support-v5-0-49fcead0d390@analog.com --- Dmitry Torokhov (1): iInput: adp5588-keys - use guard notation when acquiring mutexes Utsav Agarwal (2): Input: adp5588-keys - add support for pure gpio dt-bindings: input: Update dtbinding for adp5588 .../devicetree/bindings/input/adi,adp5588.yaml | 46 +++++++++++-- drivers/input/keyboard/adp5588-keys.c | 76 +++++++++++++--------- 2 files changed, 85 insertions(+), 37 deletions(-) --- base-commit: 1c52cf5e79d30ac996f34b64284f2c317004d641 change-id: 20240701-adp5588_gpio_support-65db2bd21a9f Best regards, -- Utsav Agarwal . From: Dmitry Baryshkov Date: Thu, 04 Jul 2024 14:12:46 +0300 Subject: [PATCH] firmware: qcom: tzmem: blacklist more platforms for SHM Bridge X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240704-shmbridge-blacklist-v1-1-14b027b3b2dc@linaro.org> To: Bartosz Golaszewski , Bjorn Andersson , Konrad Dybcio , Elliot Berman Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267803 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The SHM bridge makes the Qualcomm RB3 and SM8150-HDK reset while probing the RMTFS (in qcom_scm_assign_mem()). Blacklist the SHM Bridge on corresponding platforms using SoC-level compat string. If later it's found that the bad behaviour is limited just to the particular boards rather than SoC, the compat strings can be adjusted. Reported-by: Neil Armstrong Fixes: f86c61498a57 ("firmware: qcom: tzmem: enable SHM Bridge support") Signed-off-by: Dmitry Baryshkov --- drivers/firmware/qcom/qcom_tzmem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c index 5d526753183d..c715729f071c 100644 --- a/drivers/firmware/qcom/qcom_tzmem.c +++ b/drivers/firmware/qcom/qcom_tzmem.c @@ -78,6 +78,8 @@ static bool qcom_tzmem_using_shm_bridge; /* List of machines that are known to not support SHM bridge correctly. */ static const char *const qcom_tzmem_blacklist[] = { "qcom,sc8180x", + "qcom,sdm845", /* reset in rmtfs memory assignment */ + "qcom,sm8150", /* reset in rmtfs memory assignment */ NULL }; --- base-commit: 82e4255305c554b0bb18b7ccf2db86041b4c8b6e change-id: 20240704-shmbridge-blacklist-021bd97b8a93 Best regards, -- Dmitry Baryshkov . From: Akshay Gupta To: , , , , CC: , Akshay Gupta Subject: [PATCH 0/6] misc: add amd side-band functionality Date: Thu, 4 Jul 2024 11:16:18 +0000 Message-ID: <20240704111624.1583460-1-akshay.gupta@amd.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267806 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-hwmon Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail AMD's APML interface provides system management functionality accessed by the BMC. Sbrmi driver under hwmon subsystem, which is probed as an i2c driver and reports power using APML specified protocol. However, APML interface defines few other protocols to support full system management functionality out-of-band. This patchset is an attempt to add all APML core functionality in one place and provide hwmon and user interface 1. Move the i2c client probe and sbrmi core functionality from drivers/hwmon to drivers/misc/ 2. Add a platform device, which probes the hwmon/sbrmi and continues to report power using the symbol exported by the misc/sbrmi-core. 3. Convert i2c to regmap which provides multiple benefits over direct smbus APIs. 4. Register a misc device which provides a. An ioctl interface through node /dev/sbrmiX b. Open-sourced and widely used https://github.com/amd/esmi_oob_library will continue to provide user-space programmable API. Akshay Gupta (6): hwmon/misc sbrmi: Move core sbrmi from hwmon to misc misc: sbrmi: Add platform device add to create platform device misc: sbrmi: Use regmap subsystem misc: sbrmi: Clear sbrmi status register bit SwAlertSts misc/hwmon: sbrmi: Add support for APML protocols misc: sbrmi: Add support for EPYC platform Family: 0x1A and Model: 0x0~0x1F drivers/hwmon/Kconfig | 1 + drivers/hwmon/sbrmi.c | 271 ++------------ drivers/misc/Kconfig | 1 + drivers/misc/Makefile | 1 + drivers/misc/amd-sb/Kconfig | 9 + drivers/misc/amd-sb/Makefile | 3 + drivers/misc/amd-sb/sbrmi-core.c | 617 +++++++++++++++++++++++++++++++ drivers/misc/amd-sb/sbrmi-core.h | 36 ++ drivers/misc/amd-sb/sbrmi-i2c.c | 239 ++++++++++++ include/misc/amd-sb.h | 57 +++ include/uapi/linux/amd-apml.h | 74 ++++ 11 files changed, 1072 insertions(+), 237 deletions(-) create mode 100644 drivers/misc/amd-sb/Kconfig create mode 100644 drivers/misc/amd-sb/Makefile create mode 100644 drivers/misc/amd-sb/sbrmi-core.c create mode 100644 drivers/misc/amd-sb/sbrmi-core.h create mode 100644 drivers/misc/amd-sb/sbrmi-i2c.c create mode 100644 include/misc/amd-sb.h create mode 100644 include/uapi/linux/amd-apml.h -- 2.25.1 . From: "Pankaj Raghav (Samsung)" To: david@fromorbit.com, willy@infradead.org, chandan.babu@oracle.com, djwong@kernel.org, brauner@kernel.org, akpm@linux-foundation.org Cc: yang@os.amperecomputing.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, john.g.garry@oracle.com, linux-fsdevel@vger.kernel.org, hare@suse.de, p.raghav@samsung.com, mcgrof@kernel.org, gost.dev@samsung.com, cl@os.amperecomputing.com, linux-xfs@vger.kernel.org, kernel@pankajraghav.com, hch@lst.de, Zi Yan Subject: [PATCH v9 00/10] enable bs > ps in XFS Date: Thu, 4 Jul 2024 11:23:10 +0000 Message-ID: <20240704112320.82104-1-kernel@pankajraghav.com> Content-Type: text/plain; charset="utf-8" X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267815 org.kvack.linux-mm:202544 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-fsdevel,org.kernel.vger.linux-xfs,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Pankaj Raghav This is the ninth version of the series that enables block size > page size (Large Block Size) in XFS. The context and motivation can be seen in cover letter of the RFC v1 [0]. We also recorded a talk about this effort at LPC [1], if someone would like more context on this effort. A lot of emphasis has been put on testing using kdevops, starting with an XFS baseline [3]. The testing has been split into regression and progression. Regression testing: In regression testing, we ran the whole test suite to check for regressions on existing profiles due to the page cache changes. I also ran split_huge_page_test selftest on XFS filesystem to check for huge page splits in min order chunks is done correctly. No regressions were found with these patches added on top. Progression testing: For progression testing, we tested for 8k, 16k, 32k and 64k block sizes. To compare it with existing support, an ARM VM with 64k base page system (without our patches) was used as a reference to check for actual failures due to LBS support in a 4k base page size system. There are some tests that assumes block size < page size that needs to be fixed. We have a tree with fixes for xfstests [4], most of the changes have been posted already, and only a few minor changes need to be posted. Already part of these changes has been upstreamed to fstests, and new tests have also been written and are out for review, namely for mmap zeroing-around corner cases, compaction and fsstress races on mm, and stress testing folio truncation on file mapped folios. No new failures were found with the LBS support. We've done some preliminary performance tests with fio on XFS on 4k block size against pmem and NVMe with buffered IO and Direct IO on vanilla Vs + these patches applied, and detected no regressions. We also wrote an eBPF tool called blkalgn [5] to see if IO sent to the device is aligned and at least filesystem block size in length. For those who want this in a git tree we have this up on a kdevops large-block-minorder-for-next-v9 tag [6]. [0] https://lore.kernel.org/lkml/20230915183848.1018717-1-kernel@pankajraghav.com/ [1] https://www.youtube.com/watch?v=ar72r5Xf7x4 [2] https://lkml.kernel.org/r/20240501153120.4094530-1-willy@infradead.org [3] https://github.com/linux-kdevops/kdevops/blob/master/docs/xfs-bugs.md 489 non-critical issues and 55 critical issues. We've determined and reported that the 55 critical issues have all fall into 5 common XFS asserts or hung tasks and 2 memory management asserts. [4] https://github.com/linux-kdevops/fstests/tree/lbs-fixes [5] https://github.com/iovisor/bcc/pull/4813 [6] https://github.com/linux-kdevops/linux/ [7] https://lore.kernel.org/linux-kernel/Zl20pc-YlIWCSy6Z@casper.infradead.org/#t Changes since v8: - make iomap_dio_zero return error code and some variable name changes. - Call THP_SPLIT_PAGE_FAILED only if folio_is_pmd_mappable() - Collected RVB from willy, Darrick and Dave. Dave Chinner (1): xfs: use kvmalloc for xattr buffers Luis Chamberlain (1): mm: split a folio in minimum folio order chunks Matthew Wilcox (Oracle) (1): fs: Allow fine-grained control of folio sizes Pankaj Raghav (7): filemap: allocate mapping_min_order folios in the page cache readahead: allocate folios with mapping_min_order in readahead filemap: cap PTE range to be created to allowed zero fill in folio_map_range() iomap: fix iomap_dio_zero() for fs bs > system page size xfs: expose block size in stat xfs: make the calculation generic in xfs_sb_validate_fsb_count() xfs: enable block size larger than page size support fs/iomap/buffered-io.c | 4 +- fs/iomap/direct-io.c | 45 ++++++++++++-- fs/xfs/libxfs/xfs_attr_leaf.c | 15 ++--- fs/xfs/libxfs/xfs_ialloc.c | 5 ++ fs/xfs/libxfs/xfs_shared.h | 3 + fs/xfs/xfs_icache.c | 6 +- fs/xfs/xfs_iops.c | 2 +- fs/xfs/xfs_mount.c | 8 ++- fs/xfs/xfs_super.c | 18 +++--- include/linux/huge_mm.h | 14 +++-- include/linux/pagemap.h | 107 +++++++++++++++++++++++++++++----- mm/filemap.c | 36 +++++++----- mm/huge_memory.c | 55 +++++++++++++++-- mm/readahead.c | 83 +++++++++++++++++++------- 14 files changed, 317 insertions(+), 84 deletions(-) base-commit: 74564adfd3521d9e322cfc345fdc132df80f3c79 -- 2.44.1 . From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, chrisl@kernel.org, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, ioworker0@gmail.com, da.gomez@samsung.com, p.raghav@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 00/10] support large folio swap-out and swap-in for shmem Date: Thu, 4 Jul 2024 19:24:49 +0800 Message-Id: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267831 org.kvack.linux-mm:202559 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Shmem will support large folio allocation [1] [2] to get a better performance, however, the memory reclaim still splits the precious large folios when trying to swap-out shmem, which may lead to the memory fragmentation issue and can not take advantage of the large folio for shmeme. Moreover, the swap code already supports for swapping out large folio without split, and large folio swap-in[3] series is queued into mm-unstable branch. Hence this patch set also supports the large folio swap-out and swap-in for shmem. Note: this series is targeted for v6.12. Please help to review. Thanks. Functional testing ================== I use the latest mm-unstable branch to test with reverting Chris's "mm: swap: mTHP swap allocator base on swap cluster order" series which can cause some problems (Hugh also reported in [4]). Machine environment: 32 Arm cores, 120G memory and 50G swap device. 1. Run xfstests suite to test tmpfs filesystem, and I did not catch any regressions with this patch set. FSTYP=tmpfs export TEST_DIR=/mnt/tempfs_mnt export TEST_DEV=/mnt/tempfs_mnt export SCRATCH_MNT=/mnt/scratchdir export SCRATCH_DEV=/mnt/scratchdir 2. Run all mm selftests in tools/testing/selftests/mm/, and no regressions found. 3. I also wrote several shmem swap test cases, including shmem splitting, shmem swapout, shmem swapin, swapoff during shmem swapout, shmem reclaim, shmem swapin replacement, etc. I tested these cases under 4K and 64K shmem folio sizes with a swap device, and shmem swap functionality works well on my machine. [1] https://lore.kernel.org/all/cover.1717495894.git.baolin.wang@linux.alibaba.com/ [2] https://lore.kernel.org/all/20240515055719.32577-1-da.gomez@samsung.com/ [3] https://lore.kernel.org/all/20240508224040.190469-6-21cnbao@gmail.com/T/ [4] https://lore.kernel.org/all/8db63194-77fd-e0b8-8601-2bbf04889a5b@google.com/ Chagens from v2: - Add new patch to split large swap entry if swapin folio is order 0 folio. - Update some commit message. Changes from v1: - Remove useless 'order' variable in shmem_partial_swap_usage(), per Daniel. - Add a new patch to return number of pages beeing freed in shmem_free_swap(), per Daniel. - Drop 'orders' parameter for find_get_entries() and find_lock_entries(). - Round down the index when adding the swapin folio into the pagecache, suggested by Hugh. - Fix the reference issue when removing folio from pagecache in patch 8. - Fix replacing old folio in swap cache in patch 7. Changes from RFC: - Rebased to the latest mm-unstable. - Drop the counter name fixing patch, which was queued into mm-hotfixes-stable branch. Baolin Wang (9): mm: vmscan: add validation before spliting shmem large folio mm: swap: extend swap_shmem_alloc() to support batch SWAP_MAP_SHMEM flag setting mm: shmem: extend shmem_partial_swap_usage() to support large folio swap mm: filemap: use xa_get_order() to get the swap entry order mm: shmem: use swap_free_nr() to free shmem swap entries mm: shmem: support large folio allocation for shmem_replace_folio() mm: shmem: drop folio reference count using 'nr_pages' in shmem_delete_from_page_cache() mm: shmem: split large entry if the swapin folio is not large mm: shmem: support large folio swap out Daniel Gomez (1): mm: shmem: return number of pages beeing freed in shmem_free_swap drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 1 + include/linux/swap.h | 4 +- include/linux/writeback.h | 1 + mm/filemap.c | 4 + mm/shmem.c | 203 +++++++++++++++++----- mm/swapfile.c | 98 ++++++----- mm/vmscan.c | 22 ++- 7 files changed, 238 insertions(+), 95 deletions(-) -- 2.39.3 . From: Diogo Ivo Subject: [PATCH v4 0/7] memory: tegra: Cleanup Tegra210 EMC frequency scaling Date: Thu, 04 Jul 2024 12:31:19 +0100 Message-Id: <20240704-tegra210_emcfreq-v4-0-3e450503c555@tecnico.ulisboa.pt> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Krzysztof Kozlowski , Thierry Reding , Jonathan Hunter Cc: linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, Diogo Ivo Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267842 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-tegra Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, This patch series consists of a general cleanup of the Tegra210 EMC frequency scaling code for revision 7. Currently the code is relying heavily on a function, update_clock_tree_delay(), that is responsible for too many things, making it long and confusing. The general idea with these patches is to simplify this function and its surrounding code, making it more modular. The motivation behind these changes (besides improving readability and maintainability) is to make it simpler to add support in the future for frequency change revisions other than 7, where we can reuse a large portion of the modularized code rather than essentially repeating 2k lines of code with minimal changes. There are no functional changes with this patch set, as it is only meant as preparation for following patches where revision 6 support is added. Signed-off-by: Diogo Ivo --- Changes in v4: - PATCH 07/07: Add missing parenthesis around operands when calculating delay - Link to v3: https://lore.kernel.org/r/20240507093056.3921-1-diogo.ivo@tecnico.ulisboa.pt --- Diogo Ivo (7): memory: tegra: Remove periodic compensation duplicate calls memory: tegra: Move DQSOSC measurement to common place memory: tegra: Reword and correct comments memory: tegra: Change macros to interpret parameter as integer memory: tegra: Loop update_clock_tree_delay() memory: tegra: Move compare/update current delay values to a function memory: tegra: Rework update_clock_tree_delay() drivers/memory/tegra/tegra210-emc-cc-r21021.c | 429 ++++++-------------------- 1 file changed, 86 insertions(+), 343 deletions(-) --- base-commit: 22a40d14b572deb80c0648557f4bd502d7e83826 change-id: 20240704-tegra210_emcfreq-9d2466310cec Best regards, -- Diogo Ivo . Message-ID: <32f5ce15-e9e8-4351-a231-c23ebb4b083c@suse.com> Date: Thu, 4 Jul 2024 13:32:24 +0200 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Language: en-US To: lkml Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , the arch/x86 maintainers From: Jan Beulich Subject: [PATCH] x86/xstate: don't globally disable TILE_DATA just on its own Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267850 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In XCR0 certain bits need to be simultaneously set / clear. Since fpu__init_cpu_xstate() wants to pass fpu_user_cfg.max_features to XSETBV, make sure invalid values cannot end up there in case XFD is not available. Do the clearing right for fpu_kernel_cfg.max_features (which fpu_user_cfg.max_features is derived from), to avoid that field holding an invalid combination of bits either. Fixes: 2ae996e0c1a3 ("x86/fpu: Calculate the default sizes independently") Signed-off-by: Jan Beulich --- #GP observed in a virtualized environment with AMX enabled, but XFD off (which is an architecturally legal combination of features, afaict). --- a/arch/x86/include/asm/fpu/xstate.h +++ b/arch/x86/include/asm/fpu/xstate.h @@ -49,6 +49,9 @@ /* Features which are dynamically enabled for a process on request */ #define XFEATURE_MASK_USER_DYNAMIC XFEATURE_MASK_XTILE_DATA +/* Features which the above ones are tied to. */ +#define XFEATURE_MASK_USER_DYN_DEPS XFEATURE_MASK_XTILE_CFG + /* All currently supported supervisor features */ #define XFEATURE_MASK_SUPERVISOR_SUPPORTED (XFEATURE_MASK_PASID | \ XFEATURE_MASK_CET_USER) --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -799,8 +799,15 @@ void __init fpu__init_system_xstate(unsi fpu_kernel_cfg.max_features &= ~BIT_ULL(i); } - if (!cpu_feature_enabled(X86_FEATURE_XFD)) - fpu_kernel_cfg.max_features &= ~XFEATURE_MASK_USER_DYNAMIC; + if (!cpu_feature_enabled(X86_FEATURE_XFD)) { + /* + * Besides disabling all dynamic features, also disable all + * of their dependents, such that the resulting value can be + * handed to XSETBV without causing #GP. + */ + fpu_kernel_cfg.max_features &= ~(XFEATURE_MASK_USER_DYNAMIC | + XFEATURE_MASK_USER_DYN_DEPS); + } if (!cpu_feature_enabled(X86_FEATURE_XSAVES)) fpu_kernel_cfg.max_features &= XFEATURE_MASK_USER_SUPPORTED; . Date: Thu, 4 Jul 2024 13:38:59 +0200 From: Stanislav Jakubek To: Bjorn Andersson , Baolin Wang , baolin.wang7@gmail.com, Rob Herring , Krzysztof Kozlowski , Conor Dooley , Orson Zhai , Chunyan Zhang Cc: linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] dt-bindings: hwlock: sprd-hwspinlock: convert to YAML Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267853 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-remoteproc Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Convert the Spreadtrum hardware spinlock bindings to DT schema. Reviewed-by: Conor Dooley Signed-off-by: Stanislav Jakubek --- Changes in V2: - fix double space in example - switch to #address-cells = <1> and #size-cells = <1> in example - add Conor's R-b .../bindings/hwlock/sprd,hwspinlock-r3p0.yaml | 50 +++++++++++++++++++ .../bindings/hwlock/sprd-hwspinlock.txt | 23 --------- 2 files changed, 50 insertions(+), 23 deletions(-) create mode 100644 Documentation/devicetree/bindings/hwlock/sprd,hwspinlock-r3p0.yaml delete mode 100644 Documentation/devicetree/bindings/hwlock/sprd-hwspinlock.txt diff --git a/Documentation/devicetree/bindings/hwlock/sprd,hwspinlock-r3p0.yaml b/Documentation/devicetree/bindings/hwlock/sprd,hwspinlock-r3p0.yaml new file mode 100644 index 000000000000..abe11df25761 --- /dev/null +++ b/Documentation/devicetree/bindings/hwlock/sprd,hwspinlock-r3p0.yaml @@ -0,0 +1,50 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/hwlock/sprd,hwspinlock-r3p0.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Spreadtrum hardware spinlock + +maintainers: + - Orson Zhai + - Baolin Wang + - Chunyan Zhang + +properties: + compatible: + const: sprd,hwspinlock-r3p0 + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + const: enable + + '#hwlock-cells': + const: 1 + +required: + - compatible + - reg + - clocks + - clock-names + - '#hwlock-cells' + +additionalProperties: false + +examples: + - | + #include + + hwlock@40500000 { + compatible = "sprd,hwspinlock-r3p0"; + reg = <0x40500000 0x1000>; + clocks = <&aon_gate CLK_SPLK_EB>; + clock-names = "enable"; + #hwlock-cells = <1>; + }; +... diff --git a/Documentation/devicetree/bindings/hwlock/sprd-hwspinlock.txt b/Documentation/devicetree/bindings/hwlock/sprd-hwspinlock.txt deleted file mode 100644 index 581db9d941ba..000000000000 --- a/Documentation/devicetree/bindings/hwlock/sprd-hwspinlock.txt +++ /dev/null @@ -1,23 +0,0 @@ -SPRD Hardware Spinlock Device Binding -------------------------------------- - -Required properties : -- compatible : should be "sprd,hwspinlock-r3p0". -- reg : the register address of hwspinlock. -- #hwlock-cells : hwlock users only use the hwlock id to represent a specific - hwlock, so the number of cells should be <1> here. -- clock-names : Must contain "enable". -- clocks : Must contain a phandle entry for the clock in clock-names, see the - common clock bindings. - -Please look at the generic hwlock binding for usage information for consumers, -"Documentation/devicetree/bindings/hwlock/hwlock.txt" - -Example of hwlock provider: - hwspinlock@40500000 { - compatible = "sprd,hwspinlock-r3p0"; - reg = <0 0x40500000 0 0x1000>; - #hwlock-cells = <1>; - clock-names = "enable"; - clocks = <&clk_aon_apb_gates0 22>; - }; -- 2.34.1 . From: Aisheng Dong To: "quic_obabatun@quicinc.com" CC: Rob Herring , "devicetree@vger.kernel.org" , "imx@lists.linux.dev" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Jason Liu , "dongas86@gmail.com" , "saravanak@google.com" , Krzysztof Kozlowski Subject: CMA Regression issue - [PATCH v2] of: reserved_mem: Restructure code to call reserved mem init functions earlier Date: Thu, 4 Jul 2024 11:41:22 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267855 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi Oreoluwa, We observed a CMA regression issue on MX8MN that the CMA region failed to b= e setup by rmem_cma_setup() since the following patch: f2a524d9ef5b ("of: reserved_mem: Restructure code to call reserved mem init= functions earlier") [1] And the CMA node was incorrect parsed (e.g. non-reuseable) due to NULL node= pointer. Below is one line boot log tested with the tag next-20240703 of linux-next = tree. OF: reserved mem: 0x0000000058000000..0x000000007fffffff (655360 KiB) map n= on-reusable linux,cma NOTE: actually there is a reusable property: linux,cma { compatible =3D "shared-dma-pool"; reusable; size =3D <0 0x28000000>; alloc-ranges =3D <0 0x40000000 0 0x40000000>; linux,cma-default; }; The root cause was that the CMA region was initialized at a very early stag= e since above commit in question. The call flow became: early_init_fdt_scan_reserved_mem()->fdt_scan_reserved_mem()-> __reserved_mem_alloc_size()->of_reserved_mem_save_node(NULL, xxx)-> of_init_reserved_mem_node()->__reserved_mem_init_node(). The rmem->dev_node is still NULL when calling __reserved_mem_init_node() which fails to call the rmem_cma_setup(). Please let me know if there's already a fix patch. [1] https://lore.kernel.org/all/20240620001027.2326275-1-quic_obabatun@quic= inc.com/ Regards Aisheng . From: Ciprian Costea To: Chester Lin , Matthias Brugger , Ghennadi Procopciuc , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, s32@nxp.com, Ciprian Costea Subject: [PATCH] arm64: dts: s32g: Disable usdhc write-protect Date: Thu, 4 Jul 2024 15:03:00 +0300 Message-ID: <20240704120300.2849264-1-ciprianmarian.costea@oss.nxp.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267871 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail SDHCI controller found on NXP S32G based platforms do not define a pin for SD-Card write protection. Hence, adding 'disable-wp' usdhc device-tree property in order to fix observed warnings on SD boot as the following: "host does not support reading read-only switch, assuming write-enable" Signed-off-by: Ciprian Costea --- arch/arm64/boot/dts/freescale/s32g2.dtsi | 1 + arch/arm64/boot/dts/freescale/s32g3.dtsi | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/freescale/s32g2.dtsi b/arch/arm64/boot/dts/freescale/s32g2.dtsi index fc19ae2e8d3b..2ad8cfe964be 100644 --- a/arch/arm64/boot/dts/freescale/s32g2.dtsi +++ b/arch/arm64/boot/dts/freescale/s32g2.dtsi @@ -145,6 +145,7 @@ usdhc0: mmc@402f0000 { clocks = <&clks 32>, <&clks 31>, <&clks 33>; clock-names = "ipg", "ahb", "per"; bus-width = <8>; + disable-wp; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/freescale/s32g3.dtsi b/arch/arm64/boot/dts/freescale/s32g3.dtsi index c1b08992754b..9d38bdc23cff 100644 --- a/arch/arm64/boot/dts/freescale/s32g3.dtsi +++ b/arch/arm64/boot/dts/freescale/s32g3.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) /* - * Copyright 2021-2023 NXP + * Copyright 2021-2024 NXP * * Authors: Ghennadi Procopciuc * Ciprian Costea @@ -204,6 +204,7 @@ usdhc0: mmc@402f0000 { <&clks 31>, <&clks 33>; clock-names = "ipg", "ahb", "per"; + disable-wp; status = "disabled"; }; -- 2.45.2 . From: Mark Brown Date: Thu, 04 Jul 2024 13:05:48 +0100 Subject: [PATCH] spi: omap2-mcspi: Revert multi mode support X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20240704-spi-revert-omap2-multi-v1-1-69357ef13fdc@kernel.org> To: Louis Chauvet Cc: Colin Foster , =?utf-8?q?Jo=C3=A3o_Paulo_Gon=C3=A7alves?= , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267874 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-spi Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail There have been multiple reports that the multi-mode support in the OMAP2 McSPI driver has caused regressions on existing systems. There's been some discussion and some proposed changes but nothing that's been tested by all the reporters. Drop the patch for v6.10, hopefully we can get to the bottom of the issue and reenable the feature for v6.11. Reported-by: Colin Foster Reported-by: João Paulo Gonçalves Fixes: e64d3b6fc9a3 ("spi: omap2-mcpsi: Enable MULTI-mode in more situations") Signed-off-by: Mark Brown --- drivers/spi/spi-omap2-mcspi.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 7e3083b83534..002f29dbcea6 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -1277,24 +1277,11 @@ static int omap2_mcspi_prepare_message(struct spi_controller *ctlr, /* * Check if this transfer contains only one word; - * OR contains 1 to 4 words, with bits_per_word == 8 and no delay between each word - * OR contains 1 to 2 words, with bits_per_word == 16 and no delay between each word - * - * If one of the two last case is true, this also change the bits_per_word of this - * transfer to make it a bit faster. - * It's not an issue to change the bits_per_word here even if the multi-mode is not - * applicable for this message, the signal on the wire will be the same. */ if (bits_per_word < 8 && tr->len == 1) { /* multi-mode is applicable, only one word (1..7 bits) */ - } else if (tr->word_delay.value == 0 && bits_per_word == 8 && tr->len <= 4) { - /* multi-mode is applicable, only one "bigger" word (8,16,24,32 bits) */ - tr->bits_per_word = tr->len * bits_per_word; - } else if (tr->word_delay.value == 0 && bits_per_word == 16 && tr->len <= 2) { - /* multi-mode is applicable, only one "bigger" word (16,32 bits) */ - tr->bits_per_word = tr->len * bits_per_word / 2; } else if (bits_per_word >= 8 && tr->len == bits_per_word / 8) { - /* multi-mode is applicable, only one word (9..15,17..32 bits) */ + /* multi-mode is applicable, only one word (8..32 bits) */ } else { /* multi-mode is not applicable: more than one word in the transfer */ mcspi->use_multi_mode = false; --- base-commit: 1762dc01fc78ef5f19693e9317eae7491c6c7e1b change-id: 20240703-spi-revert-omap2-multi-0028480e65c4 Best regards, -- Mark Brown . From: Christian Eggers To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter CC: David Lechner , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , , , , Christian Eggers Subject: [RFC PATCH RESEND] drm/tiny: Add support for Sitronix ST7539 Date: Thu, 4 Jul 2024 14:26:42 +0200 Message-ID: <20240704122642.22906-1-ceggers@arri.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1267889 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Resend because the 1st transmission got HTML'ed by my company's mail server. Based on the existing ST7586 driver. But the ST7539 ... - is monochrome only - has 8 VERTICAL pixels per byte - doesn't support any MIPI DCS commands - has (a few) 16 bit commands - doesn't support setting a clipping rect when writing to the RAM - doesn't support rotation (only mirroring of X and/or Y axis) Questions/TODO: - should drivers for such old displays be mainlined? - shall I use mipi_dbi_ although the display doesn't implement MIPI DCS (and has some 16 bit commands)? - can the conversion to 8 vertical pixels/byte (taken from solomon/ssd130x.c) be avoided / simplified / made more efficient? - how to implement setting of the display contrast (required by my application)? - add device tree binding Signed-off-by: Christian Eggers --- MAINTAINERS | 6 + drivers/gpu/drm/tiny/Kconfig | 11 + drivers/gpu/drm/tiny/Makefile | 1 + drivers/gpu/drm/tiny/st7539.c | 424 ++++++++++++++++++++++++++++++++++ 4 files changed, 442 insertions(+) create mode 100644 drivers/gpu/drm/tiny/st7539.c diff --git a/MAINTAINERS b/MAINTAINERS index e7d543cf9f6c..7191206c1ae3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7116,6 +7116,12 @@ S: Maintained F: Documentation/devicetree/bindings/display/panel/samsung,s6d7aa0.yaml F: drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c +DRM DRIVER FOR SITRONIX ST7539 PANELS +M: Christian Eggers +S: Maintained +T: git https://gitlab.freedesktop.org/drm/misc/kernel.git +F: drivers/gpu/drm/tiny/st7539.c + DRM DRIVER FOR SITRONIX ST7586 PANELS M: David Lechner S: Maintained diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig index f6889f649bc1..220d2aee9354 100644 --- a/drivers/gpu/drm/tiny/Kconfig +++ b/drivers/gpu/drm/tiny/Kconfig @@ -186,6 +186,17 @@ config TINYDRM_REPAPER If M is selected the module will be called repaper. +config TINYDRM_ST7539 + tristate "DRM support for Sitronix ST7539 display panels" + depends on DRM && SPI + select DRM_KMS_HELPER + select DRM_GEM_DMA_HELPER + select DRM_MIPI_DBI + help + DRM driver for Sitronix ST7539 panels. + + If M is selected the module will be called st7539. + config TINYDRM_ST7586 tristate "DRM support for Sitronix ST7586 display panels" depends on DRM && SPI diff --git a/drivers/gpu/drm/tiny/Makefile b/drivers/gpu/drm/tiny/Makefile index 76dde89a044b..0bd217779995 100644 --- a/drivers/gpu/drm/tiny/Makefile +++ b/drivers/gpu/drm/tiny/Makefile @@ -14,5 +14,6 @@ obj-$(CONFIG_TINYDRM_ILI9341) += ili9341.o obj-$(CONFIG_TINYDRM_ILI9486) += ili9486.o obj-$(CONFIG_TINYDRM_MI0283QT) += mi0283qt.o obj-$(CONFIG_TINYDRM_REPAPER) += repaper.o +obj-$(CONFIG_TINYDRM_ST7539) += st7539.o obj-$(CONFIG_TINYDRM_ST7586) += st7586.o obj-$(CONFIG_TINYDRM_ST7735R) += st7735r.o diff --git a/drivers/gpu/drm/tiny/st7539.c b/drivers/gpu/drm/tiny/st7539.c new file mode 100644 index 000000000000..9a6aeea006ef --- /dev/null +++ b/drivers/gpu/drm/tiny/st7539.c @@ -0,0 +1,424 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * DRM driver for Sitronix ST7539 panels + * + * Copyright 2024 Christian Eggers + * + * based on st7586.c + * Copyright 2017 David Lechner + */ + +#include +#include +#include +#include +#include +#include