Skip to content

Commit 5709be4

Browse files
author
Alexei Starovoitov
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc3
Cross-merge bpf and other fixes after downstream PRs. No conflicts. Signed-off-by: Alexei Starovoitov <[email protected]>
2 parents 8582d9a + 9d7a057 commit 5709be4

File tree

1,994 files changed

+18043
-10199
lines changed

Some content is hidden

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

1,994 files changed

+18043
-10199
lines changed

.clang-format

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ ForEachMacros:
9292
- '__rq_for_each_bio'
9393
- '__shost_for_each_device'
9494
- '__sym_for_each'
95+
- '_for_each_counter'
9596
- 'apei_estatus_for_each_section'
9697
- 'ata_for_each_dev'
9798
- 'ata_for_each_link'
@@ -141,11 +142,14 @@ ForEachMacros:
141142
- 'damon_for_each_target_safe'
142143
- 'damos_for_each_filter'
143144
- 'damos_for_each_filter_safe'
145+
- 'damos_for_each_ops_filter'
146+
- 'damos_for_each_ops_filter_safe'
144147
- 'damos_for_each_quota_goal'
145148
- 'damos_for_each_quota_goal_safe'
146149
- 'data__for_each_file'
147150
- 'data__for_each_file_new'
148151
- 'data__for_each_file_start'
152+
- 'def_for_each_cpu'
149153
- 'device_for_each_child_node'
150154
- 'device_for_each_child_node_scoped'
151155
- 'dma_fence_array_for_each'
@@ -176,6 +180,7 @@ ForEachMacros:
176180
- 'drm_for_each_privobj'
177181
- 'drm_gem_for_each_gpuvm_bo'
178182
- 'drm_gem_for_each_gpuvm_bo_safe'
183+
- 'drm_gpusvm_for_each_range'
179184
- 'drm_gpuva_for_each_op'
180185
- 'drm_gpuva_for_each_op_from_reverse'
181186
- 'drm_gpuva_for_each_op_reverse'
@@ -216,8 +221,10 @@ ForEachMacros:
216221
- 'for_each_active_dev_scope'
217222
- 'for_each_active_drhd_unit'
218223
- 'for_each_active_iommu'
224+
- 'for_each_active_irq'
219225
- 'for_each_active_route'
220226
- 'for_each_aggr_pgid'
227+
- 'for_each_alloc_capable_rdt_resource'
221228
- 'for_each_and_bit'
222229
- 'for_each_andnot_bit'
223230
- 'for_each_available_child_of_node'
@@ -228,6 +235,7 @@ ForEachMacros:
228235
- 'for_each_btf_ext_rec'
229236
- 'for_each_btf_ext_sec'
230237
- 'for_each_bvec'
238+
- 'for_each_capable_rdt_resource'
231239
- 'for_each_card_auxs'
232240
- 'for_each_card_auxs_safe'
233241
- 'for_each_card_components'
@@ -241,6 +249,7 @@ ForEachMacros:
241249
- 'for_each_cgroup_storage_type'
242250
- 'for_each_child_of_node'
243251
- 'for_each_child_of_node_scoped'
252+
- 'for_each_child_of_node_with_prefix'
244253
- 'for_each_clear_bit'
245254
- 'for_each_clear_bit_from'
246255
- 'for_each_clear_bitrange'
@@ -296,6 +305,7 @@ ForEachMacros:
296305
- 'for_each_group_member_head'
297306
- 'for_each_hstate'
298307
- 'for_each_hwgpio'
308+
- 'for_each_hwgpio_in_range'
299309
- 'for_each_if'
300310
- 'for_each_inject_fn'
301311
- 'for_each_insn'
@@ -304,6 +314,7 @@ ForEachMacros:
304314
- 'for_each_intid'
305315
- 'for_each_iommu'
306316
- 'for_each_ip_tunnel_rcu'
317+
- 'for_each_irq_desc'
307318
- 'for_each_irq_nr'
308319
- 'for_each_lang'
309320
- 'for_each_link_ch_maps'
@@ -324,6 +335,8 @@ ForEachMacros:
324335
- 'for_each_missing_reg'
325336
- 'for_each_mle_subelement'
326337
- 'for_each_mod_mem_type'
338+
- 'for_each_mon_capable_rdt_resource'
339+
- 'for_each_mp_bvec'
327340
- 'for_each_net'
328341
- 'for_each_net_continue_reverse'
329342
- 'for_each_net_rcu'
@@ -351,6 +364,7 @@ ForEachMacros:
351364
- 'for_each_node_by_name'
352365
- 'for_each_node_by_type'
353366
- 'for_each_node_mask'
367+
- 'for_each_node_numadist'
354368
- 'for_each_node_state'
355369
- 'for_each_node_with_cpus'
356370
- 'for_each_node_with_property'
@@ -359,6 +373,8 @@ ForEachMacros:
359373
- 'for_each_of_allnodes'
360374
- 'for_each_of_allnodes_from'
361375
- 'for_each_of_cpu_node'
376+
- 'for_each_of_graph_port'
377+
- 'for_each_of_graph_port_endpoint'
362378
- 'for_each_of_pci_range'
363379
- 'for_each_old_connector_in_state'
364380
- 'for_each_old_crtc_in_state'
@@ -372,18 +388,22 @@ ForEachMacros:
372388
- 'for_each_oldnew_plane_in_state_reverse'
373389
- 'for_each_oldnew_private_obj_in_state'
374390
- 'for_each_online_cpu'
391+
- 'for_each_online_cpu_wrap'
375392
- 'for_each_online_node'
376393
- 'for_each_online_pgdat'
377394
- 'for_each_or_bit'
395+
- 'for_each_page_ext'
378396
- 'for_each_path'
379397
- 'for_each_pci_bridge'
380398
- 'for_each_pci_dev'
381399
- 'for_each_pcm_streams'
382400
- 'for_each_physmem_range'
383401
- 'for_each_populated_zone'
384402
- 'for_each_possible_cpu'
403+
- 'for_each_possible_cpu_wrap'
385404
- 'for_each_present_blessed_reg'
386405
- 'for_each_present_cpu'
406+
- 'for_each_present_section_nr'
387407
- 'for_each_prime_number'
388408
- 'for_each_prime_number_from'
389409
- 'for_each_probe_cache_entry'
@@ -396,6 +416,7 @@ ForEachMacros:
396416
- 'for_each_prop_dlc_cpus'
397417
- 'for_each_prop_dlc_platforms'
398418
- 'for_each_property_of_node'
419+
- 'for_each_rdt_resource'
399420
- 'for_each_reg'
400421
- 'for_each_reg_filtered'
401422
- 'for_each_reloc'
@@ -434,10 +455,10 @@ ForEachMacros:
434455
- 'for_each_subelement_id'
435456
- 'for_each_sublist'
436457
- 'for_each_subsystem'
458+
- 'for_each_suite'
437459
- 'for_each_supported_activate_fn'
438460
- 'for_each_supported_inject_fn'
439461
- 'for_each_sym'
440-
- 'for_each_test'
441462
- 'for_each_thread'
442463
- 'for_each_token'
443464
- 'for_each_unicast_dest_pgid'
@@ -499,8 +520,10 @@ ForEachMacros:
499520
- 'idr_for_each_entry_continue'
500521
- 'idr_for_each_entry_continue_ul'
501522
- 'idr_for_each_entry_ul'
523+
- 'iio_for_each_active_channel'
502524
- 'in_dev_for_each_ifa_rcu'
503525
- 'in_dev_for_each_ifa_rtnl'
526+
- 'in_dev_for_each_ifa_rtnl_net'
504527
- 'inet_bind_bucket_for_each'
505528
- 'interval_tree_for_each_span'
506529
- 'intlist__for_each_entry'
@@ -542,7 +565,6 @@ ForEachMacros:
542565
- 'list_for_each_prev'
543566
- 'list_for_each_prev_safe'
544567
- 'list_for_each_rcu'
545-
- 'list_for_each_reverse'
546568
- 'list_for_each_safe'
547569
- 'llist_for_each'
548570
- 'llist_for_each_entry'
@@ -552,6 +574,7 @@ ForEachMacros:
552574
- 'map__for_each_symbol'
553575
- 'map__for_each_symbol_by_name'
554576
- 'mas_for_each'
577+
- 'mas_for_each_rev'
555578
- 'mci_for_each_dimm'
556579
- 'media_device_for_each_entity'
557580
- 'media_device_for_each_intf'
@@ -561,10 +584,15 @@ ForEachMacros:
561584
- 'media_pipeline_for_each_entity'
562585
- 'media_pipeline_for_each_pad'
563586
- 'mlx5_lag_for_each_peer_mdev'
587+
- 'mptcp_for_each_subflow'
564588
- 'msi_domain_for_each_desc'
565589
- 'msi_for_each_desc'
566590
- 'mt_for_each'
591+
- 'nanddev_io_for_each_block'
567592
- 'nanddev_io_for_each_page'
593+
- 'neigh_for_each_in_bucket'
594+
- 'neigh_for_each_in_bucket_rcu'
595+
- 'neigh_for_each_in_bucket_safe'
568596
- 'netdev_for_each_lower_dev'
569597
- 'netdev_for_each_lower_private'
570598
- 'netdev_for_each_lower_private_rcu'
@@ -604,11 +632,11 @@ ForEachMacros:
604632
- 'perf_evlist__for_each_entry_safe'
605633
- 'perf_evlist__for_each_evsel'
606634
- 'perf_evlist__for_each_mmap'
635+
- 'perf_evsel_for_each_per_thread_period_safe'
607636
- 'perf_hpp_list__for_each_format'
608637
- 'perf_hpp_list__for_each_format_safe'
609638
- 'perf_hpp_list__for_each_sort_list'
610639
- 'perf_hpp_list__for_each_sort_list_safe'
611-
- 'perf_tool_event__for_each_event'
612640
- 'plist_for_each'
613641
- 'plist_for_each_continue'
614642
- 'plist_for_each_entry'
@@ -627,7 +655,6 @@ ForEachMacros:
627655
- 'rdma_for_each_block'
628656
- 'rdma_for_each_port'
629657
- 'rdma_umem_for_each_dma_block'
630-
- 'resort_rb__for_each_entry'
631658
- 'resource_list_for_each_entry'
632659
- 'resource_list_for_each_entry_safe'
633660
- 'rhl_for_each_entry_rcu'
@@ -658,6 +685,7 @@ ForEachMacros:
658685
- 'shost_for_each_device'
659686
- 'sk_for_each'
660687
- 'sk_for_each_bound'
688+
- 'sk_for_each_bound_safe'
661689
- 'sk_for_each_entry_offset_rcu'
662690
- 'sk_for_each_from'
663691
- 'sk_for_each_rcu'
@@ -680,7 +708,11 @@ ForEachMacros:
680708
- 'tb_property_for_each'
681709
- 'tcf_act_for_each_action'
682710
- 'tcf_exts_for_each_action'
711+
- 'test_suite__for_each_test_case'
712+
- 'tool_pmu__for_each_event'
713+
- 'ttm_bo_lru_for_each_reserved_guarded'
683714
- 'ttm_resource_manager_for_each_res'
715+
- 'udp_lrpa_for_each_entry_rcu'
684716
- 'udp_portaddr_for_each_entry'
685717
- 'udp_portaddr_for_each_entry_rcu'
686718
- 'usb_hub_for_each_child'
@@ -691,6 +723,7 @@ ForEachMacros:
691723
- 'v4l2_m2m_for_each_src_buf_safe'
692724
- 'virtio_device_for_each_vq'
693725
- 'while_for_each_ftrace_op'
726+
- 'workloads__for_each'
694727
- 'xa_for_each'
695728
- 'xa_for_each_marked'
696729
- 'xa_for_each_range'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ modules.order
6565
/vmlinux.32
6666
/vmlinux.map
6767
/vmlinux.symvers
68+
/vmlinux.unstripped
6869
/vmlinux-gdb.py
6970
/vmlinuz
7071
/System.map

