6.18.17-rc1 review
Subsystems (11)
Sasha Levin
maintainerPATCH 258/314 indirect_call_wrapper: do not reevaluate function pointer
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit 710f5c76580306cdb9ec51fac8fcf6a8faff7821 ]
We have an increasing number of READ_ONCE(xxx->function) combined with INDIRECT_CALL_[1234]() helpers.
Unfortunately this forces INDIRECT_CALL_[1234]() to read xxx->function many times, which is not what we wanted.
Fix these macros so that xxx->function value is not reloaded.
$ scripts/bloat-o-meter -t vmlinux.0 vmlinux add/remove: 0/0 grow/shrink: 1/65 up/down: 122/-1084 (-962) Function old new delta ip_push_pending_frames 59 181 +122 ip6_finish_output 687 681 -6 __udp_enqueue_schedule_skb 1078 1072 -6 ioam6_output 2319 2312 -7 xfrm4_rcv_encap_finish2 64 56 -8 xfrm4_output 297 289 -8 vrf_ip_local_out 278 270 -8 vrf_ip6_local_out 278 270 -8 seg6_input_finish 64 56 -8 rpl_output 700 692 -8 ipmr_forward_finish 124 116 -8 ip_forward_finish 143 135 -8 ip6mr_forward2_finish 100 92 -8 ip6_forward_finish 73 65 -8 input_action_end_bpf 1091 1083 -8 dst_input 52 44 -8 __xfrm6_output 801 793 -8 __xfrm4_output 83 75 -8 bpf_input 500 491 -9 __tcp_check_space 530 521 -9 input_action_end_dt6 291 280 -11 vti6_tnl_xmit 1634 1622 -12 bpf_xmit 1203 1191 -12 rpl_input 497 483 -14 rawv6_send_hdrinc 1355 1341 -14 ndisc_send_skb 1030 1016 -14 ipv6_srh_rcv 1377 1363 -14 ip_send_unicast_reply 1253 1239 -14 ip_rcv_finish 226 212 -14 ip6_rcv_finish 300 286 -14 input_action_end_x_core 205 191 -14 input_action_end_x 355 341 -14 input_action_end_t 205 191 -14 input_action_end_dx6_finish 127 113 -14 input_action_end_dx4_finish 373 359 -14 input_action_end_dt4 426 412 -14 input_action_end_core 186 172 -14 input_action_end_b6_encap 292 278 -14 input_action_end_b6 198 184 -14 igmp6_send 1332 1318 -14 ip_sublist_rcv 864 848 -16 ip6_sublist_rcv 1091 1075 -16 ipv6_rpl_srh_rcv 1937 1920 -17 xfrm_policy_queue_process 1246 1228 -18 seg6_output_core 903 885 -18 mld_sendpack 856 836 -20 NF_HOOK 756 736 -20 vti_tunnel_xmit 1447 1426 -21 input_action_end_dx6 664 642 -22 input_action_end 1502 1480 -22 sock_sendmsg_nosec 134 111 -23 ip6mr_forward2 388 364 -24 sock_recvmsg_nosec 134 109 -25 seg6_input_core 836 810 -26 ip_send_skb 172 146 -26 ip_local_out 140 114 -26 ip6_local_out 140 114 -26 __sock_sendmsg 162 136 -26 __ip_queue_xmit 1196 1170 -26 __ip_finish_output 405 379 -26 ipmr_queue_fwd_xmit 373 346 -27 sock_recvmsg 173 145 -28 ip6_xmit 1635 1607 -28 xfrm_output_resume 1418 1389 -29 ip_build_and_send_pkt 625 591 -34 dst_output 504 432 -72 Total: Before=25217686, After=25216724, chg -0.00%
--- include/linux/indirect_call_wrapper.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
include/linux/indirect_call_wrapper.h +11 -7
@@ -16,22 +16,26 @@*/ #define INDIRECT_CALL_1 (f, f1, ...) \ ({ \ - likely(f == f1) ? f1(__VA_ARGS__) : f(__VA_ARGS__); \ + typeof(f) __f1 = (f); \ + likely(__f1 == f1) ? f1(__VA_ARGS__) : __f1(__VA_ARGS__); \ })#define INDIRECT_CALL_2 (f, f2, f1, ...) \ ({ \ - likely(f == f2) ? f2(__VA_ARGS__) : \ - INDIRECT_CALL_1(f, f1, __VA_ARGS__); \ + typeof(f) __f2 = (f); \ + likely(__f2 == f2) ? f2(__VA_ARGS__) : \ + INDIRECT_CALL_1(__f2, f1, __VA_ARGS__); \ })#define INDIRECT_CALL_3 (f, f3, f2, f1, ...) \ ({ \ - likely(f == f3) ? f3(__VA_ARGS__) : \ - INDIRECT_CALL_2(f, f2, f1, __VA_ARGS__); \ + typeof(f) __f3 = (f); \ + likely(__f3 == f3) ? f3(__VA_ARGS__) : \ + INDIRECT_CALL_2(__f3, f2, f1, __VA_ARGS__); \ })#define INDIRECT_CALL_4 (f, f4, f3, f2, f1, ...) \ ({ \ - likely(f == f4) ? f4(__VA_ARGS__) : \ - INDIRECT_CALL_3(f, f3, f2, f1, __VA_ARGS__); \ + typeof(f) __f4 = (f); \ + likely(__f4 == f4) ? f4(__VA_ARGS__) : \ + INDIRECT_CALL_3(__f4, f3, f2, f1, __VA_ARGS__); \ })#define INDIRECT_CALLABLE_DECLARE (f) f
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 259/314 net/rds: Fix circular locking dependency in rds_tcp_tune
In reply to Sasha LevinFrom: Allison Henderson <[email protected]>
[ Upstream commit 6a877ececd6daa002a9a0002cd0fbca6592a9244 ]
syzbot reported a circular locking dependency in rds_tcp_tune() where sk_net_refcnt_upgrade() is called while holding the socket lock:
======================================================
WARNING: possible circular locking dependency detected
======================================================
kworker/u10:8/15040 is trying to acquire lock:ffffffff8e9aaf80 (fs_reclaim){+.+.}-{0:0},
at: __kmalloc_cache_noprof+0x4b/0x6f0
but task is already holding lock:ffff88805a3c1ce0 (k-sk_lock-AF_INET6){+.+.}-{0:0},
at: rds_tcp_tune+0xd7/0x930
The issue occurs because sk_net_refcnt_upgrade() performs memory allocation (via get_net_track() -> ref_tracker_alloc()) while the socket lock is held, creating a circular dependency with fs_reclaim.
Fix this by moving sk_net_refcnt_upgrade() outside the socket lock critical section. This is safe because the fields modified by the sk_net_refcnt_upgrade() call (sk_net_refcnt, ns_tracker) are not accessed by any concurrent code path at this point.
v2:
- Corrected fixes tag
- check patch line wrap nits
- ai commentary nits
--- net/rds/tcp.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/rds/tcp.c +10 -4
@@ -495,18 +495,24 @@ bool rds_tcp_tune(struct socket *sock)struct rds_tcp_net *rtn;tcp_sock_set_nodelay (sock->sk); -lock_sock (sk);/* TCP timer functions might access net namespace even after * a process which created this net namespace terminated. */ if (!sk->sk_net_refcnt) { -if (!maybe_get_net (net)) { -release_sock (sk); +if (!maybe_get_net (net))return false; - } +/* +* sk_net_refcnt_upgrade() must be called before lock_sock() +* because it does a GFP_KERNEL allocation, which can trigger +* fs_reclaim and create a circular lock dependency with the +* socket lock. The fields it modifies (sk_net_refcnt, +* ns_tracker) are not accessed by any concurrent code path +* at this point. +*/ sk_net_refcnt_upgrade (sk);put_net (net); } +lock_sock (sk); rtn =net_generic (net, rds_tcp_netid);if (rtn->sndbuf_size >0 ) { sk->sk_sndbuf = rtn->sndbuf_size;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 260/314 xen/acpi-processor: fix _CST detection using undersized evaluation buffer
In reply to Sasha LevinFrom: David Thomson <[email protected]>
[ Upstream commit 8b57227d59a86fc06d4f09de08f98133680f2cae ]
read_acpi_id() attempts to evaluate _CST using a stack buffer of sizeof(union acpi_object) (48 bytes), but _CST returns a nested Package of sub-Packages (one per C-state, each containing a register descriptor, type, latency, and power) requiring hundreds of bytes. The evaluation always fails with AE_BUFFER_OVERFLOW.
On modern systems using FFH/MWAIT entry (where pblk is zero), this causes the function to return before setting the acpi_id_cst_present bit. In check_acpi_ids(), flags.power is then zero for all Phase 2 CPUs (physical CPUs beyond dom0's vCPU count), so push_cxx_to_hypervisor() is never called for them.
On a system with dom0_max_vcpus=2 and 8 physical CPUs, only PCPUs 0-1 receive C-state data. PCPUs 2-7 are stuck in C0/C1 idle, unable to enter C2/C3. This costs measurable wall power (4W observed on an Intel Core Ultra 7 265K with Xen 4.20).
The function never uses the _CST return value -- it only needs to know whether _CST exists. Replace the broken acpi_evaluate_object() call with acpi_has_method(), which correctly detects _CST presence using acpi_get_handle() without any buffer allocation. This brings C-state detection to parity with the P-state path, which already works correctly for Phase 2 CPUs.
Message-ID: <[email protected]>
--- drivers/xen/xen-acpi-processor.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/xen/xen-acpi-processor.c +2 -5
@@ -379,11 +379,8 @@ read_acpi_id(acpi_handle handle, u32 lvl, void *context, void **rv) acpi_psd[acpi_id].domain); } - status =acpi_evaluate_object (handle,"_CST" ,NULL , &buffer); -if (ACPI_FAILURE (status)) { -if (!pblk) -return AE_OK ; - } +if (!pblk && !acpi_has_method (handle,"_CST" )) +return AE_OK ;/* .. and it has a C-state */ __set_bit (acpi_id, acpi_id_cst_present);
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 261/314 ice: fix adding AQ LLDP filter for VF
In reply to Sasha LevinFrom: Larysa Zaremba <[email protected]>
[ Upstream commit eef33aa44935d001747ca97703c08dd6f9031162 ]
The referenced commit came from a misunderstanding of the FW LLDP filter AQ (Admin Queue) command due to the error in the internal documentation. Contrary to the assumptions in the original commit, VFs can be added and deleted from this filter without any problems. Introduced dev_info message proved to be useful, so reverting the whole commit does not make sense.
Without this fix, trusted VFs do not receive LLDP traffic, if there is an AQ LLDP filter on PF. When trusted VF attempts to add an LLDP multicast MAC address, the following message can be seen in dmesg on host:
ice 0000:33:00.0: Failed to add Rx LLDP rule on VSI 20 error: -95
Revert checking VSI type when adding LLDP filter through AQ.
--- drivers/net/ethernet/intel/ice/ice_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_common.c +1 -1
@@ -6428,7 +6428,7 @@ int ice_lldp_fltr_add_remove(struct ice_hw *hw, struct ice_vsi *vsi, bool add)struct ice_aqc_lldp_filter_ctrl *cmd;struct libie_aq_desc desc; -if (vsi->type !=ICE_VSI_PF || !ice_fw_supports_lldp_fltr_ctrl (hw)) +if (!ice_fw_supports_lldp_fltr_ctrl (hw))return -EOPNOTSUPP ; cmd =libie_aq_raw (&desc);
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 262/314 libie: don't unroll if fwlog isn't supported
In reply to Sasha LevinFrom: Michal Swiatkowski <[email protected]>
[ Upstream commit 636cc3bd12f499c74eaf5dc9a7d5b832f1bb24ed ]
The libie_fwlog_deinit() function can be called during driver unload even when firmware logging was never properly initialized. This led to call trace:
[ 148.576156] Oops: Oops: 0000 [#1] SMP NOPTI [ 148.576167] CPU: 80 UID: 0 PID: 12843 Comm: rmmod Kdump: loaded Not tainted 6.17.0-rc7next-queue-3oct-01915-g06d79d51cf51 #1 PREEMPT(full) [ 148.576177] Hardware name: HPE ProLiant DL385 Gen10 Plus/ProLiant DL385 Gen10 Plus, BIOS A42 07/18/2020 [ 148.576182] RIP: 0010:__dev_printk+0x16/0x70 [ 148.576196] Code: 1f 44 00 00 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 0f 1f 44 00 00 41 55 41 54 49 89 d4 55 48 89 fd 53 48 85 f6 74 3c <4c> 8b 6e 50 48 89 f3 4d 85 ed 75 03 4c 8b 2e 48 89 df e8 f3 27 98 [ 148.576204] RSP: 0018:ffffd2fd7ea17a48 EFLAGS: 00010202 [ 148.576211] RAX: ffffd2fd7ea17aa0 RBX: ffff8eb288ae2000 RCX: 0000000000000000 [ 148.576217] RDX: ffffd2fd7ea17a70 RSI: 00000000000000c8 RDI: ffffffffb68d3d88 [ 148.576222] RBP: ffffffffb68d3d88 R08: 0000000000000000 R09: 0000000000000000 [ 148.576227] R10: 00000000000000c8 R11: ffff8eb2b1a49400 R12: ffffd2fd7ea17a70 [ 148.576231] R13: ffff8eb3141fb000 R14: ffffffffc1215b48 R15: ffffffffc1215bd8 [ 148.576236] FS: 00007f5666ba6740(0000) GS:ffff8eb2472b9000(0000) knlGS:0000000000000000 [ 148.576242] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 148.576247] CR2: 0000000000000118 CR3: 000000011ad17000 CR4: 0000000000350ef0 [ 148.576252] Call Trace: [ 148.576258] <TASK> [ 148.576269] _dev_warn+0x7c/0x96 [ 148.576290] libie_fwlog_deinit+0x112/0x117 [libie_fwlog] [ 148.576303] ixgbe_remove+0x63/0x290 [ixgbe] [ 148.576342] pci_device_remove+0x42/0xb0 [ 148.576354] device_release_driver_internal+0x19c/0x200 [ 148.576365] driver_detach+0x48/0x90 [ 148.576372] bus_remove_driver+0x6d/0xf0 [ 148.576383] pci_unregister_driver+0x2e/0xb0 [ 148.576393] ixgbe_exit_module+0x1c/0xd50 [ixgbe] [ 148.576430] __do_sys_delete_module.isra.0+0x1bc/0x2e0 [ 148.576446] do_syscall_64+0x7f/0x980
It can be reproduced by trying to unload ixgbe driver in recovery mode.
Fix that by checking if fwlog is supported before doing unroll.
--- drivers/net/ethernet/intel/libie/fwlog.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/intel/libie/fwlog.c +4 -0
@@ -1051,6 +1051,10 @@ void libie_fwlog_deinit(struct libie_fwlog *fwlog) {int status; +/* if FW logging isn't supported it means no configuration was done */ +if (!libie_fwlog_supported (fwlog)) +return ; +/* make sure FW logging is disabled to not put the FW in a weird state * for the next driver load */
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 263/314 iavf: fix netdev->max_mtu to respect actual hardware limit
In reply to Sasha LevinFrom: Kohei Enju <[email protected]>
[ Upstream commit b84852170153671bb0fa6737a6e48370addd8e1a ]
iavf sets LIBIE_MAX_MTU as netdev->max_mtu, ignoring vf_res->max_mtu from PF [1]. This allows setting an MTU beyond the actual hardware limit, causing TX queue timeouts [2].
Set correct netdev->max_mtu using vf_res->max_mtu from the PF.
Note that currently PF drivers such as ice/i40e set the frame size in vf_res->max_mtu, not MTU. Convert vf_res->max_mtu to MTU before setting netdev->max_mtu.
[1]
# ip -j -d link show $DEV | jq '.[0].max_mtu' 16356
[2]
iavf 0000:00:05.0 enp0s5: NETDEV WATCHDOG: CPU: 1: transmit queue 0 timed out 5692 ms iavf 0000:00:05.0 enp0s5: NIC Link is Up Speed is 10 Gbps Full Duplex iavf 0000:00:05.0 enp0s5: NETDEV WATCHDOG: CPU: 6: transmit queue 3 timed out 5312 ms iavf 0000:00:05.0 enp0s5: NIC Link is Up Speed is 10 Gbps Full Duplex
...
--- drivers/net/ethernet/intel/iavf/iavf_main.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/iavf/iavf_main.c +16 -1
@@ -2797,7 +2797,22 @@ static void iavf_init_config_adapter(struct iavf_adapter *adapter) netdev->watchdog_timeo =5 *HZ ; netdev->min_mtu =ETH_MIN_MTU ; - netdev->max_mtu =LIBIE_MAX_MTU ; + +/* PF/VF API: vf_res->max_mtu is max frame size (not MTU). +* Convert to MTU. +*/ +if (!adapter->vf_res->max_mtu) { + netdev->max_mtu =LIBIE_MAX_MTU ; + }else if (adapter->vf_res->max_mtu <LIBETH_RX_LL_LEN +ETH_MIN_MTU || + adapter->vf_res->max_mtu > +LIBETH_RX_LL_LEN +LIBIE_MAX_MTU ) { +netdev_warn_once (adapter->netdev, +"invalid max frame size %d from PF, using default MTU %d" , + adapter->vf_res->max_mtu,LIBIE_MAX_MTU ); + netdev->max_mtu =LIBIE_MAX_MTU ; + }else { + netdev->max_mtu = adapter->vf_res->max_mtu -LIBETH_RX_LL_LEN ; + }if (!is_valid_ether_addr (adapter->hw.mac.addr)) { dev_info(&pdev->dev, "Invalid MAC address %pM, using random\n",
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 264/314 igb: Fix trigger of incorrect irq in igb_xsk_wakeup
In reply to Sasha LevinFrom: Vivek Behera <[email protected]>
[ Upstream commit d4c13ab36273a8c318ba06799793cc1f5d9c6fa1 ]
The current implementation in the igb_xsk_wakeup expects the Rx and Tx queues to share the same irq. This would lead to triggering of incorrect irq in split irq configuration. This patch addresses this issue which could impact environments with 2 active cpu cores
or when the number of queues is reduced to 2 or less
cat /proc/interrupts | grep eno2
167: 0 0 0 0 IR-PCI-MSIX-0000:08:00.0
0-edge eno2
168: 0 0 0 0 IR-PCI-MSIX-0000:08:00.0
1-edge eno2-rx-0
169: 0 0 0 0 IR-PCI-MSIX-0000:08:00.0
2-edge eno2-rx-1
170: 0 0 0 0 IR-PCI-MSIX-0000:08:00.0
3-edge eno2-tx-0
171: 0 0 0 0 IR-PCI-MSIX-0000:08:00.0
4-edge eno2-tx-1
Furthermore it uses the flags input argument to trigger either rx, tx or both rx and tx irqs as specified in the ndo_xsk_wakeup api documentation
--- drivers/net/ethernet/intel/igb/igb_xsk.c | 38 +++++++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/igb/igb_xsk.c +30 -8
@@ -524,6 +524,16 @@ bool igb_xmit_zc(struct igb_ring *tx_ring, struct xsk_buff_pool *xsk_pool)return nb_pkts < budget; } +static u32 igb_sw_irq_prep (struct igb_q_vector *q_vector) +{ +u32 eics =0 ; + +if (!napi_if_scheduled_mark_missed (&q_vector->napi)) + eics = q_vector->eims_value; + +return eics; +} +int igb_xsk_wakeup (struct net_device *dev,u32 qid,u32 flags) {struct igb_adapter *adapter =netdev_priv (dev);
@@ -542,20 +552,32 @@ int igb_xsk_wakeup(struct net_device *dev, u32 qid, u32 flags) ring = adapter->tx_ring[qid]; -if (test_bit (IGB_RING_FLAG_TX_DISABLED , &ring->flags)) -return -ENETDOWN ; -if (!READ_ONCE (ring->xsk_pool))return -EINVAL ; -if (!napi_if_scheduled_mark_missed (&ring->q_vector->napi)) { +if (flags &XDP_WAKEUP_TX ) { +if (test_bit (IGB_RING_FLAG_TX_DISABLED , &ring->flags)) +return -ENETDOWN ; + + eics |=igb_sw_irq_prep (ring->q_vector); + } + +if (flags &XDP_WAKEUP_RX ) { +/* If IGB_FLAG_QUEUE_PAIRS is active, the q_vector +* and NAPI is shared between RX and TX. +* If NAPI is already running it would be marked as missed +* from the TX path, making this RX call a NOP +*/ + ring = adapter->rx_ring[qid]; + eics |=igb_sw_irq_prep (ring->q_vector); + } + +if (eics) {/* Cause software interrupt */ -if (adapter->flags &IGB_FLAG_HAS_MSIX ) { - eics |= ring->q_vector->eims_value; +if (adapter->flags &IGB_FLAG_HAS_MSIX )wr32 (E1000_EICS , eics); - }else { +else wr32 (E1000_ICS ,E1000_ICS_RXDMT0 ); - } }return 0 ;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 265/314 bpf: Fix a UAF issue in bpf_trampoline_link_cgroup_shim
In reply to Sasha LevinFrom: Lang Xu <[email protected]>
[ Upstream commit 56145d237385ca0e7ca9ff7b226aaf2eb8ef368b ]
The root cause of this bug is that when 'bpf_link_put' reduces the refcount of 'shim_link->link.link' to zero, the resource is considered released but may still be referenced via 'tr->progs_hlist' in 'cgroup_shim_find'. The actual cleanup of 'tr->progs_hlist' in 'bpf_shim_tramp_link_release' is deferred. During this window, another process can cause a use-after-free via 'bpf_trampoline_link_cgroup_shim'.
Based on Martin KaFai Lau's suggestions, I have created a simple patch.
To fix this:
Add an atomic non-zero check in 'bpf_trampoline_link_cgroup_shim'. Only increment the refcount if it is not already zero.
Testing:
I verified the fix by adding a delay in 'bpf_shim_tramp_link_release' to make the bug easier to trigger:
static void bpf_shim_tramp_link_release(struct bpf_link *link)
{
/* ... */
if (!shim_link->trampoline)
return;+ msleep(100); WARN_ON_ONCE(bpf_trampoline_unlink_prog(&shim_link->link, shim_link->trampoline, NULL)); bpf_trampoline_put(shim_link->trampoline); }
Before the patch, running a PoC easily reproduced the crash(almost 100%) with a call trace similar to KaiyanM's report.
After the patch, the bug no longer occurs even after millions of iterations.
--- kernel/bpf/trampoline.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
kernel/bpf/trampoline.c +1 -3
@@ -751,10 +751,8 @@ int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,mutex_lock (&tr->mutex); shim_link =cgroup_shim_find (tr, bpf_func); -if (shim_link) { +if (shim_link && !IS_ERR (bpf_link_inc_not_zero (&shim_link->link.link))) {/* Reusing existing shim attached by the other program. */ -bpf_link_inc (&shim_link->link.link); -mutex_unlock (&tr->mutex);bpf_trampoline_put (tr);/* bpf_trampoline_get above */ return 0 ;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 266/314 smb/client: fix buffer size for smb311_posix_qinfo in smb2_compound_op()
In reply to Sasha LevinFrom: ZhangGuoDong <[email protected]>
[ Upstream commit 12c43a062acb0ac137fc2a4a106d4d084b8c5416 ]
Use sizeof(struct smb311_posix_qinfo) instead of sizeof its pointer, so the allocated buffer matches the actual struct size.
--- fs/smb/client/smb2inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/smb/client/smb2inode.c +2 -2
@@ -322,7 +322,7 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon, cfile->fid.volatile_fid,SMB_FIND_FILE_POSIX_INFO ,SMB2_O_INFO_FILE ,0 , -sizeof (struct smb311_posix_qinfo *) + +sizeof (struct smb311_posix_qinfo ) + (PATH_MAX *2 ) + (sizeof(struct smb_sid) * 2), 0, NULL); }else {
@@ -332,7 +332,7 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,COMPOUND_FID ,SMB_FIND_FILE_POSIX_INFO ,SMB2_O_INFO_FILE ,0 , -sizeof (struct smb311_posix_qinfo *) + +sizeof (struct smb311_posix_qinfo ) + (PATH_MAX *2 ) + (sizeof(struct smb_sid) * 2), 0, NULL); }
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 267/314 smb/client: fix buffer size for smb311_posix_qinfo in SMB311_posix_query_info()
In reply to Sasha LevinFrom: ZhangGuoDong <[email protected]>
[ Upstream commit 9621b996e4db1dbc2b3dc5d5910b7d6179397320 ]
SMB311_posix_query_info() is currently unused, but it may still be used in some stable versions, so these changes are submitted as a separate patch.
Use sizeof(struct smb311_posix_qinfo) instead of sizeof its pointer, so the allocated buffer matches the actual struct size.
--- fs/smb/client/smb2pdu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/smb/client/smb2pdu.c +1 -1
@@ -3915,7 +3915,7 @@ int SMB311_posix_query_info(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, u64 volatile_fid, struct smb311_posix_qinfo *data, u32 *plen) { - size_t output_len = sizeof(struct smb311_posix_qinfo *) + + size_t output_len = sizeof(struct smb311_posix_qinfo) + (sizeof (struct smb_sid ) *2 ) + (PATH_MAX *2 ); *plen =0 ;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 268/314 ipv6: fix NULL pointer deref in ip6_rt_get_dev_rcu()
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 2ffb4f5c2ccb2fa1c049dd11899aee7967deef5a ]
l3mdev_master_dev_rcu() can return NULL when the slave device is being un-slaved from a VRF. All other callers deal with this, but we lost the fallback to loopback in ip6_rt_pcpu_alloc() -> ip6_rt_get_dev_rcu() with commit 4832c30d5458 ("net: ipv6: put host and anycast routes on device with address").
KASAN: null-ptr-deref in range [0x0000000000000108-0x000000000000010f] RIP: 0010:ip6_rt_pcpu_alloc (net/ipv6/route.c:1418) Call Trace: ip6_pol_route (net/ipv6/route.c:2318) fib6_rule_lookup (net/ipv6/fib6_rules.c:115) ip6_route_output_flags (net/ipv6/route.c:2607) vrf_process_v6_outbound (drivers/net/vrf.c:437)
I was tempted to rework the un-slaving code to clear the flag first and insert synchronize_rcu() before we remove the upper. But looks like the explicit fallback to loopback_dev is an established pattern. And I guess avoiding the synchronize_rcu() is nice, too.
--- net/ipv6/route.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/route.c +2 -1
@@ -1063,7 +1063,8 @@ static struct net_device *ip6_rt_get_dev_rcu(const struct fib6_result *res)*/ if (netif_is_l3_slave (dev) && !rt6_need_strict (&res->f6i->fib6_dst.addr)) - dev =l3mdev_master_dev_rcu (dev); + dev =l3mdev_master_dev_rcu (dev) ? : +dev_net (dev)->loopback_dev;else if (!netif_is_l3_master (dev)) dev =dev_net (dev)->loopback_dev;/* last case is netif_is_l3_master(dev) is true in which
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 269/314 net: ipv4: fix ARM64 alignment fault in multipath hash seed
In reply to Sasha LevinFrom: Yung Chih Su <[email protected]>
[ Upstream commit 4ee7fa6cf78ff26d783d39e2949d14c4c1cd5e7f ]
struct sysctl_fib_multipath_hash_seed contains two u32 fields (user_seed and mp_seed), making it an 8-byte structure with a 4-byte alignment requirement.
In fib_multipath_hash_from_keys(), the code evaluates the entire struct atomically via READ_ONCE():
mp_seed = READ_ONCE(net->ipv4.sysctl_fib_multipath_hash_seed).mp_seed;
While this silently works on GCC by falling back to unaligned regular loads which the ARM64 kernel tolerates, it causes a fatal kernel panic when compiled with Clang and LTO enabled.
Commit e35123d83ee3 ("arm64: lto: Strengthen READ_ONCE() to acquire when CONFIG_LTO=y") strengthens READ_ONCE() to use Load-Acquire instructions (ldar / ldapr) to prevent compiler reordering bugs under Clang LTO. Since the macro evaluates the full 8-byte struct, Clang emits a 64-bit ldar instruction. ARM64 architecture strictly requires ldar to be naturally aligned, thus executing it on a 4-byte aligned address triggers a strict Alignment Fault (FSC = 0x21).
Fix the read side by moving the READ_ONCE() directly to the u32 member, which emits a safe 32-bit ldar Wn.
Furthermore, Eric Dumazet pointed out that WRITE_ONCE() on the entire struct in proc_fib_multipath_hash_set_seed() is also flawed. Analysis shows that Clang splits this 8-byte write into two separate 32-bit str instructions. While this avoids an alignment fault, it destroys atomicity and exposes a tear-write vulnerability. Fix this by explicitly splitting the write into two 32-bit WRITE_ONCE() operations.
Finally, add the missing READ_ONCE() when reading user_seed in proc_fib_multipath_hash_seed() to ensure proper pairing and concurrency safety.
--- include/net/ip_fib.h | 2 +- net/ipv4/sysctl_net_ipv4.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
include/net/ip_fib.h +1 -1
@@ -559,7 +559,7 @@ static inline u32 fib_multipath_hash_from_keys(const struct net *net,siphash_aligned_key_t hash_key;u32 mp_seed; - mp_seed =READ_ONCE (net->ipv4.sysctl_fib_multipath_hash_seed).mp_seed; + mp_seed =READ_ONCE (net->ipv4.sysctl_fib_multipath_hash_seed.mp_seed);fib_multipath_hash_construct_key (&hash_key, mp_seed);return flow_hash_from_keys_seed (keys, &hash_key);
net/ipv4/sysctl_net_ipv4.c +3 -2
@@ -484,7 +484,8 @@ static void proc_fib_multipath_hash_set_seed(struct net *net, u32 user_seed) proc_fib_multipath_hash_rand_seed), }; -WRITE_ONCE (net->ipv4.sysctl_fib_multipath_hash_seed, new); +WRITE_ONCE (net->ipv4.sysctl_fib_multipath_hash_seed.user_seed, new.user_seed); +WRITE_ONCE (net->ipv4.sysctl_fib_multipath_hash_seed.mp_seed, new.mp_seed); } static int proc_fib_multipath_hash_seed(const struct ctl_table *table, int write,
@@ -498,7 +499,7 @@ static int proc_fib_multipath_hash_seed(const struct ctl_table *table, int writeint ret; mphs = &net->ipv4.sysctl_fib_multipath_hash_seed; - user_seed = mphs->user_seed; + user_seed =READ_ONCE (mphs->user_seed); tmp = *table; tmp.data = &user_seed;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 270/314 amd-xgbe: fix sleep while atomic on suspend/resume
In reply to Sasha LevinFrom: Raju Rangoju <[email protected]>
[ Upstream commit e2f27363aa6d983504c6836dd0975535e2e9dba0 ]
The xgbe_powerdown() and xgbe_powerup() functions use spinlocks (spin_lock_irqsave) while calling functions that may sleep:
- napi_disable() can sleep waiting for NAPI polling to complete
- flush_workqueue() can sleep waiting for pending work items
This causes a "BUG: scheduling while atomic" error during suspend/resume cycles on systems using the AMD XGBE Ethernet controller.
The spinlock protection in these functions is unnecessary as these functions are called from suspend/resume paths which are already serialized by the PM core
Fix this by removing the spinlock. Since only code that takes this lock is xgbe_powerdown() and xgbe_powerup(), remove it completely.
--- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 10 ---------- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 1 - drivers/net/ethernet/amd/xgbe/xgbe.h | 3 --- 3 files changed, 14 deletions(-)
drivers/net/ethernet/amd/xgbe/xgbe-drv.c +0 -10
@@ -1089,7 +1089,6 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller) {struct xgbe_prv_data *pdata =netdev_priv (netdev);struct xgbe_hw_if *hw_if = &pdata->hw_if; -unsigned long flags;DBGPR ("-->xgbe_powerdown\n" );
@@ -1100,8 +1099,6 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)return -EINVAL ; } -spin_lock_irqsave (&pdata->lock, flags); -if (caller ==XGMAC_DRIVER_CONTEXT )netif_device_detach (netdev);
@@ -1117,8 +1114,6 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller) pdata->power_down =1 ; -spin_unlock_irqrestore (&pdata->lock, flags); -DBGPR ("<--xgbe_powerdown\n" );return 0 ;
@@ -1128,7 +1123,6 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller) {struct xgbe_prv_data *pdata =netdev_priv (netdev);struct xgbe_hw_if *hw_if = &pdata->hw_if; -unsigned long flags;DBGPR ("-->xgbe_powerup\n" );
@@ -1139,8 +1133,6 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)return -EINVAL ; } -spin_lock_irqsave (&pdata->lock, flags); - pdata->power_down =0 ;xgbe_napi_enable (pdata,0 );
@@ -1155,8 +1147,6 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)xgbe_start_timers (pdata); -spin_unlock_irqrestore (&pdata->lock, flags); -DBGPR ("<--xgbe_powerup\n" );return 0 ;
drivers/net/ethernet/amd/xgbe/xgbe-main.c +0 -1
@@ -76,7 +76,6 @@ struct xgbe_prv_data *xgbe_alloc_pdata(struct device *dev) pdata->netdev = netdev; pdata->dev = dev; -spin_lock_init (&pdata->lock);spin_lock_init (&pdata->xpcs_lock);mutex_init (&pdata->rss_mutex);spin_lock_init (&pdata->tstamp_lock);
drivers/net/ethernet/amd/xgbe/xgbe.h +0 -3
@@ -1003,9 +1003,6 @@ struct xgbe_prv_data {unsigned int pp3;unsigned int pp4; -/* Overall device lock */ -spinlock_t lock; -/* XPCS indirect addressing lock */ spinlock_t xpcs_lock;unsigned int xpcs_window_def_reg;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 271/314 drm/sched: Fix kernel-doc warning for drm_sched_job_done()
In reply to Sasha LevinFrom: Yujie Liu <[email protected]>
[ Upstream commit 61ded1083b264ff67ca8c2de822c66b6febaf9a8 ]
There is a kernel-doc warning for the scheduler:
Warning: drivers/gpu/drm/scheduler/sched_main.c:367 function parameter 'result' not described in 'drm_sched_job_done'
Fix the warning by describing the undocumented error code.
--- drivers/gpu/drm/scheduler/sched_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/scheduler/sched_main.c +1 -0
@@ -361,6 +361,7 @@ static void drm_sched_run_free_queue(struct drm_gpu_scheduler *sched)/** * drm_sched_job_done - complete a job * @s_job: pointer to the job which is done +* @result: 0 on success, -ERRNO on error * * Finish the job's fence and resubmit the work items. */
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 272/314 i2c: i801: Revert "i2c: i801: replace acpi_lock with I2C bus lock"
In reply to Sasha LevinFrom: Charles Haithcock <[email protected]>
[ Upstream commit cfc69c2e6c699c96949f7b0455195b0bfb7dc715 ]
This reverts commit f707d6b9e7c18f669adfdb443906d46cfbaaa0c1.
Under rare circumstances, multiple udev threads can collect i801 device info on boot and walk i801_acpi_io_handler somewhat concurrently. The first will note the area is reserved by acpi to prevent further touches. This ultimately causes the area to be deregistered. The second will enter i801_acpi_io_handler after the area is unregistered but before a check can be made that the area is unregistered. i2c_lock_bus relies on the now unregistered area containing lock_ops to lock the bus. The end result is a kernel panic on boot with the following backtrace;
[ 14.971872] ioatdma 0000:09:00.2: enabling device (0100 -> 0102) [ 14.971873] BUG: kernel NULL pointer dereference, address: 0000000000000000 [ 14.971880] #PF: supervisor read access in kernel mode [ 14.971884] #PF: error_code(0x0000) - not-present page [ 14.971887] PGD 0 P4D 0 [ 14.971894] Oops: 0000 [#1] PREEMPT SMP PTI [ 14.971900] CPU: 5 PID: 956 Comm: systemd-udevd Not tainted 5.14.0-611.5.1.el9_7.x86_64 #1 [ 14.971905] Hardware name: XXXXXXXXXXXXXXXXXXXXXXX BIOS 1.20.10.SV91 01/30/2023 [ 14.971908] RIP: 0010:i801_acpi_io_handler+0x2d/0xb0 [i2c_i801] [ 14.971929] Code: 00 00 49 8b 40 20 41 57 41 56 4d 8b b8 30 04 00 00 49 89 ce 41 55 41 89 d5 41 54 49 89 f4 be 02 00 00 00 55 4c 89 c5 53 89 fb <48> 8b 00 4c 89 c7 e8 18 61 54 e9 80 bd 80 04 00 00 00 75 09 4c 3b [ 14.971933] RSP: 0018:ffffbaa841483838 EFLAGS: 00010282 [ 14.971938] RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffff9685e01ba568 [ 14.971941] RDX: 0000000000000008 RSI: 0000000000000002 RDI: 0000000000000000 [ 14.971944] RBP: ffff9685ca22f028 R08: ffff9685ca22f028 R09: ffff9685ca22f028 [ 14.971948] R10: 000000000000000b R11: 0000000000000580 R12: 0000000000000580 [ 14.971951] R13: 0000000000000008 R14: ffff9685e01ba568 R15: ffff9685c222f000 [ 14.971954] FS: 00007f8287c0ab40(0000) GS:ffff96a47f940000(0000) knlGS:0000000000000000 [ 14.971959] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 14.971963] CR2: 0000000000000000 CR3: 0000000168090001 CR4: 00000000003706f0 [ 14.971966] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 14.971968] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 14.971972] Call Trace: [ 14.971977] <TASK> [ 14.971981] ? show_trace_log_lvl+0x1c4/0x2df [ 14.971994] ? show_trace_log_lvl+0x1c4/0x2df [ 14.972003] ? acpi_ev_address_space_dispatch+0x16e/0x3c0 [ 14.972014] ? __die_body.cold+0x8/0xd [ 14.972021] ? page_fault_oops+0x132/0x170 [ 14.972028] ? exc_page_fault+0x61/0x150 [ 14.972036] ? asm_exc_page_fault+0x22/0x30 [ 14.972045] ? i801_acpi_io_handler+0x2d/0xb0 [i2c_i801] [ 14.972061] acpi_ev_address_space_dispatch+0x16e/0x3c0 [ 14.972069] ? __pfx_i801_acpi_io_handler+0x10/0x10 [i2c_i801] [ 14.972085] acpi_ex_access_region+0x5b/0xd0 [ 14.972093] acpi_ex_field_datum_io+0x73/0x2e0 [ 14.972100] acpi_ex_read_data_from_field+0x8e/0x230 [ 14.972106] acpi_ex_resolve_node_to_value+0x23d/0x310 [ 14.972114] acpi_ds_evaluate_name_path+0xad/0x110 [ 14.972121] acpi_ds_exec_end_op+0x321/0x510 [ 14.972127] acpi_ps_parse_loop+0xf7/0x680 [ 14.972136] acpi_ps_parse_aml+0x17a/0x3d0 [ 14.972143] acpi_ps_execute_method+0x137/0x270 [ 14.972150] acpi_ns_evaluate+0x1f4/0x2e0 [ 14.972158] acpi_evaluate_object+0x134/0x2f0 [ 14.972164] acpi_evaluate_integer+0x50/0xe0 [ 14.972173] ? vsnprintf+0x24b/0x570 [ 14.972181] acpi_ac_get_state.part.0+0x23/0x70 [ 14.972189] get_ac_property+0x4e/0x60 [ 14.972195] power_supply_show_property+0x90/0x1f0 [ 14.972205] add_prop_uevent+0x29/0x90 [ 14.972213] power_supply_uevent+0x109/0x1d0 [ 14.972222] dev_uevent+0x10e/0x2f0 [ 14.972228] uevent_show+0x8e/0x100 [ 14.972236] dev_attr_show+0x19/0x40 [ 14.972246] sysfs_kf_seq_show+0x9b/0x100 [ 14.972253] seq_read_iter+0x120/0x4b0 [ 14.972262] ? selinux_file_permission+0x106/0x150 [ 14.972273] vfs_read+0x24f/0x3a0 [ 14.972284] ksys_read+0x5f/0xe0 [ 14.972291] do_syscall_64+0x5f/0xe0
...
The kernel panic is mitigated by setting limiting the count of udev children to 1. Revert to using the acpi_lock to continue protecting marking the area as owned by firmware without relying on a lock in a potentially unmapped region of memory.
--- drivers/i2c/busses/i2c-i801.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-i801.c +10 -4
@@ -306,9 +306,10 @@ struct i801_priv {/* * If set to true the host controller registers are reserved for -* ACPI AML use. +* ACPI AML use. Needs extra protection by acpi_lock. */ bool acpi_reserved; +struct mutex acpi_lock; };#define FEATURE_SMBUS_PEC BIT(0)
@@ -890,8 +891,11 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,int hwpec, ret;struct i801_priv *priv =i2c_get_adapdata (adap); -if (priv->acpi_reserved) +mutex_lock (&priv->acpi_lock); +if (priv->acpi_reserved) { +mutex_unlock (&priv->acpi_lock);return -EBUSY ; + }pm_runtime_get_sync (&priv->pci_dev->dev);
@@ -931,6 +935,7 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,iowrite8 (SMBHSTSTS_INUSE_STS |STATUS_FLAGS ,SMBHSTSTS (priv));pm_runtime_put_autosuspend (&priv->pci_dev->dev); +mutex_unlock (&priv->acpi_lock);return ret; }
@@ -1459,7 +1464,7 @@ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits,* further access from the driver itself. This device is now owned * by the system firmware. */ -i2c_lock_bus (&priv->adapter,I2C_LOCK_SEGMENT ); +mutex_lock (&priv->acpi_lock);if (!priv->acpi_reserved &&i801_acpi_is_smbus_ioport (priv, address)) { priv->acpi_reserved = true;
@@ -1479,7 +1484,7 @@ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits,else status =acpi_os_write_port (address, (u32)*value, bits); -i2c_unlock_bus (&priv->adapter,I2C_LOCK_SEGMENT ); +mutex_unlock (&priv->acpi_lock);return status; }
@@ -1539,6 +1544,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) priv->adapter.dev.parent = &dev->dev;acpi_use_parent_companion (&priv->adapter.dev); priv->adapter.retries =3 ; +mutex_init (&priv->acpi_lock); priv->pci_dev = dev; priv->features = id->driver_data;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 273/314 drm/xe/gsc: Fix GSC proxy cleanup on early initialization failure
In reply to Sasha LevinFrom: Zhanjun Dong <[email protected]>
[ Upstream commit b3368ecca9538b88ddf982ea99064860fd5add97 ]
xe_gsc_proxy_remove undoes what is done in both xe_gsc_proxy_init and xe_gsc_proxy_start; however, if we fail between those 2 calls, it is possible that the HW forcewake access hasn't been initialized yet and so we hit errors when the cleanup code tries to write GSC register. To avoid that, split the cleanup in 2 functions so that the HW cleanup is only called if the HW setup was completed successfully.
Since the HW cleanup (interrupt disabling) is now removed from xe_gsc_proxy_remove, the cleanup on error paths in xe_gsc_proxy_start must be updated to disable interrupts before returning.
--- drivers/gpu/drm/xe/xe_gsc_proxy.c | 43 +++++++++++++++++++++++++------ drivers/gpu/drm/xe/xe_gsc_types.h | 2 ++ 2 files changed, 37 insertions(+), 8 deletions(-)
drivers/gpu/drm/xe/xe_gsc_proxy.c +35 -8
@@ -435,16 +435,12 @@ static int proxy_channel_alloc(struct xe_gsc *gsc)return 0 ; } -static void xe_gsc_proxy_remove (void *arg) +static void xe_gsc_proxy_stop (struct xe_gsc *gsc) { -struct xe_gsc *gsc = arg;struct xe_gt *gt =gsc_to_gt (gsc);struct xe_device *xe =gt_to_xe (gt);unsigned int fw_ref =0 ; -if (!gsc->proxy.component_added) -return ; -/* disable HECI2 IRQs */ xe_pm_runtime_get (xe); fw_ref =xe_force_wake_get (gt_to_fw (gt),XE_FW_GSC );
@@ -458,6 +454,30 @@ static void xe_gsc_proxy_remove(void *arg)xe_pm_runtime_put (xe);xe_gsc_wait_for_worker_completion (gsc); + gsc->proxy.started = false; +} + +static void xe_gsc_proxy_remove (void *arg) +{ +struct xe_gsc *gsc = arg; +struct xe_gt *gt =gsc_to_gt (gsc); +struct xe_device *xe =gt_to_xe (gt); + +if (!gsc->proxy.component_added) +return ; + +/* +* GSC proxy start is an async process that can be ongoing during +* Xe module load/unload. Using devm managed action to register +* xe_gsc_proxy_stop could cause issues if Xe module unload has +* already started when the action is registered, potentially leading +* to the cleanup being called at the wrong time. Therefore, instead +* of registering a separate devm action to undo what is done in +* proxy start, we call it from here, but only if the start has +* completed successfully (tracked with the 'started' flag). +*/ +if (gsc->proxy.started) +xe_gsc_proxy_stop (gsc);component_del (xe->drm.dev, &xe_gsc_proxy_component_ops); gsc->proxy.component_added = false;
@@ -513,6 +533,7 @@ int xe_gsc_proxy_init(struct xe_gsc *gsc)*/ int xe_gsc_proxy_start (struct xe_gsc *gsc) { +struct xe_gt *gt =gsc_to_gt (gsc);int err;/* enable the proxy interrupt in the GSC shim layer */
@@ -524,12 +545,18 @@ int xe_gsc_proxy_start(struct xe_gsc *gsc)*/ err =xe_gsc_proxy_request_handler (gsc);if (err) -return err; + goto err_irq_disable;if (!xe_gsc_proxy_init_done (gsc)) { -xe_gt_err (gsc_to_gt (gsc),"GSC FW reports proxy init not completed\n" ); -return -EIO ; +xe_gt_err (gt,"GSC FW reports proxy init not completed\n" ); + err = -EIO ; + goto err_irq_disable; } + gsc->proxy.started = true;return 0 ; + +err_irq_disable: +gsc_proxy_irq_toggle (gsc, false); +return err; }
drivers/gpu/drm/xe/xe_gsc_types.h +2 -0
@@ -58,6 +58,8 @@ struct xe_gsc {struct mutex mutex;/** @proxy.component_added: whether the component has been added */ bool component_added; +/** @proxy.started: whether the proxy has been started */ +bool started;/** @proxy.bo: object to store message to and from the GSC */ struct xe_bo *bo;/** @proxy.to_gsc: map of the memory used to send messages to the GSC */
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 274/314 drm/xe/reg_sr: Fix leak on xa_store failure
In reply to Sasha LevinFrom: Shuicheng Lin <[email protected]>
[ Upstream commit 3091723785def05ebfe6a50866f87a044ae314ba ]
Free the newly allocated entry when xa_store() fails to avoid a memory leak on the error path.
v2: use goto fail_free. (Bala)
--- drivers/gpu/drm/xe/xe_reg_sr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_reg_sr.c +3 -1
@@ -101,10 +101,12 @@ int xe_reg_sr_add(struct xe_reg_sr *sr, *pentry = *e; ret =xa_err (xa_store (&sr->xa, idx, pentry,GFP_KERNEL ));if (ret) - goto fail; + goto fail_free;return 0 ; +fail_free: +kfree (pentry); fail: xe_gt_err(gt, "discarding save-restore reg %04lx (clear: %08x, set: %08x, masked: %s, mcr: %s): ret=%d\n",
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 275/314 nvme: reject invalid pr_read_keys() num_keys values
In reply to Sasha LevinFrom: Stefan Hajnoczi <[email protected]>
[ Upstream commit 38ec8469f39e0e96e7dd9b76f05e0f8eb78be681 ]
The pr_read_keys() interface has a u32 num_keys parameter. The NVMe Reservation Report command has a u32 maximum length. Reject num_keys values that are too large to fit.
This will become important when pr_read_keys() is exposed to untrusted userspace via an <linux/pr.h> ioctl.
Stable-dep-of: c3320153769f ("nvme: fix memory allocation in nvme_pr_read_keys()")
--- drivers/nvme/host/pr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/nvme/host/pr.c +5 -1
@@ -228,7 +228,8 @@ static int nvme_pr_resv_report(struct block_device *bdev, void *data,static int nvme_pr_read_keys (struct block_device *bdev,struct pr_keys *keys_info) { -u32 rse_len, num_keys = keys_info->num_keys; +size_t rse_len; +u32 num_keys = keys_info->num_keys;struct nvme_reservation_status_ext *rse;int ret, i;bool eds;
@@ -238,6 +239,9 @@ static int nvme_pr_read_keys(struct block_device *bdev,* enough to get enough keys to fill the return keys buffer. */ rse_len =struct_size (rse, regctl_eds, num_keys); +if (rse_len >U32_MAX ) +return -EINVAL ; + rse =kzalloc (rse_len,GFP_KERNEL );if (!rse)return -ENOMEM ;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 276/314 nvme: fix memory allocation in nvme_pr_read_keys()
In reply to Sasha LevinFrom: Sungwoo Kim <[email protected]>
[ Upstream commit c3320153769f05fd7fe9d840cb555dd3080ae424 ]
nvme_pr_read_keys() takes num_keys from userspace and uses it to calculate the allocation size for rse via struct_size(). The upper limit is PR_KEYS_MAX (64K).
A malicious or buggy userspace can pass a large num_keys value that results in a 4MB allocation attempt at most, causing a warning in the page allocator when the order exceeds MAX_PAGE_ORDER.
To fix this, use kvzalloc() instead of kzalloc().
This bug has the same reasoning and fix with the patch below:
https://lore.kernel.org/linux-block/[email protected]/
Warning log:
WARNING: mm/page_alloc.c:5216 at __alloc_frozen_pages_noprof+0x5aa/0x2300 mm/page_alloc.c:5216, CPU#1: syz-executor117/272 Modules linked in: CPU: 1 UID: 0 PID: 272 Comm: syz-executor117 Not tainted 6.19.0 #1 PREEMPT(voluntary) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.3-0-ga6ed6b701f0a-prebuilt.qemu.org 04/01/2014 RIP: 0010:__alloc_frozen_pages_noprof+0x5aa/0x2300 mm/page_alloc.c:5216 Code: ff 83 bd a8 fe ff ff 0a 0f 86 69 fb ff ff 0f b6 1d f9 f9 c4 04 80 fb 01 0f 87 3b 76 30 ff 83 e3 01 75 09 c6 05 e4 f9 c4 04 01 <0f> 0b 48 c7 85 70 fe ff ff 00 00 00 00 e9 8f fd ff ff 31 c0 e9 0d RSP: 0018:ffffc90000fcf450 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 1ffff920001f9ea0 RDX: 0000000000000000 RSI: 000000000000000b RDI: 0000000000040dc0 RBP: ffffc90000fcf648 R08: ffff88800b6c3380 R09: 0000000000000001 R10: ffffc90000fcf840 R11: ffff88807ffad280 R12: 0000000000000000 R13: 0000000000040dc0 R14: 0000000000000001 R15: ffffc90000fcf620 FS: 0000555565db33c0(0000) GS:ffff8880be26c000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000002000000c CR3: 0000000003b72000 CR4: 00000000000006f0 Call Trace: <TASK> alloc_pages_mpol+0x236/0x4d0 mm/mempolicy.c:2486 alloc_frozen_pages_noprof+0x149/0x180 mm/mempolicy.c:2557 ___kmalloc_large_node+0x10c/0x140 mm/slub.c:5598 __kmalloc_large_node_noprof+0x25/0xc0 mm/slub.c:5629 __do_kmalloc_node mm/slub.c:5645 [inline] __kmalloc_noprof+0x483/0x6f0 mm/slub.c:5669 kmalloc_noprof include/linux/slab.h:961 [inline] kzalloc_noprof include/linux/slab.h:1094 [inline] nvme_pr_read_keys+0x8f/0x4c0 drivers/nvme/host/pr.c:245 blkdev_pr_read_keys block/ioctl.c:456 [inline] blkdev_common_ioctl+0x1b71/0x29b0 block/ioctl.c:730 blkdev_ioctl+0x299/0x700 block/ioctl.c:786 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:597 [inline] __se_sys_ioctl fs/ioctl.c:583 [inline] __x64_sys_ioctl+0x1bf/0x220 fs/ioctl.c:583 x64_sys_call+0x1280/0x21b0 mnt/fuzznvme_1/fuzznvme/linux-build/v6.19/./arch/x86/include/generated/asm/syscalls_64.h:17 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0x71/0x330 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x76/0x7e RIP: 0033:0x7fb893d3108d Code: 28 c3 e8 46 1e 00 00 66 0f 1f 44 00 00 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007ffff61f2f38 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00007ffff61f3138 RCX: 00007fb893d3108d RDX: 0000000020000040 RSI: 00000000c01070ce RDI: 0000000000000003 RBP: 0000000000000001 R08: 0000000000000000 R09: 00007ffff61f3138 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000001 R13: 00007ffff61f3128 R14: 00007fb893dae530 R15: 0000000000000001 </TASK>
--- drivers/nvme/host/pr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nvme/host/pr.c +2 -2
@@ -242,7 +242,7 @@ static int nvme_pr_read_keys(struct block_device *bdev,if (rse_len >U32_MAX )return -EINVAL ; - rse =kzalloc (rse_len,GFP_KERNEL ); + rse =kvzalloc (rse_len,GFP_KERNEL );if (!rse)return -ENOMEM ;
@@ -267,7 +267,7 @@ static int nvme_pr_read_keys(struct block_device *bdev, } free_rse: -kfree (rse); +kvfree (rse);return ret; }
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 277/314 timekeeping: Fix timex status validation for auxiliary clocks
In reply to Sasha LevinFrom: Miroslav Lichvar <[email protected]>
[ Upstream commit e48a869957a70cc39b4090cd27c36a86f8db9b92 ]
The timekeeping_validate_timex() function validates the timex status of an auxiliary system clock even when the status is not to be changed, which causes unexpected errors for applications that make read-only clock_adjtime() calls, or set some other timex fields, but without clearing the status field.
Do the AUX-specific status validation only when the modes field contains ADJ_STATUS, i.e. the application is actually trying to change the status. This makes the AUX-specific clock_adjtime() behavior consistent with CLOCK_REALTIME.
--- kernel/time/timekeeping.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/time/timekeeping.c +4 -2
@@ -2639,7 +2639,8 @@ static int timekeeping_validate_timex(const struct __kernel_timex *txc, bool auxif (aux_clock) {/* Auxiliary clocks are similar to TAI and do not have leap seconds */ -if (txc->status & (STA_INS |STA_DEL )) +if (txc->modes &ADJ_STATUS && + txc->status & (STA_INS |STA_DEL ))return -EINVAL ;/* No TAI offset setting */
@@ -2647,7 +2648,8 @@ static int timekeeping_validate_timex(const struct __kernel_timex *txc, bool auxreturn -EINVAL ;/* No PPS support either */ -if (txc->status & (STA_PPSFREQ |STA_PPSTIME )) +if (txc->modes &ADJ_STATUS && + txc->status & (STA_PPSFREQ |STA_PPSTIME ))return -EINVAL ; }
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 278/314 hwmon: (max6639) fix inverted polarity
In reply to Sasha LevinFrom: Olivier Sobrie <[email protected]>
[ Upstream commit 170a4b21f49b3dcff3115b4c90758f0a0d77375a ]
According to MAX6639 documentation:
D1: PWM Output Polarity. PWM output is low at 100% duty cycle when this bit is set to zero. PWM output is high at 100% duty cycle when this bit is set to 1.
Up to commit 0f33272b60ed ("hwmon: (max6639) : Update hwmon init using info structure"), the polarity was set to high (0x2) when no platform data was set. After the patch, the polarity register wasn't set anymore if no platform data was specified. Nowadays, since commit 7506ebcd662b ("hwmon: (max6639) : Configure based on DT property"), it is always set to low which doesn't match with the comment above and change the behavior compared to versions prior 0f33272b60ed.
--- drivers/hwmon/max6639.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/max6639.c +1 -1
@@ -623,7 +623,7 @@ static int max6639_init_client(struct i2c_client *client,return err;/* Fans PWM polarity high by default */ - err =regmap_write (data->regmap,MAX6639_REG_FAN_CONFIG2a (i),0x00 ); + err =regmap_write (data->regmap,MAX6639_REG_FAN_CONFIG2a (i),0x02 );if (err)return err;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 279/314 net: sched: avoid qdisc_reset_all_tx_gt() vs dequeue race for lockless qdiscs
In reply to Sasha LevinFrom: Koichiro Den <[email protected]>
[ Upstream commit 7f083faf59d14c04e01ec05a7507f036c965acf8 ]
When shrinking the number of real tx queues, netif_set_real_num_tx_queues() calls qdisc_reset_all_tx_gt() to flush qdiscs for queues which will no longer be used.
qdisc_reset_all_tx_gt() currently serializes qdisc_reset() with qdisc_lock(). However, for lockless qdiscs, the dequeue path is serialized by qdisc_run_begin/end() using qdisc->seqlock instead, so qdisc_reset() can run concurrently with __qdisc_run() and free skbs while they are still being dequeued, leading to UAF.
This can easily be reproduced on e.g. virtio-net by imposing heavy traffic while frequently changing the number of queue pairs:
iperf3 -ub0 -c $peer -t 0 &
while :; do
ethtool -L eth0 combined 1
ethtool -L eth0 combined 2
done
With KASAN enabled, this leads to reports like:
BUG: KASAN: slab-use-after-free in __qdisc_run+0x133f/0x1760 ... Call Trace: <TASK> ... __qdisc_run+0x133f/0x1760 __dev_queue_xmit+0x248f/0x3550 ip_finish_output2+0xa42/0x2110 ip_output+0x1a7/0x410 ip_send_skb+0x2e6/0x480 udp_send_skb+0xb0a/0x1590 udp_sendmsg+0x13c9/0x1fc0 ... </TASK> Allocated by task 1270 on cpu 5 at 44.558414s: ... alloc_skb_with_frags+0x84/0x7c0 sock_alloc_send_pskb+0x69a/0x830 __ip_append_data+0x1b86/0x48c0 ip_make_skb+0x1e8/0x2b0 udp_sendmsg+0x13a6/0x1fc0 ... Freed by task 1306 on cpu 3 at 44.558445s: ... kmem_cache_free+0x117/0x5e0 pfifo_fast_reset+0x14d/0x580 qdisc_reset+0x9e/0x5f0 netif_set_real_num_tx_queues+0x303/0x840 virtnet_set_channels+0x1bf/0x260 [virtio_net] ethnl_set_channels+0x684/0xae0 ethnl_default_set_doit+0x31a/0x890 ...
Serialize qdisc_reset_all_tx_gt() against the lockless dequeue path by taking qdisc->seqlock for TCQ_F_NOLOCK qdiscs, matching the serialization model already used by dev_reset_queue().
Additionally clear QDISC_STATE_NON_EMPTY after reset so the qdisc state reflects an empty queue, avoiding needless re-scheduling.
--- include/net/sch_generic.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/net/sch_generic.h +10 -0
@@ -758,13 +758,23 @@ static inline bool skb_skip_tc_classify(struct sk_buff *skb)static inline void qdisc_reset_all_tx_gt (struct net_device *dev,unsigned int i) {struct Qdisc *qdisc; +bool nolock;for (; i < dev->num_tx_queues; i++) { qdisc =rtnl_dereference (netdev_get_tx_queue (dev, i)->qdisc);if (qdisc) { + nolock = qdisc->flags &TCQ_F_NOLOCK ; + +if (nolock) +spin_lock_bh (&qdisc->seqlock);spin_lock_bh (qdisc_lock (qdisc));qdisc_reset (qdisc);spin_unlock_bh (qdisc_lock (qdisc)); +if (nolock) { +clear_bit (__QDISC_STATE_MISSED, &qdisc->state); +clear_bit (__QDISC_STATE_DRAINING, &qdisc->state); +spin_unlock_bh (&qdisc->seqlock); + } } } }
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 280/314 tcp: secure_seq: add back ports to TS offset
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit 165573e41f2f66ef98940cf65f838b2cb575d9d1 ]
This reverts 28ee1b746f49 ("secure_seq: downgrade to per-host timestamp offsets")
tcp_tw_recycle went away in 2017.
Zhouyan Deng reported off-path TCP source port leakage via SYN cookie side-channel that can be fixed in multiple ways.
One of them is to bring back TCP ports in TS offset randomization.
As a bonus, we perform a single siphash() computation to provide both an ISN and a TS offset.
--- include/net/secure_seq.h | 45 ++++++++++++++++++---- include/net/tcp.h | 6 ++- net/core/secure_seq.c | 80 +++++++++++++++------------------------- net/ipv4/syncookies.c | 11 ++++-- net/ipv4/tcp_input.c | 8 +++- net/ipv4/tcp_ipv4.c | 37 +++++++++---------- net/ipv6/syncookies.c | 11 ++++-- net/ipv6/tcp_ipv6.c | 37 +++++++++---------- 8 files changed, 127 insertions(+), 108 deletions(-)
include/net/secure_seq.h +38 -7
@@ -5,16 +5,47 @@#include <linux/types.h> struct net ; +extern struct net init_net; + +union tcp_seq_and_ts_off { +struct { +u32 seq; +u32 ts_off; + }; +u64 hash64; +};u64 secure_ipv4_port_ephemeral (__be32 saddr,__be32 daddr,__be16 dport);u64 secure_ipv6_port_ephemeral (const __be32 *saddr,const __be32 *daddr,__be16 dport); -u32 secure_tcp_seq (__be32 saddr,__be32 daddr, -__be16 sport,__be16 dport); -u32 secure_tcp_ts_off (const struct net *net,__be32 saddr,__be32 daddr); -u32 secure_tcpv6_seq (const __be32 *saddr,const __be32 *daddr, -__be16 sport,__be16 dport); -u32 secure_tcpv6_ts_off (const struct net *net, -const __be32 *saddr,const __be32 *daddr); +union tcp_seq_and_ts_off +secure_tcp_seq_and_ts_off (const struct net *net,__be32 saddr,__be32 daddr, +__be16 sport,__be16 dport); + +static inline u32 secure_tcp_seq (__be32 saddr,__be32 daddr, +__be16 sport,__be16 dport) +{ +union tcp_seq_and_ts_off ts; + + ts =secure_tcp_seq_and_ts_off (&init_net, saddr, daddr, + sport, dport); + +return ts.seq; +} + +union tcp_seq_and_ts_off +secure_tcpv6_seq_and_ts_off (const struct net *net,const __be32 *saddr, +const __be32 *daddr, +__be16 sport,__be16 dport); + +static inline u32 secure_tcpv6_seq (const __be32 *saddr,const __be32 *daddr, +__be16 sport,__be16 dport) +{ +union tcp_seq_and_ts_off ts; + + ts =secure_tcpv6_seq_and_ts_off (&init_net, saddr, daddr, + sport, dport); +return ts.seq; +}#endif /* _NET_SECURE_SEQ */
include/net/tcp.h +4 -2
@@ -43,6 +43,7 @@#include <net/dst.h> #include <net/mptcp.h> #include <net/xfrm.h> +#include <net/secure_seq.h> #include <linux/seq_file.h> #include <linux/memcontrol.h>
@@ -2435,8 +2436,9 @@ struct tcp_request_sock_ops {struct flowi *fl, struct request_sock *req, u32 tw_isn); -u32 (*init_seq)(const struct sk_buff *skb); -u32 (*init_ts_off)(const struct net *net,const struct sk_buff *skb); +union tcp_seq_and_ts_off (*init_seq_and_ts_off)( +const struct net *net, +const struct sk_buff *skb); int (*send_synack)(const struct sock *sk, struct dst_entry *dst, struct flowi *fl, struct request_sock *req, struct tcp_fastopen_cookie *foc,
net/core/secure_seq.c +29 -51
122 lines not on this page · raw message
net/ipv4/syncookies.c +8 -3
@@ -378,9 +378,14 @@ static struct request_sock *cookie_tcp_check(struct net *net, struct sock *sk,tcp_parse_options (net, skb, &tcp_opt,0 ,NULL );if (tcp_opt.saw_tstamp && tcp_opt.rcv_tsecr) { - tsoff =secure_tcp_ts_off (net, -ip_hdr (skb)->daddr, -ip_hdr (skb)->saddr); +union tcp_seq_and_ts_off st; + + st =secure_tcp_seq_and_ts_off (net, +ip_hdr (skb)->daddr, +ip_hdr (skb)->saddr, +tcp_hdr (skb)->dest, +tcp_hdr (skb)->source); + tsoff = st.ts_off; tcp_opt.rcv_tsecr -= tsoff; }
net/ipv4/tcp_input.c +6 -2
@@ -7385,6 +7385,7 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,const struct tcp_sock *tp =tcp_sk (sk);struct net *net =sock_net (sk);struct sock *fastopen_sk =NULL ; +union tcp_seq_and_ts_off st;struct request_sock *req;bool want_cookie = false;struct dst_entry *dst;
@@ -7454,9 +7455,12 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,if (!dst) goto drop_and_free; +if (tmp_opt.tstamp_ok || (!want_cookie && !isn)) + st = af_ops->init_seq_and_ts_off (net, skb); +if (tmp_opt.tstamp_ok) {tcp_rsk (req)->req_usec_ts =dst_tcp_usec_ts (dst); -tcp_rsk (req)->ts_off = af_ops->init_ts_off (net, skb); +tcp_rsk (req)->ts_off = st.ts_off; }if (!want_cookie && !isn) {int max_syn_backlog =READ_ONCE (net->ipv4.sysctl_max_syn_backlog);
@@ -7478,7 +7482,7 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, goto drop_and_release; } - isn = af_ops->init_seq (skb); + isn = st.seq; }tcp_ecn_create_request (req, skb, sk, dst);
net/ipv4/tcp_ipv4.c +17 -20
@@ -104,17 +104,14 @@ static DEFINE_PER_CPU(struct sock_bh_locked, ipv4_tcp_sk) = {static DEFINE_MUTEX (tcp_exit_batch_mutex); -static u32 tcp_v4_init_seq (const struct sk_buff *skb) +static union tcp_seq_and_ts_off +tcp_v4_init_seq_and_ts_off (const struct net *net,const struct sk_buff *skb) { -return secure_tcp_seq (ip_hdr (skb)->daddr, -ip_hdr (skb)->saddr, -tcp_hdr (skb)->dest, -tcp_hdr (skb)->source); -} - -static u32 tcp_v4_init_ts_off (const struct net *net,const struct sk_buff *skb) -{ -return secure_tcp_ts_off (net,ip_hdr (skb)->daddr,ip_hdr (skb)->saddr); +return secure_tcp_seq_and_ts_off (net, +ip_hdr (skb)->daddr, +ip_hdr (skb)->saddr, +tcp_hdr (skb)->dest, +tcp_hdr (skb)->source); }int tcp_twsk_unique (struct sock *sk,struct sock *sktw,void *twp)
@@ -326,15 +323,16 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) rt =NULL ;if (likely (!tp->repair)) { +union tcp_seq_and_ts_off st; + + st =secure_tcp_seq_and_ts_off (net, + inet->inet_saddr, + inet->inet_daddr, + inet->inet_sport, + usin->sin_port);if (!tp->write_seq) -WRITE_ONCE (tp->write_seq, -secure_tcp_seq (inet->inet_saddr, - inet->inet_daddr, - inet->inet_sport, - usin->sin_port)); -WRITE_ONCE (tp->tsoffset, -secure_tcp_ts_off (net, inet->inet_saddr, - inet->inet_daddr)); +WRITE_ONCE (tp->write_seq, st.seq); +WRITE_ONCE (tp->tsoffset, st.ts_off); }atomic_set (&inet->inet_id,get_random_u16 ());
@@ -1727,8 +1725,7 @@ const struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = { .cookie_init_seq = cookie_v4_init_sequence, #endif .route_req = tcp_v4_route_req, - .init_seq = tcp_v4_init_seq, - .init_ts_off = tcp_v4_init_ts_off, + .init_seq_and_ts_off = tcp_v4_init_seq_and_ts_off, .send_synack = tcp_v4_send_synack, };
net/ipv6/syncookies.c +8 -3
@@ -151,9 +151,14 @@ static struct request_sock *cookie_tcp_check(struct net *net, struct sock *sk,tcp_parse_options (net, skb, &tcp_opt,0 ,NULL );if (tcp_opt.saw_tstamp && tcp_opt.rcv_tsecr) { - tsoff =secure_tcpv6_ts_off (net, -ipv6_hdr (skb)->daddr.s6_addr32, -ipv6_hdr (skb)->saddr.s6_addr32); +union tcp_seq_and_ts_off st; + + st =secure_tcpv6_seq_and_ts_off (net, +ipv6_hdr (skb)->daddr.s6_addr32, +ipv6_hdr (skb)->saddr.s6_addr32, +tcp_hdr (skb)->dest, +tcp_hdr (skb)->source); + tsoff = st.ts_off; tcp_opt.rcv_tsecr -= tsoff; }
net/ipv6/tcp_ipv6.c +17 -20
@@ -105,18 +105,14 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) } } -static u32 tcp_v6_init_seq (const struct sk_buff *skb) +static union tcp_seq_and_ts_off +tcp_v6_init_seq_and_ts_off (const struct net *net,const struct sk_buff *skb) { -return secure_tcpv6_seq (ipv6_hdr (skb)->daddr.s6_addr32, -ipv6_hdr (skb)->saddr.s6_addr32, -tcp_hdr (skb)->dest, -tcp_hdr (skb)->source); -} - -static u32 tcp_v6_init_ts_off (const struct net *net,const struct sk_buff *skb) -{ -return secure_tcpv6_ts_off (net,ipv6_hdr (skb)->daddr.s6_addr32, -ipv6_hdr (skb)->saddr.s6_addr32); +return secure_tcpv6_seq_and_ts_off (net, +ipv6_hdr (skb)->daddr.s6_addr32, +ipv6_hdr (skb)->saddr.s6_addr32, +tcp_hdr (skb)->dest, +tcp_hdr (skb)->source); } static int tcp_v6_pre_connect(struct sock *sk, struct sockaddr *uaddr,
@@ -319,14 +315,16 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,sk_set_txhash (sk);if (likely (!tp->repair)) { +union tcp_seq_and_ts_off st; + + st =secure_tcpv6_seq_and_ts_off (net, + np->saddr.s6_addr32, + sk->sk_v6_daddr.s6_addr32, + inet->inet_sport, + inet->inet_dport);if (!tp->write_seq) -WRITE_ONCE (tp->write_seq, -secure_tcpv6_seq (np->saddr.s6_addr32, - sk->sk_v6_daddr.s6_addr32, - inet->inet_sport, - inet->inet_dport)); - tp->tsoffset =secure_tcpv6_ts_off (net, np->saddr.s6_addr32, - sk->sk_v6_daddr.s6_addr32); +WRITE_ONCE (tp->write_seq, st.seq); + tp->tsoffset = st.ts_off; }if (tcp_fastopen_defer_connect (sk, &err))
@@ -859,8 +857,7 @@ const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = { .cookie_init_seq = cookie_v6_init_sequence, #endif .route_req = tcp_v6_route_req, - .init_seq = tcp_v6_init_seq, - .init_ts_off = tcp_v6_init_ts_off, + .init_seq_and_ts_off = tcp_v6_init_seq_and_ts_off, .send_synack = tcp_v6_send_synack, };
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 281/314 net: nfc: nci: Fix zero-length proprietary notifications
In reply to Sasha LevinFrom: Ian Ray <[email protected]>
[ Upstream commit f7d92f11bd33a6eb49c7c812255ef4ab13681f0f ]
NCI NFC controllers may have proprietary OIDs with zero-length payload. One example is: drivers/nfc/nxp-nci/core.c, NXP_NCI_RF_TXLDO_ERROR_NTF.
Allow a zero length payload in proprietary notifications *only*.
Before:
-- >8 --
kernel: nci: nci_recv_frame: len 3
-- >8 --
After:
-- >8 --
kernel: nci: nci_recv_frame: len 3
kernel: nci: nci_ntf_packet: NCI RX: MT=ntf, PBF=0, GID=0x1, OID=0x23, plen=0
kernel: nci: nci_ntf_packet: unknown ntf opcode 0x123
kernel: nfc nfc0: NFC: RF transmitter couldn't start. Bad power and/or configuration? -- >8 --
After fixing the hardware:
-- >8 --
kernel: nci: nci_recv_frame: len 27
kernel: nci: nci_ntf_packet: NCI RX: MT=ntf, PBF=0, GID=0x1, OID=0x5, plen=24
kernel: nci: nci_rf_intf_activated_ntf_packet: rf_discovery_id 1 -- >8 --
--- net/nfc/nci/core.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
net/nfc/nci/core.c +11 -1
@@ -1482,10 +1482,20 @@ static bool nci_valid_size(struct sk_buff *skb)unsigned int hdr_size =NCI_CTRL_HDR_SIZE ;if (skb->len < hdr_size || - !nci_plen (skb->data) || skb->len < hdr_size +nci_plen (skb->data)) {return false; } + +if (!nci_plen (skb->data)) { +/* Allow zero length in proprietary notifications (0x20 - 0x3F). */ +if (nci_opcode_oid (nci_opcode (skb->data)) >=0x20 && +nci_mt (skb->data) ==NCI_MT_NTF_PKT ) +return true; + +/* Disallow zero length otherwise. */ +return false; + } +return true; }
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 282/314 net_sched: sch_fq: clear q->band_pkt_count[] in fq_reset()
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit a4c2b8be2e5329e7fac6e8f64ddcb8958155cfcb ]
When/if a NIC resets, queues are deactivated by dev_deactivate_many(), then reactivated when the reset operation completes.
fq_reset() removes all the skbs from various queues.
If we do not clear q->band_pkt_count[], these counters keep growing and can eventually reach sch->limit, preventing new packets to be queued.
Many thanks to Praveen for discovering the root cause.
--- net/sched/sch_fq.c | 1 + 1 file changed, 1 insertion(+)
net/sched/sch_fq.c +1 -0
@@ -826,6 +826,7 @@ static void fq_reset(struct Qdisc *sch)for (idx =0 ; idx <FQ_BANDS ; idx++) { q->band_flows[idx].new_flows.first =NULL ; q->band_flows[idx].old_flows.first =NULL ; + q->band_pkt_count[idx] =0 ; } q->delayed =RB_ROOT ; q->flows =0 ;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 283/314 net: devmem: use READ_ONCE/WRITE_ONCE on binding->dev
In reply to Sasha LevinFrom: Bobby Eshleman <[email protected]>
[ Upstream commit 40bf00ec2ee271df5ba67593991760adf8b5d0ed ]
binding->dev is protected on the write-side in mp_dmabuf_devmem_uninstall() against concurrent writes, but due to the concurrent bare reads in net_devmem_get_binding() and validate_xmit_unreadable_skb() it should be wrapped in a READ_ONCE/WRITE_ONCE pair to make sure no compiler optimizations play with the underlying register in unforeseen ways.
Doesn't present a critical bug because the known compiler optimizations don't result in bad behavior. There is no tearing on u64, and load omissions/invented loads would only break if additional binding->dev references were inlined together (they aren't right now).
This just more strictly follows the linux memory model (i.e., "Lock-Protected Writes With Lockless Reads" in tools/memory-model/Documentation/access-marking.txt).
--- net/core/dev.c | 2 +- net/core/devmem.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
net/core/dev.c +1 -1
@@ -3975,7 +3975,7 @@ static struct sk_buff *validate_xmit_unreadable_skb(struct sk_buff *skb,if (shinfo->nr_frags >0 ) { niov =netmem_to_net_iov (skb_frag_netmem (&shinfo->frags[0 ]));if (net_is_devmem_iov (niov) && -net_devmem_iov_binding (niov)->dev != dev) +READ_ONCE (net_devmem_iov_binding (niov)->dev) != dev) goto out_free; }
net/core/devmem.c +4 -2
@@ -387,7 +387,8 @@ struct net_devmem_dmabuf_binding *net_devmem_get_binding(struct sock *sk,* net_device. */ dst_dev =dst_dev_rcu (dst); -if (unlikely (!dst_dev) ||unlikely (dst_dev != binding->dev)) { +if (unlikely (!dst_dev) || +unlikely (dst_dev !=READ_ONCE (binding->dev))) { err = -ENODEV ; goto out_unlock; }
@@ -504,7 +505,8 @@ static void mp_dmabuf_devmem_uninstall(void *mp_priv,xa_erase (&binding->bound_rxqs, xa_idx);if (xa_empty (&binding->bound_rxqs)) {mutex_lock (&binding->lock); - binding->dev =NULL ; +ASSERT_EXCLUSIVE_WRITER (binding->dev); +WRITE_ONCE (binding->dev,NULL );mutex_unlock (&binding->lock); }break ;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 284/314 nfc: nci: free skb on nci_transceive early error paths
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 7bd4b0c4779f978a6528c9b7937d2ca18e936e2c ]
nci_transceive() takes ownership of the skb passed by the caller, but the -EPROTO, -EINVAL, and -EBUSY error paths return without freeing it.
Due to issues clearing NCI_DATA_EXCHANGE fixed by subsequent changes the nci/nci_dev selftest hits the error path occasionally in NIPA, and kmemleak detects leaks:
unreferenced object 0xff11000015ce6a40 (size 640):
comm "nci_dev", pid 3954, jiffies 4295441246
hex dump (first 32 bytes):
6b 6b 6b 6b 00 a4 00 0c 02 e1 03 6b 6b 6b 6b 6b kkkk.......kkkkk 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
backtrace (crc 7c40cc2a):
kmem_cache_alloc_node_noprof+0x492/0x630
__alloc_skb+0x11e/0x5f0
alloc_skb_with_frags+0xc6/0x8f0
sock_alloc_send_pskb+0x326/0x3f0
nfc_alloc_send_skb+0x94/0x1d0
rawsock_sendmsg+0x162/0x4c0
do_syscall_64+0x117/0xfc0--- net/nfc/nci/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/nfc/nci/core.c +7 -2
@@ -1035,18 +1035,23 @@ static int nci_transceive(struct nfc_dev *nfc_dev, struct nfc_target *target,struct nci_conn_info *conn_info; conn_info = ndev->rf_conn_info; -if (!conn_info) +if (!conn_info) { +kfree_skb (skb);return -EPROTO ; + }pr_debug ("target_idx %d, len %d\n" , target->idx, skb->len);if (!ndev->target_active_prot) {pr_err ("unable to exchange data, no active target\n" ); +kfree_skb (skb);return -EINVAL ; } -if (test_and_set_bit (NCI_DATA_EXCHANGE , &ndev->flags)) +if (test_and_set_bit (NCI_DATA_EXCHANGE , &ndev->flags)) { +kfree_skb (skb);return -EBUSY ; + }/* store cb and context to be used on receiving data */ conn_info->data_exchange_cb = cb;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 285/314 nfc: nci: complete pending data exchange on device close
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 66083581945bd5b8e99fe49b5aeb83d03f62d053 ]
In nci_close_device(), complete any pending data exchange before closing. The data exchange callback (e.g. rawsock_data_exchange_complete) holds a socket reference.
NIPA occasionally hits this leak:
unreferenced object 0xff1100000f435000 (size 2048):
comm "nci_dev", pid 3954, jiffies 4295441245 hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
27 00 01 40 00 00 00 00 00 00 00 00 00 00 00 00 '..@............
backtrace (crc ec2b3c5):
__kmalloc_noprof+0x4db/0x730
sk_prot_alloc.isra.0+0xe4/0x1d0
sk_alloc+0x36/0x760
rawsock_create+0xd1/0x540
nfc_sock_create+0x11f/0x280
__sock_create+0x22d/0x630
__sys_socket+0x115/0x1d0
__x64_sys_socket+0x72/0xd0
do_syscall_64+0x117/0xfc0
entry_SYSCALL_64_after_hwframe+0x4b/0x53--- net/nfc/nci/core.c | 9 +++++++++ 1 file changed, 9 insertions(+)
net/nfc/nci/core.c +9 -0
@@ -567,6 +567,10 @@ static int nci_close_device(struct nci_dev *ndev)flush_workqueue (ndev->cmd_wq);timer_delete_sync (&ndev->cmd_timer);timer_delete_sync (&ndev->data_timer); +if (test_bit (NCI_DATA_EXCHANGE , &ndev->flags)) +nci_data_exchange_complete (ndev,NULL , + ndev->cur_conn_id, + -ENODEV );mutex_unlock (&ndev->req_lock);return 0 ; }
@@ -598,6 +602,11 @@ static int nci_close_device(struct nci_dev *ndev)flush_workqueue (ndev->cmd_wq);timer_delete_sync (&ndev->cmd_timer); +timer_delete_sync (&ndev->data_timer); + +if (test_bit (NCI_DATA_EXCHANGE , &ndev->flags)) +nci_data_exchange_complete (ndev,NULL , ndev->cur_conn_id, + -ENODEV );/* Clear flags except NCI_UNREG */ ndev->flags &=BIT (NCI_UNREG );
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 286/314 nfc: nci: clear NCI_DATA_EXCHANGE before calling completion callback
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 0efdc02f4f6d52f8ca5d5889560f325a836ce0a8 ]
Move clear_bit(NCI_DATA_EXCHANGE) before invoking the data exchange callback in nci_data_exchange_complete().
The callback (e.g. rawsock_data_exchange_complete) may immediately schedule another data exchange via schedule_work(tx_work). On a multi-CPU system, tx_work can run and reach nci_transceive() before the current nci_data_exchange_complete() clears the flag, causing test_and_set_bit(NCI_DATA_EXCHANGE) to return -EBUSY and the new transfer to fail.
This causes intermittent flakes in nci/nci_dev in NIPA:
# # RUN NCI.NCI1_0.t4t_tag_read ...
# # t4t_tag_read: Test terminated by timeout
# # FAIL NCI.NCI1_0.t4t_tag_read
# not ok 3 NCI.NCI1_0.t4t_tag_read
--- net/nfc/nci/data.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/nfc/nci/data.c +8 -4
@@ -33,7 +33,8 @@ void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb, conn_info =nci_get_conn_info_by_conn_id (ndev, conn_id);if (!conn_info) {kfree_skb (skb); - goto exit; +clear_bit (NCI_DATA_EXCHANGE , &ndev->flags); +return ; } cb = conn_info->data_exchange_cb;
@@ -45,6 +46,12 @@ void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb,timer_delete_sync (&ndev->data_timer);clear_bit (NCI_DATA_EXCHANGE_TO , &ndev->flags); +/* Mark the exchange as done before calling the callback. +* The callback (e.g. rawsock_data_exchange_complete) may +* want to immediately queue another data exchange. +*/ +clear_bit (NCI_DATA_EXCHANGE , &ndev->flags); +if (cb) {/* forward skb to nfc core */ cb (cb_context, skb, err);
@@ -54,9 +61,6 @@ void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb,/* no waiting callback, free skb */ kfree_skb (skb); } - -exit: -clear_bit (NCI_DATA_EXCHANGE , &ndev->flags); }/* ----------------- NCI TX Data ----------------- */
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 287/314 nfc: rawsock: cancel tx_work before socket teardown
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit d793458c45df2aed498d7f74145eab7ee22d25aa ]
In rawsock_release(), cancel any pending tx_work and purge the write queue before orphaning the socket. rawsock_tx_work runs on the system workqueue and calls nfc_data_exchange which dereferences the NCI device. Without synchronization, tx_work can race with socket and device teardown when a process is killed (e.g. by SIGKILL), leading to use-after-free or leaked references.
Set SEND_SHUTDOWN first so that if tx_work is already running it will see the flag and skip transmitting, then use cancel_work_sync to wait for any in-progress execution to finish, and finally purge any remaining queued skbs.
--- net/nfc/rawsock.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
net/nfc/rawsock.c +11 -0
@@ -67,6 +67,17 @@ static int rawsock_release(struct socket *sock)if (sock->type ==SOCK_RAW )nfc_sock_unlink (&raw_sk_list, sk); +if (sk->sk_state ==TCP_ESTABLISHED ) { +/* Prevent rawsock_tx_work from starting new transmits and +* wait for any in-progress work to finish. This must happen +* before the socket is orphaned to avoid a race where +* rawsock_tx_work runs after the NCI device has been freed. +*/ + sk->sk_shutdown |=SEND_SHUTDOWN ; +cancel_work_sync (&nfc_rawsock (sk)->tx_work); +rawsock_write_queue_purge (sk); + } +sock_orphan (sk);sock_put (sk);
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 288/314 net: stmmac: Fix error handling in VLAN add and delete paths
In reply to Sasha LevinFrom: Ovidiu Panait <[email protected]>
[ Upstream commit 35dfedce442c4060cfe5b98368bc9643fb995716 ]
stmmac_vlan_rx_add_vid() updates active_vlans and the VLAN hash register before writing the HW filter entry. If the filter write fails, it leaves a stale VID in active_vlans and the hash register.
stmmac_vlan_rx_kill_vid() has the reverse problem: it clears active_vlans before removing the HW filter. On failure, the VID is gone from active_vlans but still present in the HW filter table.
To fix this, reorder the operations to update the hash table first, then attempt the HW filter operation. If the HW filter fails, roll back both the active_vlans bitmap and the hash table by calling stmmac_vlan_update() again.
--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +14 -4
@@ -6603,9 +6603,13 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vidif (priv->hw->num_vlan) { ret =stmmac_add_hw_vlan_rx_fltr (priv, ndev, priv->hw, proto, vid); -if (ret) +if (ret) { +clear_bit (vid, priv->active_vlans); +stmmac_vlan_update (priv, is_double); goto err_pm_put; + } } + err_pm_put:pm_runtime_put (priv->device);
@@ -6629,15 +6633,21 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi is_double = true;clear_bit (vid, priv->active_vlans); + ret =stmmac_vlan_update (priv, is_double); +if (ret) { +set_bit (vid, priv->active_vlans); + goto del_vlan_error; + }if (priv->hw->num_vlan) { ret =stmmac_del_hw_vlan_rx_fltr (priv, ndev, priv->hw, proto, vid); -if (ret) +if (ret) { +set_bit (vid, priv->active_vlans); +stmmac_vlan_update (priv, is_double); goto del_vlan_error; + } } - ret =stmmac_vlan_update (priv, is_double); - del_vlan_error:pm_runtime_put (priv->device);
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 289/314 net: stmmac: Improve double VLAN handling
In reply to Sasha LevinFrom: Ovidiu Panait <[email protected]>
[ Upstream commit e38200e361cbe331806dc454c76c11c7cd95e1b9 ]
The double VLAN bits (EDVLP, ESVL, DOVLTC) are handled inconsistently between the two vlan_update_hash() implementations:
- dwxgmac2_update_vlan_hash() explicitly clears the double VLAN bits when is_double is false, meaning that adding a 802.1Q VLAN will disable double VLAN mode:
$ ip link add link eth0 name eth0.200 type vlan id 200 protocol 802.1ad $ ip link add link eth0 name eth0.100 type vlan id 100 # Double VLAN bits no longer set
- vlan_update_hash() sets these bits and only clears them when the last VLAN has been removed, so double VLAN mode remains enabled even after all 802.1AD VLANs are removed.
Address both issues by tracking the number of active 802.1AD VLANs in priv->num_double_vlans. Pass this count to stmmac_vlan_update() so both implementations correctly set the double VLAN bits when any 802.1AD VLAN is active, and clear them only when none remain.
Also update vlan_update_hash() to explicitly clear the double VLAN bits when is_double is false, matching the dwxgmac2 behavior.
Stable-dep-of: 2cd70e3968f5 ("net: stmmac: Defer VLAN HW configuration when interface is down")
--- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 16 ++++++++++++---- .../net/ethernet/stmicro/stmmac/stmmac_vlan.c | 8 ++++++++ 3 files changed, 21 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac.h +1 -0
@@ -316,6 +316,7 @@ struct stmmac_priv {void __iomem *ptpaddr;void __iomem *estaddr;unsigned long active_vlans[BITS_TO_LONGS (VLAN_N_VID )]; +unsigned int num_double_vlans;int sfty_irq;int sfty_ce_irq;int sfty_ue_irq;
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +12 -4
@@ -6584,6 +6584,7 @@ static int stmmac_vlan_update(struct stmmac_priv *priv, bool is_double)static int stmmac_vlan_rx_add_vid (struct net_device *ndev,__be16 proto,u16 vid) {struct stmmac_priv *priv =netdev_priv (ndev); +unsigned int num_double_vlans;bool is_double = false;int ret;
@@ -6595,7 +6596,8 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid is_double = true;set_bit (vid, priv->active_vlans); - ret =stmmac_vlan_update (priv, is_double); + num_double_vlans = priv->num_double_vlans + is_double; + ret =stmmac_vlan_update (priv, num_double_vlans);if (ret) {clear_bit (vid, priv->active_vlans); goto err_pm_put;
@@ -6605,11 +6607,13 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid ret =stmmac_add_hw_vlan_rx_fltr (priv, ndev, priv->hw, proto, vid);if (ret) {clear_bit (vid, priv->active_vlans); -stmmac_vlan_update (priv, is_double); +stmmac_vlan_update (priv, priv->num_double_vlans); goto err_pm_put; } } + priv->num_double_vlans = num_double_vlans; + err_pm_put:pm_runtime_put (priv->device);
@@ -6622,6 +6626,7 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vidstatic int stmmac_vlan_rx_kill_vid (struct net_device *ndev,__be16 proto,u16 vid) {struct stmmac_priv *priv =netdev_priv (ndev); +unsigned int num_double_vlans;bool is_double = false;int ret;
@@ -6633,7 +6638,8 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi is_double = true;clear_bit (vid, priv->active_vlans); - ret =stmmac_vlan_update (priv, is_double); + num_double_vlans = priv->num_double_vlans - is_double; + ret =stmmac_vlan_update (priv, num_double_vlans);if (ret) {set_bit (vid, priv->active_vlans); goto del_vlan_error;
@@ -6643,11 +6649,13 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi ret =stmmac_del_hw_vlan_rx_fltr (priv, ndev, priv->hw, proto, vid);if (ret) {set_bit (vid, priv->active_vlans); -stmmac_vlan_update (priv, is_double); +stmmac_vlan_update (priv, priv->num_double_vlans); goto del_vlan_error; } } + priv->num_double_vlans = num_double_vlans; + del_vlan_error:pm_runtime_put (priv->device);
drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c +8 -0
@@ -183,6 +183,10 @@ static void vlan_update_hash(struct mac_device_info *hw, u32 hash, value |=VLAN_EDVLP ; value |=VLAN_ESVL ; value |=VLAN_DOVLTC ; + }else { + value &= ~VLAN_EDVLP ; + value &= ~VLAN_ESVL ; + value &= ~VLAN_DOVLTC ; }writel (value, ioaddr +VLAN_TAG );
@@ -193,6 +197,10 @@ static void vlan_update_hash(struct mac_device_info *hw, u32 hash, value |=VLAN_EDVLP ; value |=VLAN_ESVL ; value |=VLAN_DOVLTC ; + }else { + value &= ~VLAN_EDVLP ; + value &= ~VLAN_ESVL ; + value &= ~VLAN_DOVLTC ; }writel (value | perfect_match, ioaddr +VLAN_TAG );
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 290/314 net: stmmac: Fix VLAN HW state restore
In reply to Sasha LevinFrom: Ovidiu Panait <[email protected]>
[ Upstream commit bd7ad51253a76fb35886d01cfe9a37f0e4ed6709 ]
When the network interface is opened or resumed, a DMA reset is performed, which resets all hardware state, including VLAN state. Currently, only the resume path is restoring the VLAN state via stmmac_restore_hw_vlan_rx_fltr(), but that is incomplete: the VLAN hash table and the VLAN_TAG control bits are not restored.
Therefore, add stmmac_vlan_restore(), which restores the full VLAN state by updating both the HW filter entries and the hash table, and call it from both the open and resume paths.
The VLAN restore is moved outside of phylink_rx_clk_stop_block/unblock in the resume path because receive clock stop is already disabled when stmmac supports VLAN.
Also, remove the hash readback code in vlan_restore_hw_rx_fltr() that attempts to restore VTHM by reading VLAN_HASH_TABLE, as it always reads zero after DMA reset, making it dead code.
Stable-dep-of: 2cd70e3968f5 ("net: stmmac: Defer VLAN HW configuration when interface is down")
--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 24 +++++++++++++++++-- .../net/ethernet/stmicro/stmmac/stmmac_vlan.c | 10 -------- 2 files changed, 22 insertions(+), 12 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +22 -2
@@ -139,6 +139,7 @@ static void stmmac_tx_timer_arm(struct stmmac_priv *priv, u32 queue);static void stmmac_flush_tx_descriptors (struct stmmac_priv *priv,int queue);static void stmmac_set_dma_operation_mode (struct stmmac_priv *priv,u32 txmode,u32 rxmode,u32 chan); +static int stmmac_vlan_restore (struct stmmac_priv *priv);#ifdef CONFIG_DEBUG_FS static const struct net_device_ops stmmac_netdev_ops;
@@ -3932,6 +3933,8 @@ static int __stmmac_open(struct net_device *dev,/* We may have called phylink_speed_down before */ phylink_speed_up (priv->phylink); +stmmac_vlan_restore (priv); + ret =stmmac_request_irq (dev);if (ret) goto irq_error;
@@ -6662,6 +6665,23 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vireturn ret; } +static int stmmac_vlan_restore (struct stmmac_priv *priv) +{ +int ret; + +if (!(priv->dev->features &NETIF_F_VLAN_FEATURES )) +return 0 ; + +if (priv->hw->num_vlan) +stmmac_restore_hw_vlan_rx_fltr (priv, priv->dev, priv->hw); + + ret =stmmac_vlan_update (priv, priv->num_double_vlans); +if (ret) +netdev_err (priv->dev,"Failed to restore VLANs\n" ); + +return ret; +} +static int stmmac_bpf (struct net_device *dev,struct netdev_bpf *bpf) {struct stmmac_priv *priv =netdev_priv (dev);
@@ -7895,10 +7915,10 @@ int stmmac_resume(struct device *dev)stmmac_init_coalesce (priv);phylink_rx_clk_stop_block (priv->phylink);stmmac_set_rx_mode (ndev); - -stmmac_restore_hw_vlan_rx_fltr (priv, ndev, priv->hw);phylink_rx_clk_stop_unblock (priv->phylink); +stmmac_vlan_restore (priv); +stmmac_enable_all_queues (priv);stmmac_enable_all_dma_irq (priv);
drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c +0 -10
@@ -139,9 +139,6 @@ static int vlan_del_hw_rx_fltr(struct net_device *dev,static void vlan_restore_hw_rx_fltr (struct net_device *dev,struct mac_device_info *hw) { -void __iomem *ioaddr = hw->pcsr; -u32 value; -u32 hash;u32 val;int i;
@@ -158,13 +155,6 @@ static void vlan_restore_hw_rx_fltr(struct net_device *dev,vlan_write_filter (dev, hw, i, val); } } - - hash =readl (ioaddr +VLAN_HASH_TABLE ); -if (hash &VLAN_VLHT ) { - value =readl (ioaddr +VLAN_TAG ); - value |=VLAN_VTHM ; -writel (value, ioaddr +VLAN_TAG ); - } } static void vlan_update_hash(struct mac_device_info *hw, u32 hash,
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 291/314 net: stmmac: Defer VLAN HW configuration when interface is down
In reply to Sasha LevinFrom: Ovidiu Panait <[email protected]>
[ Upstream commit 2cd70e3968f505996d5fefdf7ca684f0f4575734 ]
VLAN register accesses on the MAC side require the PHY RX clock to be active. When the network interface is down, the PHY is suspended and the RX clock is unavailable, causing VLAN operations to fail with timeouts.
The VLAN core automatically removes VID 0 after the interface goes down and re-adds it when it comes back up, so these timeouts happen during normal interface down/up:
# ip link set end1 down
renesas-gbeth 15c40000.ethernet end1: Timeout accessing MAC_VLAN_Tag_Filter
renesas-gbeth 15c40000.ethernet end1: failed to kill vid 0081/0Adding VLANs while the interface is down also fails:
# ip link add link end1 name end1.10 type vlan id 10
renesas-gbeth 15c40000.ethernet end1: Timeout accessing MAC_VLAN_Tag_Filter
RTNETLINK answers: Device or resource busyTo fix this, check if the interface is up before accessing VLAN registers. The software state is always kept up to date regardless of interface state.
When the interface is brought up, stmmac_vlan_restore() is called to write the VLAN state to hardware.
--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 3 ++ .../net/ethernet/stmicro/stmmac/stmmac_vlan.c | 42 ++++++++++--------- 2 files changed, 26 insertions(+), 19 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -0
@@ -6578,6 +6578,9 @@ static int stmmac_vlan_update(struct stmmac_priv *priv, bool is_double) hash =0 ; } +if (!netif_running (priv->dev)) +return 0 ; +return stmmac_update_vlan_hash (priv, priv->hw, hash, pmatch, is_double); }
drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c +23 -19
83 lines not on this page · raw message
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 292/314 block: use trylock to avoid lockdep circular dependency in sysfs
In reply to Sasha LevinFrom: Ming Lei <[email protected]>
[ Upstream commit ce8ee8583ed83122405eabaa8fb351be4d9dc65c ]
Use trylock instead of blocking lock acquisition for update_nr_hwq_lock in queue_requests_store() and elv_iosched_store() to avoid circular lock dependency with kernfs active reference during concurrent disk deletion:
update_nr_hwq_lock -> kn->active (via del_gendisk -> kobject_del) kn->active -> update_nr_hwq_lock (via sysfs write path)
Return -EBUSY when the lock is not immediately available.
--- block/blk-sysfs.c | 8 +++++++- block/elevator.c | 12 +++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-)
block/blk-sysfs.c +7 -1
@@ -78,8 +78,14 @@ queue_requests_store(struct gendisk *disk, const char *page, size_t count)/* * Serialize updating nr_requests with concurrent queue_requests_store() * and switching elevator. +* +* Use trylock to avoid circular lock dependency with kernfs active +* reference during concurrent disk deletion: +* update_nr_hwq_lock -> kn->active (via del_gendisk -> kobject_del) +* kn->active -> update_nr_hwq_lock (via this sysfs write path) */ -down_write (&set->update_nr_hwq_lock); +if (!down_write_trylock (&set->update_nr_hwq_lock)) +return -EBUSY ;if (nr == q->nr_requests) goto unlock;
block/elevator.c +11 -1
@@ -806,7 +806,16 @@ ssize_t elv_iosched_store(struct gendisk *disk, const char *buf,elv_iosched_load_module (ctx.name); ctx.type =elevator_find_get (ctx.name); -down_read (&set->update_nr_hwq_lock); +/* +* Use trylock to avoid circular lock dependency with kernfs active +* reference during concurrent disk deletion: +* update_nr_hwq_lock -> kn->active (via del_gendisk -> kobject_del) +* kn->active -> update_nr_hwq_lock (via this sysfs write path) +*/ +if (!down_read_trylock (&set->update_nr_hwq_lock)) { + ret = -EBUSY ; + goto out; + }if (!blk_queue_no_elv_switch (q)) { ret =elevator_change (q, &ctx);if (!ret)
@@ -816,6 +825,7 @@ ssize_t elv_iosched_store(struct gendisk *disk, const char *buf, }up_read (&set->update_nr_hwq_lock); +out:if (ctx.type)elevator_put (ctx.type);return ret;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 293/314 net: Provide a PREEMPT_RT specific check for netdev_queue::_xmit_lock
In reply to Sasha LevinFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit b824c3e16c1904bf80df489e293d1e3cbf98896d ]
After acquiring netdev_queue::_xmit_lock the number of the CPU owning the lock is recorded in netdev_queue::xmit_lock_owner. This works as long as the BH context is not preemptible.
On PREEMPT_RT the softirq context is preemptible and without the softirq-lock it is possible to have multiple user in __dev_queue_xmit() submitting a skb on the same CPU. This is fine in general but this means also that the current CPU is recorded as netdev_queue::xmit_lock_owner. This in turn leads to the recursion alert and the skb is dropped.
Instead checking the for CPU number, that owns the lock, PREEMPT_RT can check if the lockowner matches the current task.
Add netif_tx_owned() which returns true if the current context owns the lock by comparing the provided CPU number with the recorded number. This resembles the current check by negating the condition (the current check returns true if the lock is not owned).
On PREEMPT_RT use rt_mutex_owner() to return the lock owner and compare the current task against it.
Use the new helper in __dev_queue_xmit() and netif_local_xmit_active() which provides a similar check.
Update comments regarding pairing READ_ONCE().
--- include/linux/netdevice.h | 27 ++++++++++++++++++++++----- net/core/dev.c | 5 +---- net/core/netpoll.c | 2 +- 3 files changed, 24 insertions(+), 10 deletions(-)
include/linux/netdevice.h +22 -5
@@ -4684,7 +4684,7 @@ static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits)static inline void __netif_tx_lock (struct netdev_queue *txq,int cpu) {spin_lock (&txq->_xmit_lock); -/* Pairs with READ_ONCE() in __dev_queue_xmit() */ +/* Pairs with READ_ONCE() in netif_tx_owned() */ WRITE_ONCE (txq->xmit_lock_owner, cpu); }
@@ -4702,7 +4702,7 @@ static inline void __netif_tx_release(struct netdev_queue *txq)static inline void __netif_tx_lock_bh (struct netdev_queue *txq) {spin_lock_bh (&txq->_xmit_lock); -/* Pairs with READ_ONCE() in __dev_queue_xmit() */ +/* Pairs with READ_ONCE() in netif_tx_owned() */ WRITE_ONCE (txq->xmit_lock_owner,smp_processor_id ()); }
@@ -4711,7 +4711,7 @@ static inline bool __netif_tx_trylock(struct netdev_queue *txq)bool ok =spin_trylock (&txq->_xmit_lock);if (likely (ok)) { -/* Pairs with READ_ONCE() in __dev_queue_xmit() */ +/* Pairs with READ_ONCE() in netif_tx_owned() */ WRITE_ONCE (txq->xmit_lock_owner,smp_processor_id ()); }return ok;
@@ -4719,14 +4719,14 @@ static inline bool __netif_tx_trylock(struct netdev_queue *txq)static inline void __netif_tx_unlock (struct netdev_queue *txq) { -/* Pairs with READ_ONCE() in __dev_queue_xmit() */ +/* Pairs with READ_ONCE() in netif_tx_owned() */ WRITE_ONCE (txq->xmit_lock_owner,-1 );spin_unlock (&txq->_xmit_lock); }static inline void __netif_tx_unlock_bh (struct netdev_queue *txq) { -/* Pairs with READ_ONCE() in __dev_queue_xmit() */ +/* Pairs with READ_ONCE() in netif_tx_owned() */ WRITE_ONCE (txq->xmit_lock_owner,-1 );spin_unlock_bh (&txq->_xmit_lock); }
@@ -4819,6 +4819,23 @@ static inline void netif_tx_disable(struct net_device *dev)local_bh_enable (); } +#ifndef CONFIG_PREEMPT_RT +static inline bool netif_tx_owned (struct netdev_queue *txq,unsigned int cpu) +{ +/* Other cpus might concurrently change txq->xmit_lock_owner +* to -1 or to their cpu id, but not to our id. +*/ +return READ_ONCE (txq->xmit_lock_owner) == cpu; +} + +#else +static inline bool netif_tx_owned (struct netdev_queue *txq,unsigned int cpu) +{ +return rt_mutex_owner (&txq->_xmit_lock.lock) == current; +} + +#endif +static inline void netif_addr_lock (struct net_device *dev) {unsigned char nest_level =0 ;
net/core/dev.c +1 -4
@@ -4758,10 +4758,7 @@ int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev)if (dev->flags &IFF_UP ) {int cpu =smp_processor_id ();/* ok because BHs are off */ -/* Other cpus might concurrently change txq->xmit_lock_owner -* to -1 or to their cpu id, but not to our id. -*/ -if (READ_ONCE (txq->xmit_lock_owner) != cpu) { +if (!netif_tx_owned (txq, cpu)) {bool is_list = false;if (dev_xmit_recursion ())
net/core/netpoll.c +1 -1
@@ -132,7 +132,7 @@ static int netif_local_xmit_active(struct net_device *dev)for (i =0 ; i < dev->num_tx_queues; i++) {struct netdev_queue *txq =netdev_get_tx_queue (dev, i); -if (READ_ONCE (txq->xmit_lock_owner) ==smp_processor_id ()) +if (netif_tx_owned (txq,smp_processor_id ()))return 1 ; }
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 294/314 netfilter: nf_tables: unconditionally bump set->nelems before insertion
In reply to Sasha LevinFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit def602e498a4f951da95c95b1b8ce8ae68aa733a ]
In case that the set is full, a new element gets published then removed without waiting for the RCU grace period, while RCU reader can be walking over it already.
To address this issue, add the element transaction even if set is full, but toggle the set_full flag to report -ENFILE so the abort path safely unwinds the set to its previous state.
As for element updates, decrement set->nelems to restore it.
A simpler fix is to call synchronize_rcu() in the error path. However, with a large batch adding elements to already maxed-out set, this could cause noticeable slowdown of such batches.
--- net/netfilter/nf_tables_api.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
net/netfilter/nf_tables_api.c +16 -14
@@ -7288,6 +7288,7 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,struct nft_data_desc desc;enum nft_registers dreg;struct nft_trans *trans; +bool set_full = false;u64 expiration;u64 timeout;int err, i;
@@ -7574,10 +7575,18 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,if (err <0 ) goto err_elem_free; +if (!(flags &NFT_SET_ELEM_CATCHALL )) { +unsigned int max =nft_set_maxsize (set), nelems; + + nelems =atomic_inc_return (&set->nelems); +if (nelems > max) + set_full = true; + } + trans =nft_trans_elem_alloc (ctx,NFT_MSG_NEWSETELEM , set);if (trans ==NULL ) { err = -ENOMEM ; - goto err_elem_free; + goto err_set_size; } ext->genmask =nft_genmask_cur (ctx->net);
@@ -7629,7 +7638,7 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set, ue->priv = elem_priv;nft_trans_commit_list_add_elem (ctx->net, trans); - goto err_elem_free; + goto err_set_size; } } }
@@ -7647,23 +7656,16 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set, goto err_element_clash; } -if (!(flags &NFT_SET_ELEM_CATCHALL )) { -unsigned int max =nft_set_maxsize (set); - -if (!atomic_add_unless (&set->nelems,1 , max)) { - err = -ENFILE ; - goto err_set_full; - } - } -nft_trans_container_elem (trans)->elems[0 ].priv = elem.priv;nft_trans_commit_list_add_elem (ctx->net, trans); -return 0 ; -err_set_full: -nft_setelem_remove (ctx->net, set, elem.priv); +return set_full ? -ENFILE :0 ; + err_element_clash:kfree (trans); +err_set_size: +if (!(flags &NFT_SET_ELEM_CATCHALL )) +atomic_dec (&set->nelems); err_elem_free:nf_tables_set_elem_destroy (ctx, set, elem.priv); err_parse_data:
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 295/314 netfilter: nf_tables: clone set on flush only
In reply to Sasha LevinFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit fb7fb4016300ac622c964069e286dc83166a5d52 ]
Syzbot with fault injection triggered a failing memory allocation with GFP_KERNEL which results in a WARN splat:
iter.err
WARNING: net/netfilter/nf_tables_api.c:845 at nft_map_deactivate+0x34e/0x3c0 net/netfilter/nf_tables_api.c:845, CPU#0: syz.0.17/5992 Modules linked in: CPU: 0 UID: 0 PID: 5992 Comm: syz.0.17 Not tainted syzkaller #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 02/12/2026 RIP: 0010:nft_map_deactivate+0x34e/0x3c0 net/netfilter/nf_tables_api.c:845 Code: 8b 05 86 5a 4e 09 48 3b 84 24 a0 00 00 00 75 62 48 8d 65 d8 5b 41 5c 41 5d 41 5e 41 5f 5d c3 cc cc cc cc cc e8 63 6d fa f7 90 <0f> 0b 90 43 +80 7c 35 00 00 0f 85 23 fe ff ff e9 26 fe ff ff 89 d9 RSP: 0018:ffffc900045af780 EFLAGS: 00010293 RAX: ffffffff89ca45bd RBX: 00000000fffffff4 RCX: ffff888028111e40 RDX: 0000000000000000 RSI: 00000000fffffff4 RDI: 0000000000000000 RBP: ffffc900045af870 R08: 0000000000400dc0 R09: 00000000ffffffff R10: dffffc0000000000 R11: fffffbfff1d141db R12: ffffc900045af7e0 R13: 1ffff920008b5f24 R14: dffffc0000000000 R15: ffffc900045af920 FS: 000055557a6a5500(0000) GS:ffff888125496000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fb5ea271fc0 CR3: 000000003269e000 CR4: 00000000003526f0 Call Trace: <TASK> __nft_release_table+0xceb/0x11f0 net/netfilter/nf_tables_api.c:12115 nft_rcv_nl_event+0xc25/0xdb0 net/netfilter/nf_tables_api.c:12187 notifier_call_chain+0x19d/0x3a0 kernel/notifier.c:85 blocking_notifier_call_chain+0x6a/0x90 kernel/notifier.c:380 netlink_release+0x123b/0x1ad0 net/netlink/af_netlink.c:761 __sock_release net/socket.c:662 [inline] sock_close+0xc3/0x240 net/socket.c:1455
Restrict set clone to the flush set command in the preparation phase. Add NFT_ITER_UPDATE_CLONE and use it for this purpose, update the rbtree and pipapo backends to only clone the set when this iteration type is used.
As for the existing NFT_ITER_UPDATE type, update the pipapo backend to use the existing set clone if available, otherwise use the existing set representation. After this update, there is no need to clone a set that is being deleted, this includes bound anonymous set.
An alternative approach to NFT_ITER_UPDATE_CLONE is to add a .clone interface and call it from the flush set path.
--- include/net/netfilter/nf_tables.h | 2 ++ net/netfilter/nf_tables_api.c | 10 +++++++++- net/netfilter/nft_set_hash.c | 1 + net/netfilter/nft_set_pipapo.c | 11 +++++++++-- net/netfilter/nft_set_rbtree.c | 8 +++++--- 5 files changed, 26 insertions(+), 6 deletions(-)
include/net/netfilter/nf_tables.h +2 -0
@@ -317,11 +317,13 @@ static inline void *nft_elem_priv_cast(const struct nft_elem_priv *priv)* @NFT_ITER_UNSPEC: unspecified, to catch errors * @NFT_ITER_READ: read-only iteration over set elements * @NFT_ITER_UPDATE: iteration under mutex to update set element state +* @NFT_ITER_UPDATE_CLONE: clone set before iteration under mutex to update element */ enum nft_iter_type {NFT_ITER_UNSPEC ,NFT_ITER_READ ,NFT_ITER_UPDATE , +NFT_ITER_UPDATE_CLONE , };struct nft_set ;
net/netfilter/nf_tables_api.c +9 -1
@@ -832,6 +832,11 @@ static void nft_map_catchall_deactivate(const struct nft_ctx *ctx, } } +/* Use NFT_ITER_UPDATE iterator even if this may be called from the preparation +* phase, the set clone might already exist from a previous command, or it might +* be a set that is going away and does not require a clone. The netns and +* netlink release paths also need to work on the live set. +*/ static void nft_map_deactivate (const struct nft_ctx *ctx,struct nft_set *set) {struct nft_set_iter iter = {
@@ -8010,9 +8015,12 @@ static int nft_set_catchall_flush(const struct nft_ctx *ctx,static int nft_set_flush (struct nft_ctx *ctx,struct nft_set *set,u8 genmask) { +/* The set backend might need to clone the set, do it now from the +* preparation phase, use NFT_ITER_UPDATE_CLONE iterator type. +*/ struct nft_set_iter iter = { .genmask = genmask, - .type =NFT_ITER_UPDATE , + .type =NFT_ITER_UPDATE_CLONE , .fn = nft_setelem_flush, };
net/netfilter/nft_set_hash.c +1 -0
@@ -374,6 +374,7 @@ static void nft_rhash_walk(const struct nft_ctx *ctx, struct nft_set *set, {switch (iter->type) {case NFT_ITER_UPDATE : +case NFT_ITER_UPDATE_CLONE :/* only relevant for netlink dumps which use READ type */ WARN_ON_ONCE (iter->skip !=0 );
net/netfilter/nft_set_pipapo.c +9 -2
@@ -2145,13 +2145,20 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set,const struct nft_pipapo_match *m;switch (iter->type) { -case NFT_ITER_UPDATE : +case NFT_ITER_UPDATE_CLONE : m =pipapo_maybe_clone (set);if (!m) { iter->err = -ENOMEM ;return ; } - +nft_pipapo_do_walk (ctx, set, m, iter); +break ; +case NFT_ITER_UPDATE : +if (priv->clone) + m = priv->clone; +else + m =rcu_dereference_protected (priv->match, +nft_pipapo_transaction_mutex_held (set));nft_pipapo_do_walk (ctx, set, m, iter);break ;case NFT_ITER_READ :
net/netfilter/nft_set_rbtree.c +5 -3
@@ -810,13 +810,15 @@ static void nft_rbtree_walk(const struct nft_ctx *ctx,struct nft_rbtree *priv =nft_set_priv (set);switch (iter->type) { -case NFT_ITER_UPDATE : -lockdep_assert_held (&nft_pernet (ctx->net)->commit_mutex); - +case NFT_ITER_UPDATE_CLONE :if (nft_array_may_resize (set) <0 ) { iter->err = -ENOMEM ;break ; } + fallthrough; +case NFT_ITER_UPDATE : +lockdep_assert_held (&nft_pernet (ctx->net)->commit_mutex); +nft_rbtree_do_walk (ctx, set, iter);break ;case NFT_ITER_READ :
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 296/314 netfilter: nft_set_pipapo: split gc into unlink and reclaim phase
In reply to Sasha LevinFrom: Florian Westphal <[email protected]>
[ Upstream commit 9df95785d3d8302f7c066050117b04cd3c2048c2 ]
Yiming Qian reports Use-after-free in the pipapo set type:
Under a large number of expired elements, commit-time GC can run for a very long time in a non-preemptible context, triggering soft lockup warnings and RCU stall reports (local denial of service).
We must split GC in an unlink and a reclaim phase.
We cannot queue elements for freeing until pointers have been swapped. Expired elements are still exposed to both the packet path and userspace dumpers via the live copy of the data structure.
call_rcu() does not protect us: dump operations or element lookups starting after call_rcu has fired can still observe the free'd element, unless the commit phase has made enough progress to swap the clone and live pointers before any new reader has picked up the old version.
This a similar approach as done recently for the rbtree backend in commit 35f83a75529a ("netfilter: nft_set_rbtree: don't gc elements on insert").
--- include/net/netfilter/nf_tables.h | 5 +++ net/netfilter/nf_tables_api.c | 5 --- net/netfilter/nft_set_pipapo.c | 51 ++++++++++++++++++++++++++----- net/netfilter/nft_set_pipapo.h | 2 ++ 4 files changed, 50 insertions(+), 13 deletions(-)
include/net/netfilter/nf_tables.h +5 -0
@@ -1860,6 +1860,11 @@ struct nft_trans_gc {struct rcu_head rcu; }; +static inline int nft_trans_gc_space (const struct nft_trans_gc *trans) +{ +return NFT_TRANS_GC_BATCHCOUNT - trans->count; +} +static inline void nft_ctx_update (struct nft_ctx *ctx,const struct nft_trans *trans) {
net/netfilter/nf_tables_api.c +0 -5
@@ -10646,11 +10646,6 @@ static void nft_trans_gc_queue_work(struct nft_trans_gc *trans)schedule_work (&trans_gc_work); } -static int nft_trans_gc_space (struct nft_trans_gc *trans) -{ -return NFT_TRANS_GC_BATCHCOUNT - trans->count; -} -struct nft_trans_gc *nft_trans_gc_queue_async (struct nft_trans_gc *gc,unsigned int gc_seq,gfp_t gfp) {
net/netfilter/nft_set_pipapo.c +43 -8
110 lines not on this page · raw message
net/netfilter/nft_set_pipapo.h +2 -0
@@ -156,12 +156,14 @@ struct nft_pipapo_match {* @clone: Copy where pending insertions and deletions are kept * @width: Total bytes to be matched for one packet, including padding * @last_gc: Timestamp of last garbage collection run, jiffies +* @gc_head: list of nft_trans_gc to queue up for mem reclaim */ struct nft_pipapo {struct nft_pipapo_match __rcu *match;struct nft_pipapo_match *clone;int width;unsigned long last_gc; +struct list_head gc_head; };struct nft_pipapo_elem ;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 297/314 net: ethernet: mtk_eth_soc: Reset prog ptr to old_prog in case of error in mtk_xdp_setup()
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 0abc73c8a40fd64ac1739c90bb4f42c418d27a5e ]
Reset eBPF program pointer to old_prog and do not decrease its ref-count if mtk_open routine in mtk_xdp_setup() fails.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +12 -3
@@ -3749,12 +3749,21 @@ static int mtk_xdp_setup(struct net_device *dev, struct bpf_prog *prog,mtk_stop (dev); old_prog =rcu_replace_pointer (eth->prog, prog,lockdep_rtnl_is_held ()); + +if (netif_running (dev) && need_update) { +int err; + + err =mtk_open (dev); +if (err) { +rcu_assign_pointer (eth->prog, old_prog); + +return err; + } + } +if (old_prog)bpf_prog_put (old_prog); -if (netif_running (dev) && need_update) -return mtk_open (dev); -return 0 ; }
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 298/314 kselftest/harness: Use helper to avoid zero-size memset warning
In reply to Sasha LevinFrom: Wake Liu <[email protected]>
[ Upstream commit 19b8a76cd99bde6d299e60490f3e62b8d3df3997 ]
When building kselftests with a toolchain that enables source fortification (e.g., Android's build environment, which uses -D_FORTIFY_SOURCE=3), a build failure occurs in tests that use an empty FIXTURE().
The root cause is that an empty fixture struct results in sizeof(self_private) evaluating to 0. The compiler's fortification checks then detect the memset() call with a compile-time constant size of 0, issuing a -Wuser-defined-warnings which is promoted to an error by -Werror.
An initial attempt to guard the call with if (sizeof(self_private) > 0) was insufficient. The compiler's static analysis is aggressive enough to flag the memset(..., 0) pattern before evaluating the conditional, thus still triggering the error.
To resolve this robustly, this change introduces a static inline helper function, __kselftest_memset_safe(). This function wraps the size check and the memset() call. By replacing the direct memset() in the __TEST_F_IMPL macro with a call to this helper, we create an abstraction boundary. This prevents the compiler's static analyzer from "seeing" the problematic pattern at the macro expansion site, resolving the build failure.
Build Context:
Compiler: Android (14488419, +pgo, +bolt, +lto, +mlgo, based on r584948) clang version 22.0.0 (https://android.googlesource.com/toolchain/llvm-project 2d65e4108033380e6fe8e08b1f1826cd2bfb0c99) Relevant Options: -O2 -Wall -Werror -D_FORTIFY_SOURCE=3 -target i686-linux-android10000
Test: m kselftest_futex_futex_requeue_pi
Removed Gerrit Change-Id
Shuah Khan <[email protected]>
Stable-dep-of: 6be268151426 ("selftests/harness: order TEST_F and XFAIL_ADD constructors")
--- tools/testing/selftests/kselftest_harness.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/testing/selftests/kselftest_harness.h +7 -1
@@ -70,6 +70,12 @@#include "kselftest.h" +static inline void __kselftest_memset_safe (void *s,int c,size_t n) +{ +if (n >0 ) +memset (s, c, n); +} +#define TEST_TIMEOUT_DEFAULT 30/* Utilities exposed to the test definitions */
@@ -416,7 +422,7 @@ self =mmap (NULL ,sizeof (*self),PROT_READ |PROT_WRITE , \MAP_SHARED |MAP_ANONYMOUS ,-1 ,0 ); \ }else { \ -memset (&self_private,0 ,sizeof (self_private)); \ +__kselftest_memset_safe (&self_private,0 ,sizeof (self_private)); \ self = &self_private; \ } \ } \
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 299/314 selftests/harness: order TEST_F and XFAIL_ADD constructors
In reply to Sasha LevinFrom: Sun Jian <[email protected]>
[ Upstream commit 6be2681514261324c8ee8a1c6f76cefdf700220f ]
TEST_F() allocates and registers its struct __test_metadata via mmap() inside its constructor, and only then assigns the _##fixture_##test##_object pointer.
XFAIL_ADD() runs in a constructor too and reads _##fixture_##test##_object to initialize xfail->test. If XFAIL_ADD runs first, xfail->test can be NULL and the expected failure will be reported as FAIL.
Use constructor priorities to ensure TEST_F registration runs before XFAIL_ADD, without adding extra state or runtime lookups.
--- tools/testing/selftests/kselftest_harness.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/testing/selftests/kselftest_harness.h +5 -2
@@ -76,6 +76,9 @@ static inline void __kselftest_memset_safe(void *s, int c, size_t n)memset (s, c, n); } +#define KSELFTEST_PRIO_TEST_F 20000 +#define KSELFTEST_PRIO_XFAIL 20001 +#define TEST_TIMEOUT_DEFAULT 30/* Utilities exposed to the test definitions */
@@ -465,7 +468,7 @@ static inline void __kselftest_memset_safe(void *s, int c, size_t n) fixture_name##_teardown(_metadata, self, variant); \ } \ static struct __test_metadata *_##fixture_name##_##test_name##_object; \ - static void __attribute__((constructor)) \ + static void __attribute__((constructor(KSELFTEST_PRIO_TEST_F))) \ _register_##fixture_name##_##test_name(void) \ { \ struct __test_metadata *object = mmap(NULL, sizeof(*object), \
@@ -880,7 +883,7 @@ struct __test_xfail { .fixture = &_##fixture_name##_fixture_object, \ .variant = &_##fixture_name##_##variant_name##_object, \ }; \ - static void __attribute__((constructor)) \ + static void __attribute__((constructor(KSELFTEST_PRIO_XFAIL))) \ _register_##fixture_name##_##variant_name##_##test_name##_xfail(void) \ { \ _##fixture_name##_##variant_name##_##test_name##_xfail.test = \
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 300/314 net: bridge: fix nd_tbl NULL dereference when IPv6 is disabled
In reply to Sasha LevinFrom: Fernando Fernandez Mancera <[email protected]>
[ Upstream commit e5e890630533bdc15b26a34bb8e7ef539bdf1322 ]
When booting with the 'ipv6.disable=1' parameter, the nd_tbl is never initialized because inet6_init() exits before ndisc_init() is called which initializes it. Then, if neigh_suppress is enabled and an ICMPv6 Neighbor Discovery packet reaches the bridge, br_do_suppress_nd() will dereference ipv6_stub->nd_tbl which is NULL, passing it to neigh_lookup(). This causes a kernel NULL pointer dereference.
BUG: kernel NULL pointer dereference, address: 0000000000000268 Oops: 0000 [#1] PREEMPT SMP NOPTI [...] RIP: 0010:neigh_lookup+0x16/0xe0 [...] Call Trace: <IRQ> ? neigh_lookup+0x16/0xe0 br_do_suppress_nd+0x160/0x290 [bridge] br_handle_frame_finish+0x500/0x620 [bridge] br_handle_frame+0x353/0x440 [bridge] __netif_receive_skb_core.constprop.0+0x298/0x1110 __netif_receive_skb_one_core+0x3d/0xa0 process_backlog+0xa0/0x140 __napi_poll+0x2c/0x170 net_rx_action+0x2c4/0x3a0 handle_softirqs+0xd0/0x270 do_softirq+0x3f/0x60
Fix this by replacing IS_ENABLED(IPV6) call with ipv6_mod_enabled() in the callers. This is in essence disabling NS/NA suppression when IPv6 is disabled.
--- net/bridge/br_device.c | 2 +- net/bridge/br_input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/bridge/br_device.c +1 -1
@@ -74,7 +74,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) eth_hdr(skb)->h_proto == htons(ETH_P_RARP)) && br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED)) {br_do_proxy_suppress_arp (skb, br, vid,NULL ); - } else if (IS_ENABLED(CONFIG_IPV6) && + } else if (ipv6_mod_enabled() && skb->protocol == htons(ETH_P_IPV6) && br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED) && pskb_may_pull(skb, sizeof(struct ipv6hdr) +
net/bridge/br_input.c +1 -1
@@ -170,7 +170,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb (skb->protocol == htons(ETH_P_ARP) || skb->protocol == htons(ETH_P_RARP))) {br_do_proxy_suppress_arp (skb, br, vid, p); - } else if (IS_ENABLED(CONFIG_IPV6) && + } else if (ipv6_mod_enabled() && skb->protocol == htons(ETH_P_IPV6) && br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED) && pskb_may_pull(skb, sizeof(struct ipv6hdr) +
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 301/314 net: vxlan: fix nd_tbl NULL dereference when IPv6 is disabled
In reply to Sasha LevinFrom: Fernando Fernandez Mancera <[email protected]>
[ Upstream commit 168ff39e4758897d2eee4756977d036d52884c7e ]
When booting with the 'ipv6.disable=1' parameter, the nd_tbl is never initialized because inet6_init() exits before ndisc_init() is called which initializes it. If an IPv6 packet is injected into the interface, route_shortcircuit() is called and a NULL pointer dereference happens on neigh_lookup().
BUG: kernel NULL pointer dereference, address: 0000000000000380 Oops: Oops: 0000 [#1] SMP NOPTI [...] RIP: 0010:neigh_lookup+0x20/0x270 [...] Call Trace: <TASK> vxlan_xmit+0x638/0x1ef0 [vxlan] dev_hard_start_xmit+0x9e/0x2e0 __dev_queue_xmit+0xbee/0x14e0 packet_sendmsg+0x116f/0x1930 __sys_sendto+0x1f5/0x200 __x64_sys_sendto+0x24/0x30 do_syscall_64+0x12f/0x1590 entry_SYSCALL_64_after_hwframe+0x76/0x7e
Fix this by adding an early check on route_shortcircuit() when protocol is ETH_P_IPV6. Note that ipv6_mod_enabled() cannot be used here because VXLAN can be built-in even when IPv6 is built as a module.
--- drivers/net/vxlan/vxlan_core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/vxlan/vxlan_core.c +5 -0
@@ -2130,6 +2130,11 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb) {struct ipv6hdr *pip6; +/* check if nd_tbl is not initiliazed due to +* ipv6.disable=1 set during boot +*/ +if (!ipv6_stub->nd_tbl) +return false;if (!pskb_may_pull (skb,sizeof (struct ipv6hdr )))return false; pip6 =ipv6_hdr (skb);
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 302/314 net: ipv6: fix panic when IPv4 route references loopback IPv6 nexthop
In reply to Sasha LevinFrom: Jiayuan Chen <[email protected]>
[ Upstream commit 21ec92774d1536f71bdc90b0e3d052eff99cf093 ]
When a standalone IPv6 nexthop object is created with a loopback device (e.g., "ip -6 nexthop add id 100 dev lo"), fib6_nh_init() misclassifies it as a reject route. This is because nexthop objects have no destination prefix (fc_dst=::), causing fib6_is_reject() to match any loopback nexthop. The reject path skips fib_nh_common_init(), leaving nhc_pcpu_rth_output unallocated. If an IPv4 route later references this nexthop, __mkroute_output() dereferences NULL nhc_pcpu_rth_output and panics.
Simplify the check in fib6_nh_init() to only match explicit reject routes (RTF_REJECT) instead of using fib6_is_reject(). The loopback promotion heuristic in fib6_is_reject() is handled separately by ip6_route_info_create_nh(). After this change, the three cases behave as follows:
1. Explicit reject route ("ip -6 route add unreachable 2001:db8::/64"):
RTF_REJECT is set, enters reject path, skips fib_nh_common_init(). No behavior change.
2. Implicit loopback reject route ("ip -6 route add 2001:db8::/32 dev lo"):
RTF_REJECT is not set, takes normal path, fib_nh_common_init() is called. ip6_route_info_create_nh() still promotes it to reject afterward. nhc_pcpu_rth_output is allocated but unused, which is harmless.
3. Standalone nexthop object ("ip -6 nexthop add id 100 dev lo"):
RTF_REJECT is not set, takes normal path, fib_nh_common_init() is called. nhc_pcpu_rth_output is properly allocated, fixing the crash when IPv4 routes reference this nexthop.
--- net/ipv6/route.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
net/ipv6/route.c +3 -5
@@ -3584,7 +3584,6 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh,netdevice_tracker *dev_tracker = &fib6_nh->fib_nh_dev_tracker;struct net_device *dev =NULL ;struct inet6_dev *idev =NULL ; -int addr_type;int err; fib6_nh->fib_nh_family =AF_INET6 ;
@@ -3626,11 +3625,10 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, fib6_nh->fib_nh_weight =1 ; -/* We cannot add true routes via loopback here, -* they would result in kernel looping; promote them to reject routes +/* Reset the nexthop device to the loopback device in case of reject +* routes. */ - addr_type =ipv6_addr_type (&cfg->fc_dst); -if (fib6_is_reject (cfg->fc_flags, dev, addr_type)) { +if (cfg->fc_flags &RTF_REJECT ) {/* hold loopback dev/idev if we haven't done so. */ if (dev != net->loopback_dev) {if (dev) {
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 303/314 net/sched: act_ife: Fix metalist update behavior
In reply to Sasha LevinFrom: Jamal Hadi Salim <[email protected]>
[ Upstream commit e2cedd400c3ec0302ffca2490e8751772906ac23 ]
Whenever an ife action replace changes the metalist, instead of replacing the old data on the metalist, the current ife code is appending the new metadata. Aside from being innapropriate behavior, this may lead to an unbounded addition of metadata to the metalist which might cause an out of bounds error when running the encode op:
[ 138.423369][ C1] ================================================================== [ 138.424317][ C1] BUG: KASAN: slab-out-of-bounds in ife_tlv_meta_encode (net/ife/ife.c:168) [ 138.424906][ C1] Write of size 4 at addr ffff8880077f4ffe by task ife_out_out_bou/255 [ 138.425778][ C1] CPU: 1 UID: 0 PID: 255 Comm: ife_out_out_bou Not tainted 7.0.0-rc1-00169-gfbdfa8da05b6 #624 PREEMPT(full) [ 138.425795][ C1] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 [ 138.425800][ C1] Call Trace: [ 138.425804][ C1] <IRQ> [ 138.425808][ C1] dump_stack_lvl (lib/dump_stack.c:122) [ 138.425828][ C1] print_report (mm/kasan/report.c:379 mm/kasan/report.c:482) [ 138.425839][ C1] ? srso_alias_return_thunk (arch/x86/lib/retpoline.S:221) [ 138.425844][ C1] ? __virt_addr_valid (./arch/x86/include/asm/preempt.h:95 (discriminator 1) ./include/linux/rcupdate.h:975 (discriminator 1) ./include/linux/mmzone.h:2207 (discriminator 1) arch/x86/mm/physaddr.c:54 (discriminator 1)) [ 138.425853][ C1] ? ife_tlv_meta_encode (net/ife/ife.c:168) [ 138.425859][ C1] kasan_report (mm/kasan/report.c:221 mm/kasan/report.c:597) [ 138.425868][ C1] ? ife_tlv_meta_encode (net/ife/ife.c:168) [ 138.425878][ C1] kasan_check_range (mm/kasan/generic.c:186 (discriminator 1) mm/kasan/generic.c:200 (discriminator 1)) [ 138.425884][ C1] __asan_memset (mm/kasan/shadow.c:84 (discriminator 2)) [ 138.425889][ C1] ife_tlv_meta_encode (net/ife/ife.c:168) [ 138.425893][ C1] ? ife_tlv_meta_encode (net/ife/ife.c:171) [ 138.425898][ C1] ? srso_alias_return_thunk (arch/x86/lib/retpoline.S:221) [ 138.425903][ C1] ife_encode_meta_u16 (net/sched/act_ife.c:57) [ 138.425910][ C1] ? __pfx_do_raw_spin_lock (kernel/locking/spinlock_debug.c:114) [ 138.425916][ C1] ? __asan_memcpy (mm/kasan/shadow.c:105 (discriminator 3)) [ 138.425921][ C1] ? __pfx_ife_encode_meta_u16 (net/sched/act_ife.c:45) [ 138.425927][ C1] ? srso_alias_return_thunk (arch/x86/lib/retpoline.S:221) [ 138.425931][ C1] tcf_ife_act (net/sched/act_ife.c:847 net/sched/act_ife.c:879)
To solve this issue, fix the replace behavior by adding the metalist to the ife rcu data structure.
--- include/net/tc_act/tc_ife.h | 4 +- net/sched/act_ife.c | 93 ++++++++++++++++++------------------- 2 files changed, 45 insertions(+), 52 deletions(-)
include/net/tc_act/tc_ife.h +1 -3
@@ -13,15 +13,13 @@ struct tcf_ife_params {u8 eth_src[ETH_ALEN ];u16 eth_type;u16 flags; - +struct list_head metalist;struct rcu_head rcu; };struct tcf_ife_info {struct tc_action common;struct tcf_ife_params __rcu *params; -/* list of metaids allowed */ -struct list_head metalist; };#define to_ife (a) ((struct tcf_ife_info *)a)
net/sched/act_ife.c +44 -49
294 lines not on this page · raw message
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 304/314 xdp: use modulo operation to calculate XDP frag tailroom
In reply to Sasha LevinFrom: Larysa Zaremba <[email protected]>
[ Upstream commit 88b6b7f7b216108a09887b074395fa7b751880b1 ]
The current formula for calculating XDP tailroom in mbuf packets works only if each frag has its own page (if rxq->frag_size is PAGE_SIZE), this defeats the purpose of the parameter overall and without any indication leads to negative calculated tailroom on at least half of frags, if shared pages are used.
There are not many drivers that set rxq->frag_size. Among them:
* i40e and enetc always split page uniformly between frags, use shared pages
* ice uses page_pool frags via libeth, those are power-of-2 and uniformly distributed across page
* idpf has variable frag_size with XDP on, so current API is not applicable
* mlx5, mtk and mvneta use PAGE_SIZE or 0 as frag_size for page_pool
As for AF_XDP ZC, only ice, i40e and idpf declare frag_size for it. Modulo operation yields good results for aligned chunks, they are all power-of-2, between 2K and PAGE_SIZE. Formula without modulo fails when chunk_size is 2K. Buffers in unaligned mode are not distributed uniformly, so modulo operation would not work.
To accommodate unaligned buffers, we could define frag_size as data + tailroom, and hence do not subtract offset when calculating tailroom, but this would necessitate more changes in the drivers.
Define rxq->frag_size as an even portion of a page that fully belongs to a single frag. When calculating tailroom, locate the data start within such portion by performing a modulo operation on page offset.
--- net/core/filter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/filter.c +2 -1
@@ -4152,7 +4152,8 @@ static int bpf_xdp_frags_increase_tail(struct xdp_buff *xdp, int offset)if (!rxq->frag_size || rxq->frag_size > xdp->frame_sz)return -EOPNOTSUPP ; - tailroom = rxq->frag_size -skb_frag_size (frag) -skb_frag_off (frag); + tailroom = rxq->frag_size -skb_frag_size (frag) - +skb_frag_off (frag) % rxq->frag_size;if (unlikely (offset > tailroom))return -EINVAL ;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 305/314 xsk: introduce helper to determine rxq->frag_size
In reply to Sasha LevinFrom: Larysa Zaremba <[email protected]>
[ Upstream commit 16394d80539937d348dd3b9ea32415c54e67a81b ]
rxq->frag_size is basically a step between consecutive strictly aligned frames. In ZC mode, chunk size fits exactly, but if chunks are unaligned, there is no safe way to determine accessible space to grow tailroom.
Report frag_size to be zero, if chunks are unaligned, chunk_size otherwise.
--- include/net/xdp_sock_drv.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/net/xdp_sock_drv.h +10 -0
@@ -47,6 +47,11 @@ static inline u32 xsk_pool_get_rx_frame_size(struct xsk_buff_pool *pool)return xsk_pool_get_chunk_size (pool) -xsk_pool_get_headroom (pool); } +static inline u32 xsk_pool_get_rx_frag_step (struct xsk_buff_pool *pool) +{ +return pool->unaligned ?0 :xsk_pool_get_chunk_size (pool); +} +static inline void xsk_pool_set_rxq_info (struct xsk_buff_pool *pool,struct xdp_rxq_info *rxq) {
@@ -333,6 +338,11 @@ static inline u32 xsk_pool_get_rx_frame_size(struct xsk_buff_pool *pool)return 0 ; } +static inline u32 xsk_pool_get_rx_frag_step (struct xsk_buff_pool *pool) +{ +return 0 ; +} +static inline void xsk_pool_set_rxq_info (struct xsk_buff_pool *pool,struct xdp_rxq_info *rxq) {
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 306/314 i40e: fix registering XDP RxQ info
In reply to Sasha LevinFrom: Larysa Zaremba <[email protected]>
[ Upstream commit 8f497dc8a61429cc004720aa8e713743355d80cf ]
Current way of handling XDP RxQ info in i40e has a problem, where frag_size is not updated when xsk_buff_pool is detached or when MTU is changed, this leads to growing tail always failing for multi-buffer packets.
Couple XDP RxQ info registering with buffer allocations and unregistering with cleaning the ring.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 34 ++++++++++++--------- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 5 +-- 2 files changed, 22 insertions(+), 17 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +19 -15
@@ -3583,18 +3583,8 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)if (ring->vsi->type !=I40E_VSI_MAIN ) goto skip; -if (!xdp_rxq_info_is_reg (&ring->xdp_rxq)) { - err =__xdp_rxq_info_reg (&ring->xdp_rxq, ring->netdev, - ring->queue_index, - ring->q_vector->napi.napi_id, - ring->rx_buf_len); -if (err) -return err; - } - ring->xsk_pool =i40e_xsk_pool (ring);if (ring->xsk_pool) { -xdp_rxq_info_unreg (&ring->xdp_rxq); ring->rx_buf_len =xsk_pool_get_rx_frame_size (ring->xsk_pool); err = __xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev, ring->queue_index,
@@ -3606,17 +3596,23 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)MEM_TYPE_XSK_BUFF_POOL , NULL);if (err) -return err; + goto unreg_xdp;dev_info (&vsi->back->pdev->dev,"Registered XDP mem model MEM_TYPE_XSK_BUFF_POOL on Rx ring %d\n" , ring->queue_index); }else { + err =__xdp_rxq_info_reg (&ring->xdp_rxq, ring->netdev, + ring->queue_index, + ring->q_vector->napi.napi_id, + ring->rx_buf_len); +if (err) +return err; err =xdp_rxq_info_reg_mem_model (&ring->xdp_rxq,MEM_TYPE_PAGE_SHARED ,NULL );if (err) -return err; + goto unreg_xdp; } skip:
@@ -3654,7 +3650,8 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)dev_info (&vsi->back->pdev->dev,"Failed to clear LAN Rx queue context on Rx ring %d (pf_q %d), error: %d\n" , ring->queue_index, pf_q, err); -return -ENOMEM ; + err = -ENOMEM ; + goto unreg_xdp; }/* set the context in the HMC */
@@ -3663,7 +3660,8 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)dev_info (&vsi->back->pdev->dev,"Failed to set LAN Rx queue context on Rx ring %d (pf_q %d), error: %d\n" , ring->queue_index, pf_q, err); -return -ENOMEM ; + err = -ENOMEM ; + goto unreg_xdp; }/* configure Rx buffer alignment */
@@ -3671,7 +3669,8 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)if (I40E_2K_TOO_SMALL_WITH_PADDING ) {dev_info (&vsi->back->pdev->dev,"2k Rx buffer is too small to fit standard MTU and skb_shared_info\n" ); -return -EOPNOTSUPP ; + err = -EOPNOTSUPP ; + goto unreg_xdp; }clear_ring_build_skb_enabled (ring); }else {
@@ -3701,6 +3700,11 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring) }return 0 ; +unreg_xdp: +if (ring->vsi->type ==I40E_VSI_MAIN ) +xdp_rxq_info_unreg (&ring->xdp_rxq); + +return err; }/**
drivers/net/ethernet/intel/i40e/i40e_txrx.c +3 -2
@@ -1470,6 +1470,9 @@ void i40e_clean_rx_ring(struct i40e_ring *rx_ring)if (!rx_ring->rx_bi)return ; +if (xdp_rxq_info_is_reg (&rx_ring->xdp_rxq)) +xdp_rxq_info_unreg (&rx_ring->xdp_rxq); +if (rx_ring->xsk_pool) {i40e_xsk_clean_rx_ring (rx_ring); goto skip_free;
@@ -1527,8 +1530,6 @@ void i40e_clean_rx_ring(struct i40e_ring *rx_ring)void i40e_free_rx_resources (struct i40e_ring *rx_ring) {i40e_clean_rx_ring (rx_ring); -if (rx_ring->vsi->type ==I40E_VSI_MAIN ) -xdp_rxq_info_unreg (&rx_ring->xdp_rxq); rx_ring->xdp_prog =NULL ;kfree (rx_ring->rx_bi); rx_ring->rx_bi =NULL ;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 307/314 i40e: use xdp.frame_sz as XDP RxQ info frag_size
In reply to Sasha LevinFrom: Larysa Zaremba <[email protected]>
[ Upstream commit c69d22c6c46a1d792ba8af3d8d6356fdc0e6f538 ]
The only user of frag_size field in XDP RxQ info is bpf_xdp_frags_increase_tail(). It clearly expects whole buffer size instead of DMA write size. Different assumptions in i40e driver configuration lead to negative tailroom.
Set frag_size to the same value as frame_sz in shared pages mode, use new helper to set frag_size when AF_XDP ZC is active.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +6 -3
@@ -3569,6 +3569,7 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)u16 pf_q = vsi->base_queue + ring->queue_index;struct i40e_hw *hw = &vsi->back->hw;struct i40e_hmc_obj_rxq rx_ctx; +u32 xdp_frame_sz;int err =0 ;bool ok;
@@ -3578,6 +3579,7 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)memset (&rx_ctx,0 ,sizeof (rx_ctx)); ring->rx_buf_len = vsi->rx_buf_len; + xdp_frame_sz =i40e_rx_pg_size (ring) /2 ;/* XDP RX-queue info only needed for RX rings exposed to XDP */ if (ring->vsi->type !=I40E_VSI_MAIN )
@@ -3585,11 +3587,12 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring) ring->xsk_pool =i40e_xsk_pool (ring);if (ring->xsk_pool) { + xdp_frame_sz =xsk_pool_get_rx_frag_step (ring->xsk_pool); ring->rx_buf_len =xsk_pool_get_rx_frame_size (ring->xsk_pool); err =__xdp_rxq_info_reg (&ring->xdp_rxq, ring->netdev, ring->queue_index, ring->q_vector->napi.napi_id, - ring->rx_buf_len); + xdp_frame_sz);if (err)return err; err = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,
@@ -3605,7 +3608,7 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring) err =__xdp_rxq_info_reg (&ring->xdp_rxq, ring->netdev, ring->queue_index, ring->q_vector->napi.napi_id, - ring->rx_buf_len); + xdp_frame_sz);if (err)return err; err = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,
@@ -3616,7 +3619,7 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring) } skip: -xdp_init_buff (&ring->xdp,i40e_rx_pg_size (ring) /2 , &ring->xdp_rxq); +xdp_init_buff (&ring->xdp, xdp_frame_sz, &ring->xdp_rxq); rx_ctx.dbuff =DIV_ROUND_UP (ring->rx_buf_len,BIT_ULL (I40E_RXQ_CTX_DBUFF_SHIFT ));
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 308/314 net: enetc: use truesize as XDP RxQ info frag_size
In reply to Sasha LevinFrom: Larysa Zaremba <[email protected]>
[ Upstream commit f8e18abf183dbd636a8725532c7f5aa58957de84 ]
The only user of frag_size field in XDP RxQ info is bpf_xdp_frags_increase_tail(). It clearly expects truesize instead of DMA write size. Different assumptions in enetc driver configuration lead to negative tailroom.
Set frag_size to the same value as frame_sz.
--- drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc.c +1 -1
@@ -3458,7 +3458,7 @@ static int enetc_int_vector_init(struct enetc_ndev_priv *priv, int i, priv->rx_ring[i] = bdr; err =__xdp_rxq_info_reg (&bdr->xdp.rxq, priv->ndev, i,0 , -ENETC_RXB_DMA_SIZE_XDP ); +ENETC_RXB_TRUESIZE );if (err) goto free_vector;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 309/314 xdp: produce a warning when calculated tailroom is negative
In reply to Sasha LevinFrom: Larysa Zaremba <[email protected]>
[ Upstream commit 8821e857759be9db3cde337ad328b71fe5c8a55f ]
Many ethernet drivers report xdp Rx queue frag size as being the same as DMA write size. However, the only user of this field, namely bpf_xdp_frags_increase_tail(), clearly expects a truesize.
Such difference leads to unspecific memory corruption issues under certain circumstances, e.g. in ixgbevf maximum DMA write size is 3 KB, so when running xskxceiver's XDP_ADJUST_TAIL_GROW_MULTI_BUFF, 6K packet fully uses all DMA-writable space in 2 buffers. This would be fine, if only rxq->frag_size was properly set to 4K, but value of 3K results in a negative tailroom, because there is a non-zero page offset.
We are supposed to return -EINVAL and be done with it in such case, but due to tailroom being stored as an unsigned int, it is reported to be somewhere near UINT_MAX, resulting in a tail being grown, even if the requested offset is too much (it is around 2K in the abovementioned test). This later leads to all kinds of unspecific calltraces.
[ 7340.337579] xskxceiver[1440]: segfault at 1da718 ip 00007f4161aeac9d sp 00007f41615a6a00 error 6 [ 7340.338040] xskxceiver[1441]: segfault at 7f410000000b ip 00000000004042b5 sp 00007f415bffecf0 error 4 [ 7340.338179] in libc.so.6[61c9d,7f4161aaf000+160000] [ 7340.339230] in xskxceiver[42b5,400000+69000] [ 7340.340300] likely on CPU 6 (core 0, socket 6) [ 7340.340302] Code: ff ff 01 e9 f4 fe ff ff 0f 1f 44 00 00 4c 39 f0 74 73 31 c0 ba 01 00 00 00 f0 0f b1 17 0f 85 ba 00 00 00 49 8b 87 88 00 00 00 <4c> 89 70 08 eb cc 0f 1f 44 00 00 48 8d bd f0 fe ff ff 89 85 ec fe [ 7340.340888] likely on CPU 3 (core 0, socket 3) [ 7340.345088] Code: 00 00 00 ba 00 00 00 00 be 00 00 00 00 89 c7 e8 31 ca ff ff 89 45 ec 8b 45 ec 85 c0 78 07 b8 00 00 00 00 eb 46 e8 0b c8 ff ff <8b> 00 83 f8 69 74 24 e8 ff c7 ff ff 8b 00 83 f8 0b 74 18 e8 f3 c7 [ 7340.404334] Oops: general protection fault, probably for non-canonical address 0x6d255010bdffc: 0000 [#1] SMP NOPTI [ 7340.405972] CPU: 7 UID: 0 PID: 1439 Comm: xskxceiver Not tainted 6.19.0-rc1+ #21 PREEMPT(lazy) [ 7340.408006] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.17.0-5.fc42 04/01/2014 [ 7340.409716] RIP: 0010:lookup_swap_cgroup_id+0x44/0x80 [ 7340.410455] Code: 83 f8 1c 73 39 48 ba ff ff ff ff ff ff ff 03 48 8b 04 c5 20 55 fa bd 48 21 d1 48 89 ca 83 e1 01 48 d1 ea c1 e1 04 48 8d 04 90 <8b> 00 48 83 c4 10 d3 e8 c3 cc cc cc cc 31 c0 e9 98 b7 dd 00 48 89 [ 7340.412787] RSP: 0018:ffffcc5c04f7f6d0 EFLAGS: 00010202 [ 7340.413494] RAX: 0006d255010bdffc RBX: ffff891f477895a8 RCX: 0000000000000010 [ 7340.414431] RDX: 0001c17e3fffffff RSI: 00fa070000000000 RDI: 000382fc7fffffff [ 7340.415354] RBP: 00fa070000000000 R08: ffffcc5c04f7f8f8 R09: ffffcc5c04f7f7d0 [ 7340.416283] R10: ffff891f4c1a7000 R11: ffffcc5c04f7f9c8 R12: ffffcc5c04f7f7d0 [ 7340.417218] R13: 03ffffffffffffff R14: 00fa06fffffffe00 R15: ffff891f47789500 [ 7340.418229] FS: 0000000000000000(0000) GS:ffff891ffdfaa000(0000) knlGS:0000000000000000 [ 7340.419489] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 7340.420286] CR2: 00007f415bfffd58 CR3: 0000000103f03002 CR4: 0000000000772ef0 [ 7340.421237] PKRU: 55555554 [ 7340.421623] Call Trace: [ 7340.421987] <TASK> [ 7340.422309] ? softleaf_from_pte+0x77/0xa0 [ 7340.422855] swap_pte_batch+0xa7/0x290 [ 7340.423363] zap_nonpresent_ptes.constprop.0.isra.0+0xd1/0x270 [ 7340.424102] zap_pte_range+0x281/0x580 [ 7340.424607] zap_pmd_range.isra.0+0xc9/0x240 [ 7340.425177] unmap_page_range+0x24d/0x420 [ 7340.425714] unmap_vmas+0xa1/0x180 [ 7340.426185] exit_mmap+0xe1/0x3b0 [ 7340.426644] __mmput+0x41/0x150 [ 7340.427098] exit_mm+0xb1/0x110 [ 7340.427539] do_exit+0x1b2/0x460 [ 7340.427992] do_group_exit+0x2d/0xc0 [ 7340.428477] get_signal+0x79d/0x7e0 [ 7340.428957] arch_do_signal_or_restart+0x34/0x100 [ 7340.429571] exit_to_user_mode_loop+0x8e/0x4c0 [ 7340.430159] do_syscall_64+0x188/0x6b0 [ 7340.430672] ? __do_sys_clone3+0xd9/0x120 [ 7340.431212] ? switch_fpu_return+0x4e/0xd0 [ 7340.431761] ? arch_exit_to_user_mode_prepare.isra.0+0xa1/0xc0 [ 7340.432498] ? do_syscall_64+0xbb/0x6b0 [ 7340.433015] ? __handle_mm_fault+0x445/0x690 [ 7340.433582] ? count_memcg_events+0xd6/0x210 [ 7340.434151] ? handle_mm_fault+0x212/0x340 [ 7340.434697] ? do_user_addr_fault+0x2b4/0x7b0 [ 7340.435271] ? clear_bhb_loop+0x30/0x80 [ 7340.435788] ? clear_bhb_loop+0x30/0x80 [ 7340.436299] ? clear_bhb_loop+0x30/0x80 [ 7340.436812] ? clear_bhb_loop+0x30/0x80 [ 7340.437323] entry_SYSCALL_64_after_hwframe+0x76/0x7e [ 7340.437973] RIP: 0033:0x7f4161b14169 [ 7340.438468] Code: Unable to access opcode bytes at 0x7f4161b1413f. [ 7340.439242] RSP: 002b:00007ffc6ebfa770 EFLAGS: 00000246 ORIG_RAX: 00000000000000ca [ 7340.440173] RAX: fffffffffffffe00 RBX: 00000000000005a1 RCX: 00007f4161b14169 [ 7340.441061] RDX: 00000000000005a1 RSI: 0000000000000109 RDI: 00007f415bfff990 [ 7340.441943] RBP: 00007ffc6ebfa7a0 R08: 0000000000000000 R09: 00000000ffffffff [ 7340.442824] R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 [ 7340.443707] R13: 0000000000000000 R14: 00007f415bfff990 R15: 00007f415bfff6c0 [ 7340.444586] </TASK> [ 7340.444922] Modules linked in: rfkill intel_rapl_msr intel_rapl_common intel_uncore_frequency_common skx_edac_common nfit libnvdimm kvm_intel vfat fat kvm snd_pcm irqbypass rapl iTCO_wdt snd_timer intel_pmc_bxt iTCO_vendor_support snd ixgbevf virtio_net soundcore i2c_i801 pcspkr libeth_xdp net_failover i2c_smbus lpc_ich failover libeth virtio_balloon joydev 9p fuse loop zram lz4hc_compress lz4_compress 9pnet_virtio 9pnet netfs ghash_clmulni_intel serio_raw qemu_fw_cfg [ 7340.449650] ---[ end trace 0000000000000000 ]---
The issue can be fixed in all in-tree drivers, but we cannot just trust OOT drivers to not do this. Therefore, make tailroom a signed int and produce a warning when it is negative to prevent such mistakes in the future.
--- net/core/filter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/filter.c +2 -1
@@ -4147,13 +4147,14 @@ static int bpf_xdp_frags_increase_tail(struct xdp_buff *xdp, int offset)struct skb_shared_info *sinfo =xdp_get_shared_info_from_buff (xdp);skb_frag_t *frag = &sinfo->frags[sinfo->nr_frags -1 ];struct xdp_rxq_info *rxq = xdp->rxq; -unsigned int tailroom; +int tailroom;if (!rxq->frag_size || rxq->frag_size > xdp->frame_sz)return -EOPNOTSUPP ; tailroom = rxq->frag_size -skb_frag_size (frag) -skb_frag_off (frag) % rxq->frag_size; +WARN_ON_ONCE (tailroom <0 );if (unlikely (offset > tailroom))return -EINVAL ;
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 310/314 ata: libata-eh: Fix detection of deferred qc timeouts
In reply to Sasha LevinFrom: Guenter Roeck <[email protected]>
[ Upstream commit ee0e6e69a772d601e152e5368a1da25d656122a8 ]
If the ata_qc_for_each_raw() loop finishes without finding a matching SCSI command for any QC, the variable qc will hold a pointer to the last element examined, which has the tag i == ATA_MAX_QUEUE - 1. This qc can match the port deferred QC (ap->deferred_qc).
If that happens, the condition qc == ap->deferred_qc evaluates to true despite the loop not breaking with a match on the SCSI command for this QC. In that case, the error handler mistakenly intercepts a command that has not been issued yet and that has not timed out, and thus erroneously returning a timeout error.
Fix the problem by checking for i < ATA_MAX_QUEUE in addition to qc == ap->deferred_qc.
The problem was found by an experimental code review agent based on gemini-3.1-pro while reviewing backports into v6.18.y.
--- drivers/ata/libata-eh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/libata-eh.c +1 -1
@@ -647,7 +647,7 @@ void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap,break ; } -if (qc == ap->deferred_qc) { +if (i <ATA_MAX_QUEUE && qc == ap->deferred_qc) {/* * This is a deferred command that timed out while * waiting for the command queue to drain. Since the qc
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 311/314 selftest/arm64: Fix sve2p1_sigill() to hwcap test
In reply to Sasha LevinFrom: Yifan Wu <[email protected]>
[ Upstream commit d87c828daa7ead9763416f75cc416496969cf1dc ]
The FEAT_SVE2p1 is indicated by ID_AA64ZFR0_EL1.SVEver. However, the BFADD requires the FEAT_SVE_B16B16, which is indicated by ID_AA64ZFR0_EL1.B16B16. This could cause the test to incorrectly fail on a CPU that supports FEAT_SVE2.1 but not FEAT_SVE_B16B16.
LD1Q Gather load quadwords which is decoded from SVE encodings and implied by FEAT_SVE2p1.
--- tools/testing/selftests/arm64/abi/hwcap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/arm64/abi/hwcap.c +2 -2
@@ -473,8 +473,8 @@ static void sve2_sigill(void)static void sve2p1_sigill (void ) { -/* BFADD Z0.H, Z0.H, Z0.H */ - asmvolatile (".inst 0x65000000" : : :"z0" ); +/* LD1Q {Z0.Q}, P0/Z, [Z0.D, X0] */ + asmvolatile (".inst 0xC400A000" : : :"z0" ); }static void sve2p2_sigill (void )
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 312/314 tracing: Add NULL pointer check to trigger_data_free()
In reply to Sasha LevinFrom: Guenter Roeck <[email protected]>
[ Upstream commit 457965c13f0837a289c9164b842d0860133f6274 ]
If trigger_data_alloc() fails and returns NULL, event_hist_trigger_parse() jumps to the out_free error path. While kfree() safely handles a NULL pointer, trigger_data_free() does not. This causes a NULL pointer dereference in trigger_data_free() when evaluating data->cmd_ops->set_filter.
Fix the problem by adding a NULL pointer check to trigger_data_free().
The problem was found by an experimental code review agent based on gemini-3.1-pro while reviewing backports into v6.18.y.
--- kernel/trace/trace_events_trigger.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/trace/trace_events_trigger.c +3 -0
@@ -19,6 +19,9 @@ static DEFINE_MUTEX(trigger_cmd_mutex);void trigger_data_free (struct event_trigger_data *data) { +if (!data) +return ; +if (data->cmd_ops->set_filter) data->cmd_ops->set_filter (NULL , data,NULL );
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 313/314 bpf: collect only live registers in linked regs
In reply to Sasha LevinFrom: Eduard Zingerman <[email protected]>
[ Upstream commit 2658a1720a1944fbaeda937000ad2b3c3dfaf1bb ]
Fix an inconsistency between func_states_equal() and collect_linked_regs():
- regsafe() uses check_ids() to verify that cached and current states have identical register id mapping.
- func_states_equal() calls regsafe() only for registers computed as live by compute_live_registers().
- clean_live_states() is supposed to remove dead registers from cached states, but it can skip states belonging to an iterator-based loop.
- collect_linked_regs() collects all registers sharing the same id, ignoring the marks computed by compute_live_registers(). Linked registers are stored in the state's jump history.
- backtrack_insn() marks all linked registers for an instruction as precise whenever one of the linked registers is precise.
The above might lead to a scenario:
- There is an instruction I with register rY known to be dead at I.
- Instruction I is reached via two paths: first A, then B.
- On path A:
- There is an id link between registers rX and rY.
- Checkpoint C is created at I.
- Linked register set {rX, rY} is saved to the jump history.
- rX is marked as precise at I, causing both rX and rY to be marked precise at C.
- On path B:
- There is no id link between registers rX and rY, otherwise register states are sub-states of those in C.
- Because rY is dead at I, check_ids() returns true.
- Current state is considered equal to checkpoint C, propagate_precision() propagates spurious precision mark for register rY along the path B.
- Depending on a program, this might hit verifier_bug() in the backtrack_insn(), e.g. if rY ∈ [r1..r5]
and backtrack_insn() spots a function call.
The reproducer program is in the next patch. This was hit by sched_ext scx_lavd scheduler code.
Changes in tests:
- verifier_scalar_ids.c selftests need modification to preserve some registers as live for __msg() checks.
- exceptions_assert.c adjusted to match changes in the verifier log, R0 is dead after conditional instruction and thus does not get range.
- precise.c adjusted to match changes in the verifier log, register r9 is dead after comparison and it's range is not important for test.
--- kernel/bpf/verifier.c | 13 ++++- .../selftests/bpf/progs/exceptions_assert.c | 34 +++++------ .../selftests/bpf/progs/verifier_scalar_ids.c | 56 ++++++++++++++----- .../testing/selftests/bpf/verifier/precise.c | 8 +-- 4 files changed, 73 insertions(+), 38 deletions(-)
kernel/bpf/verifier.c +10 -3
@@ -16783,17 +16783,24 @@ static void __collect_linked_regs(struct linked_regs *reg_set, struct bpf_reg_st* in verifier state, save R in linked_regs if R->id == id. * If there are too many Rs sharing same id, reset id for leftover Rs. */ -static void collect_linked_regs (struct bpf_verifier_state *vstate,u32 id, +static void collect_linked_regs (struct bpf_verifier_env *env, +struct bpf_verifier_state *vstate, +u32 id,struct linked_regs *linked_regs) { +struct bpf_insn_aux_data *aux = env->insn_aux_data;struct bpf_func_state *func;struct bpf_reg_state *reg; +u16 live_regs;int i, j; id = id & ~BPF_ADD_CONST ;for (i = vstate->curframe; i >=0 ; i--) { + live_regs = aux[frame_insn_idx (vstate, i)].live_regs_before; func = vstate->frame[i];for (j =0 ; j <BPF_REG_FP ; j++) { +if (!(live_regs &BIT (j))) +continue ; reg = &func->regs[j];__collect_linked_regs (linked_regs, reg, id, i, j, true); }
@@ -16999,9 +17006,9 @@ static int check_cond_jmp_op(struct bpf_verifier_env *env,* if parent state is created. */ if (BPF_SRC (insn->code) ==BPF_X && src_reg->type ==SCALAR_VALUE && src_reg->id) -collect_linked_regs (this_branch, src_reg->id, &linked_regs); +collect_linked_regs (env, this_branch, src_reg->id, &linked_regs);if (dst_reg->type ==SCALAR_VALUE && dst_reg->id) -collect_linked_regs (this_branch, dst_reg->id, &linked_regs); +collect_linked_regs (env, this_branch, dst_reg->id, &linked_regs);if (linked_regs.cnt >1 ) { err =push_jmp_history (env, this_branch,0 ,linked_regs_pack (&linked_regs));if (err)
tools/testing/selftests/bpf/progs/exceptions_assert.c +17 -17
@@ -18,43 +18,43 @@return *(u64 *)num; \ } -__msg(": R0=0xffffffff80000000") +__msg("R{{.}}=0xffffffff80000000") check_assert(s64, ==, eq_int_min, INT_MIN); -__msg(": R0=0x7fffffff") +__msg("R{{.}}=0x7fffffff") check_assert(s64, ==, eq_int_max, INT_MAX); -__msg(": R0=0") +__msg("R{{.}}=0") check_assert(s64, ==, eq_zero, 0); -__msg(": R0=0x8000000000000000 R1=0x8000000000000000") +__msg("R{{.}}=0x8000000000000000") check_assert(s64, ==, eq_llong_min, LLONG_MIN); -__msg(": R0=0x7fffffffffffffff R1=0x7fffffffffffffff") +__msg("R{{.}}=0x7fffffffffffffff") check_assert(s64, ==, eq_llong_max, LLONG_MAX); -__msg(": R0=scalar(id=1,smax=0x7ffffffe)") +__msg("R{{.}}=scalar(id=1,smax=0x7ffffffe)") check_assert(s64, <, lt_pos, INT_MAX); -__msg(": R0=scalar(id=1,smax=-1,umin=0x8000000000000000,var_off=(0x8000000000000000; 0x7fffffffffffffff))") +__msg("R{{.}}=scalar(id=1,smax=-1,umin=0x8000000000000000,var_off=(0x8000000000000000; 0x7fffffffffffffff))") check_assert(s64, <, lt_zero, 0); -__msg(": R0=scalar(id=1,smax=0xffffffff7fffffff") +__msg("R{{.}}=scalar(id=1,smax=0xffffffff7fffffff") check_assert(s64, <, lt_neg, INT_MIN); -__msg(": R0=scalar(id=1,smax=0x7fffffff)") +__msg("R{{.}}=scalar(id=1,smax=0x7fffffff)") check_assert(s64, <=, le_pos, INT_MAX); -__msg(": R0=scalar(id=1,smax=0)") +__msg("R{{.}}=scalar(id=1,smax=0)") check_assert(s64, <=, le_zero, 0); -__msg(": R0=scalar(id=1,smax=0xffffffff80000000") +__msg("R{{.}}=scalar(id=1,smax=0xffffffff80000000") check_assert(s64, <=, le_neg, INT_MIN); -__msg(": R0=scalar(id=1,smin=umin=0x80000000,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))") +__msg("R{{.}}=scalar(id=1,smin=umin=0x80000000,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))") check_assert(s64, >, gt_pos, INT_MAX); -__msg(": R0=scalar(id=1,smin=umin=1,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))") +__msg("R{{.}}=scalar(id=1,smin=umin=1,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))") check_assert(s64, >, gt_zero, 0); -__msg(": R0=scalar(id=1,smin=0xffffffff80000001") +__msg("R{{.}}=scalar(id=1,smin=0xffffffff80000001") check_assert(s64, >, gt_neg, INT_MIN); -__msg(": R0=scalar(id=1,smin=umin=0x7fffffff,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))") +__msg("R{{.}}=scalar(id=1,smin=umin=0x7fffffff,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))") check_assert(s64, >=, ge_pos, INT_MAX); -__msg(": R0=scalar(id=1,smin=0,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))") +__msg("R{{.}}=scalar(id=1,smin=0,umax=0x7fffffffffffffff,var_off=(0x0; 0x7fffffffffffffff))") check_assert(s64, >=, ge_zero, 0); -__msg(": R0=scalar(id=1,smin=0xffffffff80000000") +__msg("R{{.}}=scalar(id=1,smin=0xffffffff80000000") check_assert(s64, >=, ge_neg, INT_MIN);SEC ("?tc" )
tools/testing/selftests/bpf/progs/verifier_scalar_ids.c +42 -14
152 lines not on this page · raw message
tools/testing/selftests/bpf/verifier/precise.c +4 -4
@@ -44,9 +44,9 @@ mark_precise: frame0: regs=r2 stack= before 23\ mark_precise: frame0: regs=r2 stack= before 22\ mark_precise: frame0: regs=r2 stack= before 20\ - mark_precise: frame0: parent state regs=r2,r9 stack=:\ + mark_precise: frame0: parent state regs=r2 stack=:\ mark_precise: frame0: last_idx 19 first_idx 10\ - mark_precise: frame0: regs=r2,r9 stack= before 19\ + mark_precise: frame0: regs=r2 stack= before 19\ mark_precise: frame0: regs=r9 stack= before 18\ mark_precise: frame0: regs=r8,r9 stack= before 17\ mark_precise: frame0: regs=r0,r9 stack= before 15\
@@ -107,9 +107,9 @@ mark_precise: frame0: parent state regs=r2 stack=:\ mark_precise: frame0: last_idx 20 first_idx 20\ mark_precise: frame0: regs=r2 stack= before 20\ - mark_precise: frame0: parent state regs=r2,r9 stack=:\ + mark_precise: frame0: parent state regs=r2 stack=:\ mark_precise: frame0: last_idx 19 first_idx 17\ - mark_precise: frame0: regs=r2,r9 stack= before 19\ + mark_precise: frame0: regs=r2 stack= before 19\ mark_precise: frame0: regs=r9 stack= before 18\ mark_precise: frame0: regs=r8,r9 stack= before 17\ mark_precise: frame0: parent state regs= stack=:",
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 314/314 Linux 6.18.17-rc1
In reply to Sasha Levin--- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Makefile +2 -2
@@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 6 PATCHLEVEL = 18 -SUBLEVEL = 16 -EXTRAVERSION = +SUBLEVEL = 17 +EXTRAVERSION = -rc1 NAME = Baby Opossum Posse # *DOCUMENTATION*
Signature · 1 line
2.51.0
# Librecast Test Results
020/020 [ OK ] liblcrq
010/010 [ OK ] libmld
120/120 [ OK ] liblibrecast
CPU/kernel: Linux auntie 6.18.17-rc1-gc86e53b5f779 #1 SMP PREEMPT_DYNAMIC Tue Mar 10 12:40:50 -00 2026 x86_64 AMD Ryzen 9 9950X 16-Core Processor AuthenticAMD GNU/Linux
Quoted 9 lines · Sasha Levin
This is the start of the stable review cycle for the 6.18.17 release. There are 314 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 12 11:19:16 AM UTC 2026. Anything received after that time might be too late.
Quoted 8 lines
The whole patch series can be found in one patch at:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/rawdiff/?id=linux-6.18.y&id2=v6.18.16or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.18.y
and the diffstat can be found below.Thanks,
Sasha
All tests passing for Tegra ...
Test results for stable-v6.18:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
133 tests: 133 pass, 0 failLinux version: 6.18.17-rc1-gc86e53b5f779
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra186-p3509-0000+p3636-0001, tegra194-p2972-0000,
tegra194-p3509-0000+p3668-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon
Quoted 10 lines · Sasha Levin
This is the start of the stable review cycle for the 6.18.17 release. There are 314 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 12 11:19:16 AM UTC 2026. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/rawdiff/?id=linux-6.18.y&id2=v6.18.16
Quoted 8 lines
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.18.y
and the diffstat can be found below.Thanks,
Sasha-------------
built and boot-tested the linux-stable-rc 6.18.17 kernel using QEMU.
The kernel built and booted successfully in a virtual environment on the tested architectures. No issues were observed during boot, and no regressions were found in the dmesg output.
Build details:
Architectures : arm64, x86_64
Kernel version: 6.18.17-rc1
Configuration : defconfig
Source : https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Commit : c86e53b5f7797099e5c89a0c3f43de859d8ec1ec
hello,
Compiled and booted 6.18.17-rc1+
No new typical dmesg regressions
.
--
software engineer
rajagiri school of engineering and technology-
Quoted 9 lines · Sasha Levin
This is the start of the stable review cycle for the 6.18.17 release. There are 314 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 12 11:19:16 AM UTC 2026. Anything received after that time might be too late.
Quoted 8 lines
The whole patch series can be found in one patch at:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/rawdiff/?id=linux-6.18.y&id2=v6.18.16or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.18.y
and the diffstat can be found below.Thanks,
Sasha
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 8 lines · Sasha Levin
This is the start of the stable review cycle for the 6.18.17 release. There are 314 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 12 11:19:16 AM UTC 2026. Anything received after that time might be too late.
Quoted 8 lines
The whole patch series can be found in one patch at:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/rawdiff/?id=linux-6.18.y&id2=v6.18.16or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.18.y
and the diffstat can be found below.Thanks,
Sasha
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Am 10.03.2026 um 12:19 schrieb Sasha Levin:
Quoted 5 lines
This is the start of the stable review cycle for the 6.18.17 release. There are 314 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.
Builds, boots and works on my 2-socket Ivy Bridge Xeon E5-2697 v2 server. No dmesg oddities or regressions found.
Beste Grüße,
Peter Schneider
Signature · 8 lines
Climb the mountain not to plant your flag, but to embrace the challenge, enjoy the air and behold the view. Climb it so you can see the world, not so the world can see you. -- David McCullough Jr. OpenPGP: 0xA3828BD796CCE11A8CADE8866E3A92C92C3FF244 Download: https://www.peters-netzplatz.de/download/pschneider1968_pub.asc https://keys.mailvelope.com/pks/lookup?op=get&[email protected] https://keys.mailvelope.com/pks/lookup?op=get&[email protected]
Quoted 4 lines · Sasha Levin
This is the start of the stable review cycle for the 6.18.17 release. There are 314 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.
Quoted 9 lines · Sasha Levin
This is the start of the stable review cycle for the 6.18.17 release. There are 314 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 12 11:19:16 AM UTC 2026. Anything received after that time might be too late.
Quoted 9 lines
The whole patch series can be found in one patch at:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/rawdiff/?id=linux-6.18.y&id2=v6.18.16or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.18.y
and the diffstat can be found below.Thanks,
Sasha
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 8 lines · Sasha Levin
This is the start of the stable review cycle for the 6.18.17 release. There are 314 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 12 11:19:16 AM UTC 2026. Anything received after that time might be too late.
Quoted 8 lines
The whole patch series can be found in one patch at:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/rawdiff/?id=linux-6.18.y&id2=v6.18.16or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.18.y
and the diffstat can be found below.Thanks,
Sasha
Tested on an amd64 laptop (Apple MacBook Air 2017). Working well, no regressions observed.
Signature · 1 line
-Barry K. Nathan <[email protected]>
Hi Sasha,
Quoted 5 lines · Sasha Levin
This is the start of the stable review cycle for the 6.18.17 release. There are 314 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.
BPF selftest is failing due to backported commit efc11a667878 ("bpf:
Improve bounds when tnum has a single possible value"). The fix is commit 024cea2d647e ("selftests/bpf: Avoid simplification of crafted bounds test"). Can you pick that up for both 6.18 and 6.19?
FWIW this failure does not point to actual issue of the codebase, just that the selftest's expectation not aligning with the kernel.
Full log below:
/var/git/linux-stable-6.18$ vng --user=root --cwd=tools/testing/selftests/bpf/ -- ./test_progs -n 295
#295/1 reg_bounds_crafted/(u64)[0; 4294967295] (u64)<op> 0:OK
#295/2 reg_bounds_crafted/(u64)0 (u64)<op> [0; 4294967295]:OK
#295/3 reg_bounds_crafted/(u64)[0; 2147483648] (u64)<op> 0:OK
#295/4 reg_bounds_crafted/(u64)0 (u64)<op> [0; 2147483648]:OK
#295/5 reg_bounds_crafted/(u64)[0x100000000; 0x100000100] (u64)<op> 0:OK
#295/6 reg_bounds_crafted/(u64)0 (u64)<op> [0x100000000; 0x100000100]:OK
#295/7 reg_bounds_crafted/(u64)[0x100000000; 0x180000000] (u64)<op> 0:OK
#295/8 reg_bounds_crafted/(u64)0 (u64)<op> [0x100000000; 0x180000000]:OK
#295/9 reg_bounds_crafted/(u64)[0x100000000; 0x1ffffff00] (u64)<op> 0:OK
#295/10 reg_bounds_crafted/(u64)0 (u64)<op> [0x100000000; 0x1ffffff00]:OK
#295/11 reg_bounds_crafted/(u64)[0x100000000; 0x1ffffff01] (u64)<op> 0:OK
#295/12 reg_bounds_crafted/(u64)0 (u64)<op> [0x100000000; 0x1ffffff01]:OK
#295/13 reg_bounds_crafted/(u64)[0x100000000; 0x1fffffffe] (u64)<op> 0:OK
#295/14 reg_bounds_crafted/(u64)0 (u64)<op> [0x100000000; 0x1fffffffe]:OK
#295/15 reg_bounds_crafted/(u64)[0x100000001; 0x1000000ff] (u64)<op> 0:OK
#295/16 reg_bounds_crafted/(u64)0 (u64)<op> [0x100000001; 0x1000000ff]:OK
#295/17 reg_bounds_crafted/(u64)[0; 1] (u64)<op> [1; 2147483648]:OK
#295/18 reg_bounds_crafted/(u64)[1; 2147483648] (u64)<op> [0; 1]:OK
#295/19 reg_bounds_crafted/(u64)[0; 1] (s64)<op> [1; 2147483648]:OK
#295/20 reg_bounds_crafted/(u64)[1; 2147483648] (s64)<op> [0; 1]:OK
#295/21 reg_bounds_crafted/(u64)[0; 1] (u32)<op> [1; 2147483648]:OK
#295/22 reg_bounds_crafted/(u64)[1; 2147483648] (u32)<op> [0; 1]:OK
#295/23 reg_bounds_crafted/(u64)[0; 1] (s32)<op> [1; 2147483648]:OK
#295/24 reg_bounds_crafted/(u64)[1; 2147483648] (s32)<op> [0; 1]:OK
#295/25 reg_bounds_crafted/(u64)[0; 0xffffffff00000000] (s64)<op> 0:OK
#295/26 reg_bounds_crafted/(u64)0 (s64)<op> [0; 0xffffffff00000000]:OK
#295/27 reg_bounds_crafted/(u64)[0x7fffffffffffffff; 0xffffffff00000000] (s64)<op> 0:OK
#295/28 reg_bounds_crafted/(u64)0 (s64)<op> [0x7fffffffffffffff; 0xffffffff00000000]:OK
#295/29 reg_bounds_crafted/(u64)[0x7fffffff00000001; 0xffffffff00000000] (s64)<op> 0:OK
#295/30 reg_bounds_crafted/(u64)0 (s64)<op> [0x7fffffff00000001; 0xffffffff00000000]:OK
#295/31 reg_bounds_crafted/(u64)[0; 4294967295] (s64)<op> 1:OK
#295/32 reg_bounds_crafted/(u64)1 (s64)<op> [0; 4294967295]:OK
#295/33 reg_bounds_crafted/(u64)[0; 4294967295] (s64)<op> 2147483647:OK
#295/34 reg_bounds_crafted/(u64)2147483647 (s64)<op> [0; 4294967295]:OK
#295/35 reg_bounds_crafted/(u64)[0; 0x100000000] (u32)<op> 0:OK
#295/36 reg_bounds_crafted/(u64)0 (u32)<op> [0; 0x100000000]:OK
MISMATCH true_reg1.u64: 0x100000000 != [4294967294; 0x100000000]
MISMATCH true_reg1.s64: 0x100000000 != [0xfffffffe; 0x100000000]
VERIFIER LOG:
========================
func#0 @0
Live regs before insn:
0: .......... (05) goto pc+2
1: .......... (b7) r0 = 0
2: 0......... (95) exit
3: .......... (85) call bpf_get_current_pid_tgid#14
4: 0......... (bf) r6 = r0
5: ......6... (85) call bpf_get_current_pid_tgid#14
6: 0.....6... (bf) r7 = r0
7: ......67.. (18) r1 = 0xfffffffe
9: .1....67.. (18) r2 = 0x100000000
11: .12...67.. (ad) if r6 < r1 goto pc-11
12: ..2...67.. (2d) if r6 > r2 goto pc-12
13: ......67.. (18) r1 = 0x80000000
15: .1....67.. (18) r2 = 0x80000000
17: .12...67.. (ad) if r7 < r1 goto pc-17
18: ..2...67.. (2d) if r7 > r2 goto pc-18
19: ......67.. (bc) w0 = w6
20: ......67.. (bc) w0 = w7
21: ......67.. (ae) if w6 < w7 goto pc+3
22: ......67.. (bc) w0 = w6
23: .......7.. (bc) w0 = w7
24: 0......... (95) exit
25: ......67.. (bc) w0 = w6
26: .......7.. (bc) w0 = w7
27: 0......... (95) exit
0: R1=ctx() R10=fp0
0: (05) goto pc+2
3: (85) call bpf_get_current_pid_tgid#14 ; R0=scalar()
4: (bf) r6 = r0 ; R0=scalar(id=1) R6=scalar(id=1)
5: (85) call bpf_get_current_pid_tgid#14 ; R0=scalar()
6: (bf) r7 = r0 ; R0=scalar(id=2) R7=scalar(id=2)
7: (18) r1 = 0xfffffffe ; R1=0xfffffffe
9: (18) r2 = 0x100000000 ; R2=0x100000000
11: (ad) if r6 < r1 goto pc-11 ; R1=0xfffffffe R6=scalar(id=1,umin=0xfffffffe)
12: (2d) if r6 > r2 goto pc-12 ; R2=0x100000000 R6=scalar(id=1,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff))
13: (18) r1 = 0x80000000 ; R1=0x80000000
15: (18) r2 = 0x80000000 ; R2=0x80000000
17: (ad) if r7 < r1 goto pc-17 ; R1=0x80000000 R7=scalar(id=2,umin=0x80000000)
18: (2d) if r7 > r2 goto pc-18 ; R2=0x80000000 R7=0x80000000
19: (bc) w0 = w6 ; R0=scalar(smin=0,smax=umax=0xffffffff,smin32=-2,smax32=0,var_off=(0x0; 0xffffffff)) R6=scalar(id=1,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff))
20: (bc) w0 = w7 ; R0=0x80000000 R7=0x80000000
21: (ae) if w6 < w7 goto pc+3 ; R6=scalar(id=1,smin=umin=umin32=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x100000001)) R7=0x80000000
22: (bc) w0 = w6 ; R0=scalar(smin=umin=umin32=0xfffffffe,smax=umax=0xffffffff,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x1)) R6=scalar(id=1,smin=umin=umin32=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x100000001))
23: (bc) w0 = w7 ; R0=0x80000000 R7=0x8000000024: (95) exit
from 21 to 25: R0=0x80000000 R1=0x80000000 R2=0x80000000 R6=0x100000000 R7=0x80000000 R10=fp0 25: R0=0x80000000 R1=0x80000000 R2=0x80000000 R6=0x100000000 R7=0x80000000 R10=fp0
25: (bc) w0 = w6 ; R0=0 R6=0x100000000
26: (bc) w0 = w7 ; R0=0x80000000 R7=0x80000000
27: (95) exit
from 18 to 1: R0=scalar(id=2) R1=0x80000000 R2=0x80000000 R6=scalar(id=1,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff)) R7=scalar(id=2,umin=0x80000001) R10=fp0 1: R0=scalar(id=2) R1=0x80000000 R2=0x80000000 R6=scalar(id=1,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff)) R7=scalar(id=2,umin=0x80000001) R10=fp0
1: (b7) r0 = 0 ; R0=0
2: (95) exit
from 17 to 1: R0=scalar(id=2) R1=0x80000000 R2=0x80000000 R6=scalar(id=1,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff)) R7=scalar(id=2,smin=smin32=0,smax=umax=umax32=0x7fffffff,var_off=(0x0; 0x7fffffff)) R10=fp0 1: R0=scalar(id=2) R1=0x80000000 R2=0x80000000 R6=scalar(id=1,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff)) R7=scalar(id=2,smin=smin32=0,smax=umax=umax32=0x7fffffff,var_off=(0x0; 0x7fffffff)) R10=fp0
1: (b7) r0 = 0 ; R0=0
2: (95) exit
from 12 to 1: safe
from 11 to 1: safe
processed 28 insns (limit 1000000) max_states_per_insn 0 total_states 3 peak_states 3 mark_read 0
=====================
ACTUAL FALSE1: scalar(u64=[4294967294; 0x100000000],u32=[4294967294; 4294967295],s64=[0xfffffffe; 0x100000000],s32=[0xfffffffe; 0xffffffff])
EXPECTED FALSE1: scalar(u64=[4294967294; 0x100000000],u32=[4294967294; 4294967295],s64=[0xfffffffe; 0x100000000],s32=[0xfffffffe; 0xffffffff])
ACTUAL FALSE2: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN)
EXPECTED FALSE2: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN)
ACTUAL TRUE1: scalar(u64=0x100000000,u32=0,s64=0x100000000,s32=0)
EXPECTED TRUE1: scalar(u64=[4294967294; 0x100000000],u32=0,s64=[0xfffffffe; 0x100000000],s32=0)
ACTUAL TRUE2: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN)
EXPECTED TRUE2: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN)
verify_case_opt:FAIL:(u64)[4294967294; 0x100000000] (u32)< 2147483648 unexpected error: -22 (errno 22)
#295/37 reg_bounds_crafted/(u64)[4294967294; 0x100000000] (u32)<op> 2147483648:FAIL
MISMATCH false_reg2.u64: 0x100000000 != [4294967294; 0x100000000]
MISMATCH false_reg2.s64: 0x100000000 != [0xfffffffe; 0x100000000]
VERIFIER LOG:
========================
func#0 @0
Live regs before insn:
0: .......... (05) goto pc+2
1: .......... (b7) r0 = 0
2: 0......... (95) exit
3: .......... (85) call bpf_get_current_pid_tgid#14
4: 0......... (bf) r6 = r0
5: ......6... (85) call bpf_get_current_pid_tgid#14
6: 0.....6... (bf) r7 = r0
7: ......67.. (18) r1 = 0x80000000
9: .1....67.. (18) r2 = 0x80000000
11: .12...67.. (ad) if r6 < r1 goto pc-11
12: ..2...67.. (2d) if r6 > r2 goto pc-12
13: ......67.. (18) r1 = 0xfffffffe
15: .1....67.. (18) r2 = 0x100000000
17: .12...67.. (ad) if r7 < r1 goto pc-17
18: ..2...67.. (2d) if r7 > r2 goto pc-18
19: ......67.. (bc) w0 = w6
20: ......67.. (bc) w0 = w7
21: ......67.. (be) if w6 <= w7 goto pc+3
22: ......67.. (bc) w0 = w6
23: .......7.. (bc) w0 = w7
24: 0......... (95) exit
25: ......67.. (bc) w0 = w6
26: .......7.. (bc) w0 = w7
27: 0......... (95) exit
0: R1=ctx() R10=fp0
0: (05) goto pc+2
3: (85) call bpf_get_current_pid_tgid#14 ; R0=scalar()
4: (bf) r6 = r0 ; R0=scalar(id=1) R6=scalar(id=1)
5: (85) call bpf_get_current_pid_tgid#14 ; R0=scalar()
6: (bf) r7 = r0 ; R0=scalar(id=2) R7=scalar(id=2)
7: (18) r1 = 0x80000000 ; R1=0x80000000
9: (18) r2 = 0x80000000 ; R2=0x80000000
11: (ad) if r6 < r1 goto pc-11 ; R1=0x80000000 R6=scalar(id=1,umin=0x80000000)
12: (2d) if r6 > r2 goto pc-12 ; R2=0x80000000 R6=0x80000000
13: (18) r1 = 0xfffffffe ; R1=0xfffffffe
15: (18) r2 = 0x100000000 ; R2=0x100000000
17: (ad) if r7 < r1 goto pc-17 ; R1=0xfffffffe R7=scalar(id=2,umin=0xfffffffe)
18: (2d) if r7 > r2 goto pc-18 ; R2=0x100000000 R7=scalar(id=2,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff))
19: (bc) w0 = w6 ; R0=0x80000000 R6=0x80000000
20: (bc) w0 = w7 ; R0=scalar(smin=0,smax=umax=0xffffffff,smin32=-2,smax32=0,var_off=(0x0; 0xffffffff)) R7=scalar(id=2,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff))
21: (be) if w6 <= w7 goto pc+3 ; R6=0x80000000 R7=0x100000000
22: (bc) w0 = w6 ; R0=0x80000000 R6=0x80000000
23: (bc) w0 = w7 ; R0=0 R7=0x10000000024: (95) exit
from 21 to 25: R0=scalar(smin=0,smax=umax=0xffffffff,smin32=-2,smax32=0,var_off=(0x0; 0xffffffff)) R1=0xfffffffe R2=0x100000000 R6=0x80000000 R7=scalar(id=2,smin=umin=umin32=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x100000001)) R10=fp0 25: R0=scalar(smin=0,smax=umax=0xffffffff,smin32=-2,smax32=0,var_off=(0x0; 0xffffffff)) R1=0xfffffffe R2=0x100000000 R6=0x80000000 R7=scalar(id=2,smin=umin=umin32=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x100000001)) R10=fp0
25: (bc) w0 = w6 ; R0=0x80000000 R6=0x80000000
26: (bc) w0 = w7 ; R0=scalar(smin=umin=umin32=0xfffffffe,smax=umax=0xffffffff,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x1)) R7=scalar(id=2,smin=umin=umin32=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x100000001))
27: (95) exit
from 18 to 1: R0=scalar(id=2) R1=0xfffffffe R2=0x100000000 R6=0x80000000 R7=scalar(id=2,umin=0x100000001) R10=fp0 1: R0=scalar(id=2) R1=0xfffffffe R2=0x100000000 R6=0x80000000 R7=scalar(id=2,umin=0x100000001) R10=fp0
1: (b7) r0 = 0 ; R0=0
2: (95) exit
from 17 to 1: R0=scalar(id=2) R1=0xfffffffe R2=0x100000000 R6=0x80000000 R7=scalar(id=2,smin=0,smax=umax=umax32=0xfffffffd,var_off=(0x0; 0xffffffff)) R10=fp0 1: R0=scalar(id=2) R1=0xfffffffe R2=0x100000000 R6=0x80000000 R7=scalar(id=2,smin=0,smax=umax=umax32=0xfffffffd,var_off=(0x0; 0xffffffff)) R10=fp0
1: (b7) r0 = 0 ; R0=0
2: (95) exit
from 12 to 1: safe
from 11 to 1: safe
processed 28 insns (limit 1000000) max_states_per_insn 0 total_states 3 peak_states 3 mark_read 0
=====================
ACTUAL FALSE1: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN)
EXPECTED FALSE1: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN)
ACTUAL FALSE2: scalar(u64=0x100000000,u32=0,s64=0x100000000,s32=0)
EXPECTED FALSE2: scalar(u64=[4294967294; 0x100000000],u32=0,s64=[0xfffffffe; 0x100000000],s32=0)
ACTUAL TRUE1: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN) EXPECTED TRUE1: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN) ACTUAL TRUE2: scalar(u64=[4294967294; 0x100000000],u32=[4294967294; 4294967295],s64=[0xfffffffe; 0x100000000],s32=[0xfffffffe; 0xffffffff]) EXPECTED TRUE2: scalar(u64=[4294967294; 0x100000000],u32=[4294967294; 4294967295],s64=[0xfffffffe; 0x100000000],s32=[0xfffffffe; 0xffffffff]) verify_case_opt:FAIL:(u64)2147483648 (u32)<= [4294967294; 0x100000000] unexpected error: -22 (errno 22) #295/38 reg_bounds_crafted/(u64)2147483648 (u32)<op> [4294967294; 0x100000000]:FAIL #295/39 reg_bounds_crafted/(u64)[0; 0xffffffff00000000] (s32)<op> 0:OK #295/40 reg_bounds_crafted/(u64)0 (s32)<op> [0; 0xffffffff00000000]:OK #295/41 reg_bounds_crafted/(u64)[0; 4294967295] (s32)<op> 0:OK #295/42 reg_bounds_crafted/(u64)0 (s32)<op> [0; 4294967295]:OK #295/43 reg_bounds_crafted/(u64)[0; 0x100000000] (s32)<op> 0:OK #295/44 reg_bounds_crafted/(u64)0 (s32)<op> [0; 0x100000000]:OK #295/45 reg_bounds_crafted/(u64)[0; 0x100000001] (s32)<op> 0:OK #295/46 reg_bounds_crafted/(u64)0 (s32)<op> [0; 0x100000001]:OK #295/47 reg_bounds_crafted/(u64)[0; 0x180000000] (s32)<op> 0:OK #295/48 reg_bounds_crafted/(u64)0 (s32)<op> [0; 0x180000000]:OK #295/49 reg_bounds_crafted/(u64)[0; 0x17fffffff] (s32)<op> 0:OK #295/50 reg_bounds_crafted/(u64)0 (s32)<op> [0; 0x17fffffff]:OK #295/51 reg_bounds_crafted/(u64)[0; 0x180000001] (s32)<op> 0:OK #295/52 reg_bounds_crafted/(u64)0 (s32)<op> [0; 0x180000001]:OK #295/53 reg_bounds_crafted/(s64)[0xffffffffffffffff; 0] (s64)<op> 0xffffffff00000000:OK #295/54 reg_bounds_crafted/(s64)0xffffffff00000000 (s64)<op> [0xffffffffffffffff; 0]:OK #295/55 reg_bounds_crafted/(u64)[4294967295; 0x100000000] (u64)<op> 0:OK #295/56 reg_bounds_crafted/(u64)0 (u64)<op> [4294967295; 0x100000000]:OK #295/57 reg_bounds_crafted/(u64)[4294967295; 0x100000001] (u64)<op> 0:OK #295/58 reg_bounds_crafted/(u64)0 (u64)<op> [4294967295; 0x100000001]:OK #295/59 reg_bounds_crafted/(s64)[0xffffffff00000001; 0] (u64)<op> 0xffffffff00000000:OK #295/60 reg_bounds_crafted/(s64)0xffffffff00000000 (u64)<op> [0xffffffff00000001; 0]:OK #295/61 reg_bounds_crafted/(u32)[1; 4294967295] (u32)<op> 0:OK #295/62 reg_bounds_crafted/(u32)0 (u32)<op> [1; 4294967295]:OK #295/63 reg_bounds_crafted/(u32)[0; 4294967295] (s32)<op> 4294967295:OK #295/64 reg_bounds_crafted/(u32)4294967295 (s32)<op> [0; 4294967295]:OK #295/65 reg_bounds_crafted/(s32)S32_MIN (u64)<op> [0xffffff01; 0]:OK #295/66 reg_bounds_crafted/(s32)[0xffffff01; 0] (u64)<op> S32_MIN:OK #295/67 reg_bounds_crafted/(s32)[S32_MIN; 0xffffff01] (s64)<op> [0xfffffffe; 0]:OK #295/68 reg_bounds_crafted/(s32)[0xfffffffe; 0] (s64)<op> [S32_MIN; 0xffffff01]:OK #295/69 reg_bounds_crafted/(s32)[0; 0x1] (s64)<op> S32_MIN:OK #295/70 reg_bounds_crafted/(s32)S32_MIN (s64)<op> [0; 0x1]:OK #295/71 reg_bounds_crafted/(s32)S32_MIN (u32)<op> S32_MIN:OK #295/72 reg_bounds_crafted/(s32)S32_MIN (u32)<op> S32_MIN:OK #295/73 reg_bounds_crafted/(u64)[0; U64_MAX] (u64)<op> U64_MAX:OK #295/74 reg_bounds_crafted/(u64)U64_MAX (u64)<op> [0; U64_MAX]:OK #295/75 reg_bounds_crafted/(u64)[0; U64_MAX] (u64)<op> 0:OK #295/76 reg_bounds_crafted/(u64)0 (u64)<op> [0; U64_MAX]:OK #295/77 reg_bounds_crafted/(s64)[S64_MIN; 0] (u64)<op> S64_MIN:OK #295/78 reg_bounds_crafted/(s64)S64_MIN (u64)<op> [S64_MIN; 0]:OK #295/79 reg_bounds_crafted/(s64)[S64_MIN; 0] (u64)<op> 0:OK #295/80 reg_bounds_crafted/(s64)0 (u64)<op> [S64_MIN; 0]:OK #295/81 reg_bounds_crafted/(s64)[S64_MIN; S64_MAX] (u64)<op> S64_MAX:OK #295/82 reg_bounds_crafted/(s64)S64_MAX (u64)<op> [S64_MIN; S64_MAX]:OK #295/83 reg_bounds_crafted/(u32)[0; 4294967295] (u32)<op> 0:OK #295/84 reg_bounds_crafted/(u32)0 (u32)<op> [0; 4294967295]:OK #295/85 reg_bounds_crafted/(u32)[0; 4294967295] (u32)<op> 4294967295:OK #295/86 reg_bounds_crafted/(u32)4294967295 (u32)<op> [0; 4294967295]:OK #295/87 reg_bounds_crafted/(s32)[S32_MIN; 0] (u32)<op> 0:OK #295/88 reg_bounds_crafted/(s32)0 (u32)<op> [S32_MIN; 0]:OK #295/89 reg_bounds_crafted/(s32)[S32_MIN; 0] (u32)<op> S32_MIN:OK #295/90 reg_bounds_crafted/(s32)S32_MIN (u32)<op> [S32_MIN; 0]:OK #295/91 reg_bounds_crafted/(s32)[S32_MIN; S32_MAX] (u32)<op> S32_MAX:OK #295/92 reg_bounds_crafted/(s32)S32_MAX (u32)<op> [S32_MIN; S32_MAX]:OK #295/93 reg_bounds_crafted/(s64)[0; 0x1f] (u32)<op> [0xffffffff80000000; 0x7fffffff]:OK #295/94 reg_bounds_crafted/(s64)[0xffffffff80000000; 0x7fffffff] (u32)<op> [0; 0x1f]:OK #295/95 reg_bounds_crafted/(s64)[0; 0x1f] (u32)<op> [0xffffffffffff8000; 0x7fff]:OK #295/96 reg_bounds_crafted/(s64)[0xffffffffffff8000; 0x7fff] (u32)<op> [0; 0x1f]:OK #295/97 reg_bounds_crafted/(s64)[0; 0x1f] (u32)<op> [0xffffffffffffff80; 0x7f]:OK #295/98 reg_bounds_crafted/(s64)[0xffffffffffffff80; 0x7f] (u32)<op> [0; 0x1f]:OK #295 reg_bounds_crafted:FAIL
All error logs:
MISMATCH true_reg1.u64: 0x100000000 != [4294967294; 0x100000000] MISMATCH true_reg1.s64: 0x100000000 != [0xfffffffe; 0x100000000] VERIFIER LOG:
========================
func#0 @0
Live regs before insn:
0: .......... (05) goto pc+2
1: .......... (b7) r0 = 0
2: 0......... (95) exit
3: .......... (85) call bpf_get_current_pid_tgid#14
4: 0......... (bf) r6 = r0
5: ......6... (85) call bpf_get_current_pid_tgid#14
6: 0.....6... (bf) r7 = r0
7: ......67.. (18) r1 = 0xfffffffe
9: .1....67.. (18) r2 = 0x100000000
11: .12...67.. (ad) if r6 < r1 goto pc-11
12: ..2...67.. (2d) if r6 > r2 goto pc-12
13: ......67.. (18) r1 = 0x80000000
15: .1....67.. (18) r2 = 0x80000000
17: .12...67.. (ad) if r7 < r1 goto pc-17
18: ..2...67.. (2d) if r7 > r2 goto pc-18
19: ......67.. (bc) w0 = w6
20: ......67.. (bc) w0 = w7
21: ......67.. (ae) if w6 < w7 goto pc+3
22: ......67.. (bc) w0 = w6
23: .......7.. (bc) w0 = w7
24: 0......... (95) exit
25: ......67.. (bc) w0 = w6
26: .......7.. (bc) w0 = w7
27: 0......... (95) exit
0: R1=ctx() R10=fp0
0: (05) goto pc+2
3: (85) call bpf_get_current_pid_tgid#14 ; R0=scalar()
4: (bf) r6 = r0 ; R0=scalar(id=1) R6=scalar(id=1)
5: (85) call bpf_get_current_pid_tgid#14 ; R0=scalar()
6: (bf) r7 = r0 ; R0=scalar(id=2) R7=scalar(id=2)
7: (18) r1 = 0xfffffffe ; R1=0xfffffffe
9: (18) r2 = 0x100000000 ; R2=0x100000000
11: (ad) if r6 < r1 goto pc-11 ; R1=0xfffffffe R6=scalar(id=1,umin=0xfffffffe)
12: (2d) if r6 > r2 goto pc-12 ; R2=0x100000000 R6=scalar(id=1,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff))
13: (18) r1 = 0x80000000 ; R1=0x80000000
15: (18) r2 = 0x80000000 ; R2=0x80000000
17: (ad) if r7 < r1 goto pc-17 ; R1=0x80000000 R7=scalar(id=2,umin=0x80000000)
18: (2d) if r7 > r2 goto pc-18 ; R2=0x80000000 R7=0x80000000
19: (bc) w0 = w6 ; R0=scalar(smin=0,smax=umax=0xffffffff,smin32=-2,smax32=0,var_off=(0x0; 0xffffffff)) R6=scalar(id=1,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff))
20: (bc) w0 = w7 ; R0=0x80000000 R7=0x80000000
21: (ae) if w6 < w7 goto pc+3 ; R6=scalar(id=1,smin=umin=umin32=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x100000001)) R7=0x80000000
22: (bc) w0 = w6 ; R0=scalar(smin=umin=umin32=0xfffffffe,smax=umax=0xffffffff,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x1)) R6=scalar(id=1,smin=umin=umin32=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x100000001))
23: (bc) w0 = w7 ; R0=0x80000000 R7=0x8000000024: (95) exit
from 21 to 25: R0=0x80000000 R1=0x80000000 R2=0x80000000 R6=0x100000000 R7=0x80000000 R10=fp0 25: R0=0x80000000 R1=0x80000000 R2=0x80000000 R6=0x100000000 R7=0x80000000 R10=fp0
25: (bc) w0 = w6 ; R0=0 R6=0x100000000
26: (bc) w0 = w7 ; R0=0x80000000 R7=0x80000000
27: (95) exit
from 18 to 1: R0=scalar(id=2) R1=0x80000000 R2=0x80000000 R6=scalar(id=1,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff)) R7=scalar(id=2,umin=0x80000001) R10=fp0 1: R0=scalar(id=2) R1=0x80000000 R2=0x80000000 R6=scalar(id=1,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff)) R7=scalar(id=2,umin=0x80000001) R10=fp0
1: (b7) r0 = 0 ; R0=0
2: (95) exit
from 17 to 1: R0=scalar(id=2) R1=0x80000000 R2=0x80000000 R6=scalar(id=1,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff)) R7=scalar(id=2,smin=smin32=0,smax=umax=umax32=0x7fffffff,var_off=(0x0; 0x7fffffff)) R10=fp0 1: R0=scalar(id=2) R1=0x80000000 R2=0x80000000 R6=scalar(id=1,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff)) R7=scalar(id=2,smin=smin32=0,smax=umax=umax32=0x7fffffff,var_off=(0x0; 0x7fffffff)) R10=fp0
1: (b7) r0 = 0 ; R0=0
2: (95) exit
from 12 to 1: safe
from 11 to 1: safe
processed 28 insns (limit 1000000) max_states_per_insn 0 total_states 3 peak_states 3 mark_read 0
=====================
ACTUAL FALSE1: scalar(u64=[4294967294; 0x100000000],u32=[4294967294; 4294967295],s64=[0xfffffffe; 0x100000000],s32=[0xfffffffe; 0xffffffff])
EXPECTED FALSE1: scalar(u64=[4294967294; 0x100000000],u32=[4294967294; 4294967295],s64=[0xfffffffe; 0x100000000],s32=[0xfffffffe; 0xffffffff])
ACTUAL FALSE2: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN)
EXPECTED FALSE2: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN)
ACTUAL TRUE1: scalar(u64=0x100000000,u32=0,s64=0x100000000,s32=0)
EXPECTED TRUE1: scalar(u64=[4294967294; 0x100000000],u32=0,s64=[0xfffffffe; 0x100000000],s32=0)
ACTUAL TRUE2: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN)
EXPECTED TRUE2: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN)
verify_case_opt:FAIL:(u64)[4294967294; 0x100000000] (u32)< 2147483648 unexpected error: -22 (errno 22)
#295/37 reg_bounds_crafted/(u64)[4294967294; 0x100000000] (u32)<op> 2147483648:FAIL
MISMATCH false_reg2.u64: 0x100000000 != [4294967294; 0x100000000]
MISMATCH false_reg2.s64: 0x100000000 != [0xfffffffe; 0x100000000]
VERIFIER LOG:
========================
func#0 @0
Live regs before insn:
0: .......... (05) goto pc+2
1: .......... (b7) r0 = 0
2: 0......... (95) exit
3: .......... (85) call bpf_get_current_pid_tgid#14
4: 0......... (bf) r6 = r0
5: ......6... (85) call bpf_get_current_pid_tgid#14
6: 0.....6... (bf) r7 = r0
7: ......67.. (18) r1 = 0x80000000
9: .1....67.. (18) r2 = 0x80000000
11: .12...67.. (ad) if r6 < r1 goto pc-11
12: ..2...67.. (2d) if r6 > r2 goto pc-12
13: ......67.. (18) r1 = 0xfffffffe
15: .1....67.. (18) r2 = 0x100000000
17: .12...67.. (ad) if r7 < r1 goto pc-17
18: ..2...67.. (2d) if r7 > r2 goto pc-18
19: ......67.. (bc) w0 = w6
20: ......67.. (bc) w0 = w7
21: ......67.. (be) if w6 <= w7 goto pc+3
22: ......67.. (bc) w0 = w6
23: .......7.. (bc) w0 = w7
24: 0......... (95) exit
25: ......67.. (bc) w0 = w6
26: .......7.. (bc) w0 = w7
27: 0......... (95) exit
0: R1=ctx() R10=fp0
0: (05) goto pc+2
3: (85) call bpf_get_current_pid_tgid#14 ; R0=scalar()
4: (bf) r6 = r0 ; R0=scalar(id=1) R6=scalar(id=1)
5: (85) call bpf_get_current_pid_tgid#14 ; R0=scalar()
6: (bf) r7 = r0 ; R0=scalar(id=2) R7=scalar(id=2)
7: (18) r1 = 0x80000000 ; R1=0x80000000
9: (18) r2 = 0x80000000 ; R2=0x80000000
11: (ad) if r6 < r1 goto pc-11 ; R1=0x80000000 R6=scalar(id=1,umin=0x80000000)
12: (2d) if r6 > r2 goto pc-12 ; R2=0x80000000 R6=0x80000000
13: (18) r1 = 0xfffffffe ; R1=0xfffffffe
15: (18) r2 = 0x100000000 ; R2=0x100000000
17: (ad) if r7 < r1 goto pc-17 ; R1=0xfffffffe R7=scalar(id=2,umin=0xfffffffe)
18: (2d) if r7 > r2 goto pc-18 ; R2=0x100000000 R7=scalar(id=2,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff))
19: (bc) w0 = w6 ; R0=0x80000000 R6=0x80000000
20: (bc) w0 = w7 ; R0=scalar(smin=0,smax=umax=0xffffffff,smin32=-2,smax32=0,var_off=(0x0; 0xffffffff)) R7=scalar(id=2,smin=umin=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=0,var_off=(0x0; 0x1ffffffff))
21: (be) if w6 <= w7 goto pc+3 ; R6=0x80000000 R7=0x100000000
22: (bc) w0 = w6 ; R0=0x80000000 R6=0x80000000
23: (bc) w0 = w7 ; R0=0 R7=0x10000000024: (95) exit
from 21 to 25: R0=scalar(smin=0,smax=umax=0xffffffff,smin32=-2,smax32=0,var_off=(0x0; 0xffffffff)) R1=0xfffffffe R2=0x100000000 R6=0x80000000 R7=scalar(id=2,smin=umin=umin32=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x100000001)) R10=fp0 25: R0=scalar(smin=0,smax=umax=0xffffffff,smin32=-2,smax32=0,var_off=(0x0; 0xffffffff)) R1=0xfffffffe R2=0x100000000 R6=0x80000000 R7=scalar(id=2,smin=umin=umin32=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x100000001)) R10=fp0
25: (bc) w0 = w6 ; R0=0x80000000 R6=0x80000000
26: (bc) w0 = w7 ; R0=scalar(smin=umin=umin32=0xfffffffe,smax=umax=0xffffffff,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x1)) R7=scalar(id=2,smin=umin=umin32=0xfffffffe,smax=umax=0x100000000,smin32=-2,smax32=-1,var_off=(0xfffffffe; 0x100000001))
27: (95) exit
from 18 to 1: R0=scalar(id=2) R1=0xfffffffe R2=0x100000000 R6=0x80000000 R7=scalar(id=2,umin=0x100000001) R10=fp0 1: R0=scalar(id=2) R1=0xfffffffe R2=0x100000000 R6=0x80000000 R7=scalar(id=2,umin=0x100000001) R10=fp0
1: (b7) r0 = 0 ; R0=0
2: (95) exit
from 17 to 1: R0=scalar(id=2) R1=0xfffffffe R2=0x100000000 R6=0x80000000 R7=scalar(id=2,smin=0,smax=umax=umax32=0xfffffffd,var_off=(0x0; 0xffffffff)) R10=fp0 1: R0=scalar(id=2) R1=0xfffffffe R2=0x100000000 R6=0x80000000 R7=scalar(id=2,smin=0,smax=umax=umax32=0xfffffffd,var_off=(0x0; 0xffffffff)) R10=fp0
1: (b7) r0 = 0 ; R0=0
2: (95) exit
from 12 to 1: safe
from 11 to 1: safe
processed 28 insns (limit 1000000) max_states_per_insn 0 total_states 3 peak_states 3 mark_read 0
=====================
ACTUAL FALSE1: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN)
EXPECTED FALSE1: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN)
ACTUAL FALSE2: scalar(u64=0x100000000,u32=0,s64=0x100000000,s32=0)
EXPECTED FALSE2: scalar(u64=[4294967294; 0x100000000],u32=0,s64=[0xfffffffe; 0x100000000],s32=0)
ACTUAL TRUE1: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN) EXPECTED TRUE1: scalar(u64=2147483648,u32=2147483648,s64=0x80000000,s32=S32_MIN) ACTUAL TRUE2: scalar(u64=[4294967294; 0x100000000],u32=[4294967294; 4294967295],s64=[0xfffffffe; 0x100000000],s32=[0xfffffffe; 0xffffffff]) EXPECTED TRUE2: scalar(u64=[4294967294; 0x100000000],u32=[4294967294; 4294967295],s64=[0xfffffffe; 0x100000000],s32=[0xfffffffe; 0xffffffff])
verify_case_opt:FAIL:(u64)2147483648 (u32)<= [4294967294; 0x100000000] unexpected error: -22 (errno 22) #295/38 reg_bounds_crafted/(u64)2147483648 (u32)<op> [4294967294; 0x100000000]:FAIL
#295 reg_bounds_crafted:FAIL
Summary: 0/96 PASSED, 0 SKIPPED, 1 FAILED
Sasha Levin
maintainerQuoted 9 lines · Shung-Hsi Yu
Hi Sasha,
Quoted 5 lines · Sasha Levin
This is the start of the stable review cycle for the 6.18.17 release. There are 314 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.
Quoted 4 lines
BPF selftest is failing due to backported commit
efc11a667878("bpf:
Improve bounds when tnum has a single possible value"). The fix is commit024cea2d647e("selftests/bpf: Avoid simplification of crafted bounds test"). Can you pick that up for both 6.18 and 6.19?
Will do.
Quoted 2 lines
FWIW this failure does not point to actual issue of the codebase, just that the selftest's expectation not aligning with the kernel.
Great!
Signature · 2 lines
Thanks, Sasha
Quoted 8 lines · On Tue, 10 Mar 2026 07:19:29 -0400 Sasha Levin <[email protected]> wrote:
This is the start of the stable review cycle for the 6.18.17 release. There are 314 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 12 11:19:16 AM UTC 2026. Anything received after that time might be too late.
Boot-tested under QEMU for Rust x86_64, arm64 and riscv64; built-tested for loongarch64:
Thanks!
Cheers,
Miguel