.mailmap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ Jayachandran C <[email protected]> <[email protected]>
322322
323323
324324
325+
Jean-Michel Hautbois <[email protected]> <[email protected]>
325326
Jean Tourrilhes <[email protected]>
326327
327328
Jeff Garzik <[email protected]>
@@ -438,6 +439,8 @@ Linus Lüssing <[email protected]> <[email protected]>
438439
439440
440441
442+
443+
441444
442445
443446
@@ -685,6 +688,8 @@ Simon Wunderlich <[email protected]> <[email protected]>
685688
686689
687690
Sricharan Ramabadhran <[email protected]> <[email protected]>
691+
Srinivas Kandagatla <[email protected]> <[email protected]>
692+
Srinivas Kandagatla <[email protected]> <[email protected]>
688693
689694
690695

CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2071,6 +2071,10 @@ S: 660 Harvard Ave. #7
20712071
S: Santa Clara, CA 95051
20722072
S: USA
20732073

2074+
N: Joonsoo Kim
2075+
2076+
D: Slab allocators
2077+
20742078
N: Kukjin Kim
20752079
20762080
D: Samsung S3C, S5P and Exynos ARM architectures
@@ -3670,6 +3674,10 @@ S: 149 Union St.
36703674
S: Kingston, Ontario
36713675
S: Canada K7L 2P4
36723676

3677+
N: Pravin B Shelar
3678+
3679+
D: Open vSwitch maintenance and contributions
3680+
36733681
N: John Shifflett
36743682
36753683

Documentation/ABI/stable/sysfs-block

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Description:
7777

7878
What: /sys/block/<disk>/diskseq
7979
Date: February 2021
80-
Contact: Matteo Croce <mcroce@microsoft.com>
80+
Contact: Matteo Croce <teknoraver@meta.com>
8181
Description:
8282
The /sys/block/<disk>/diskseq files reports the disk
8383
sequence number, which is a monotonically increasing

Documentation/ABI/testing/sysfs-driver-ufs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,3 +1604,35 @@ Description:
16041604
prevent the UFS from frequently performing clock gating/ungating.
16051605

16061606
The attribute is read/write.
1607+
1608+
What: /sys/bus/platform/drivers/ufshcd/*/device_lvl_exception_count
1609+
What: /sys/bus/platform/devices/*.ufs/device_lvl_exception_count
1610+
Date: March 2025
1611+
Contact: Bao D. Nguyen <[email protected]>
1612+
Description:
1613+
This attribute is applicable to ufs devices compliant to the
1614+
JEDEC specifications version 4.1 or later. The
1615+
device_lvl_exception_count is a counter indicating the number of
1616+
times the device level exceptions have occurred since the last
1617+
time this variable is reset. Writing a 0 value to this
1618+
attribute will reset the device_lvl_exception_count. If the
1619+
device_lvl_exception_count reads a positive value, the user
1620+
application should read the device_lvl_exception_id attribute to
1621+
know more information about the exception.
1622+
1623+
The attribute is read/write.
1624+
1625+
What: /sys/bus/platform/drivers/ufshcd/*/device_lvl_exception_id
1626+
What: /sys/bus/platform/devices/*.ufs/device_lvl_exception_id
1627+
Date: March 2025
1628+
Contact: Bao D. Nguyen <[email protected]>
1629+
Description:
1630+
Reading the device_lvl_exception_id returns the
1631+
qDeviceLevelExceptionID attribute of the ufs device JEDEC
1632+
specification version 4.1. The definition of the
1633+
qDeviceLevelExceptionID is the ufs device vendor specific
1634+
implementation. Refer to the device manufacturer datasheet for
1635+
more information on the meaning of the qDeviceLevelExceptionID
1636+
attribute value.
1637+
1638+
The attribute is read only.

Documentation/ABI/testing/sysfs-kernel-reboot

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
What: /sys/kernel/reboot
22
Date: November 2020
33
KernelVersion: 5.11
4-
Contact: Matteo Croce <mcroce@microsoft.com>
4+
Contact: Matteo Croce <teknoraver@meta.com>
55
Description: Interface to set the kernel reboot behavior, similarly to
66
what can be done via the reboot= cmdline option.
77
(see Documentation/admin-guide/kernel-parameters.txt)
88

99
What: /sys/kernel/reboot/mode
1010
Date: November 2020
1111
KernelVersion: 5.11
12-
Contact: Matteo Croce <mcroce@microsoft.com>
12+
Contact: Matteo Croce <teknoraver@meta.com>
1313
Description: Reboot mode. Valid values are: cold warm hard soft gpio
1414

1515
What: /sys/kernel/reboot/type
1616
Date: November 2020
1717
KernelVersion: 5.11
18-
Contact: Matteo Croce <mcroce@microsoft.com>
18+
Contact: Matteo Croce <teknoraver@meta.com>
1919
Description: Reboot type. Valid values are: bios acpi kbd triple efi pci
2020

2121
What: /sys/kernel/reboot/cpu
2222
Date: November 2020
2323
KernelVersion: 5.11
24-
Contact: Matteo Croce <mcroce@microsoft.com>
24+
Contact: Matteo Croce <teknoraver@meta.com>
2525
Description: CPU number to use to reboot.
2626

2727
What: /sys/kernel/reboot/force
2828
Date: November 2020
2929
KernelVersion: 5.11
30-
Contact: Matteo Croce <mcroce@microsoft.com>
30+
Contact: Matteo Croce <teknoraver@meta.com>
3131
Description: Don't wait for any other CPUs on reboot and
3232
avoid anything that could hang.
3333

Documentation/admin-guide/hw-vuln/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ are configurable at compile, boot or run time.
2222
srso
2323
gather_data_sampling
2424
reg-file-data-sampling
25+
rsb

0 commit comments

Comments
 (0)