linux.git/drivers/net/ipvlan/ipvlan_core.c, branch v6.16

net: ipvlan: remove __get_unaligned_cpu32 from ipvlan driver

2025-04-10T00:29:14+00:00

The __get_unaligned_cpu32 function is deprecated. So, replace it with
the more generic get_unaligned and just cast the input parameter.

Signed-off-by: Julian Vetter 
Link: https://patch.msgid.link/20250408091946.2266271-1-julian@outer-limits.org
Signed-off-by: Jakub Kicinski

ipvlan: ensure network headers are in skb linear part

2025-02-22T00:29:50+00:00

syzbot found that ipvlan_process_v6_outbound() was assuming
the IPv6 network header isis present in skb->head [1]

Add the needed pskb_network_may_pull() calls for both
IPv4 and IPv6 handlers.

[1]
BUG: KMSAN: uninit-value in __ipv6_addr_type+0xa2/0x490 net/ipv6/addrconf_core.c:47
  __ipv6_addr_type+0xa2/0x490 net/ipv6/addrconf_core.c:47
  ipv6_addr_type include/net/ipv6.h:555 [inline]
  ip6_route_output_flags_noref net/ipv6/route.c:2616 [inline]
  ip6_route_output_flags+0x51/0x720 net/ipv6/route.c:2651
  ip6_route_output include/net/ip6_route.h:93 [inline]
  ipvlan_route_v6_outbound+0x24e/0x520 drivers/net/ipvlan/ipvlan_core.c:476
  ipvlan_process_v6_outbound drivers/net/ipvlan/ipvlan_core.c:491 [inline]
  ipvlan_process_outbound drivers/net/ipvlan/ipvlan_core.c:541 [inline]
  ipvlan_xmit_mode_l3 drivers/net/ipvlan/ipvlan_core.c:605 [inline]
  ipvlan_queue_xmit+0xd72/0x1780 drivers/net/ipvlan/ipvlan_core.c:671
  ipvlan_start_xmit+0x5b/0x210 drivers/net/ipvlan/ipvlan_main.c:223
  __netdev_start_xmit include/linux/netdevice.h:5150 [inline]
  netdev_start_xmit include/linux/netdevice.h:5159 [inline]
  xmit_one net/core/dev.c:3735 [inline]
  dev_hard_start_xmit+0x247/0xa20 net/core/dev.c:3751
  sch_direct_xmit+0x399/0xd40 net/sched/sch_generic.c:343
  qdisc_restart net/sched/sch_generic.c:408 [inline]
  __qdisc_run+0x14da/0x35d0 net/sched/sch_generic.c:416
  qdisc_run+0x141/0x4d0 include/net/pkt_sched.h:127
  net_tx_action+0x78b/0x940 net/core/dev.c:5484
  handle_softirqs+0x1a0/0x7c0 kernel/softirq.c:561
  __do_softirq+0x14/0x1a kernel/softirq.c:595
  do_softirq+0x9a/0x100 kernel/softirq.c:462
  __local_bh_enable_ip+0x9f/0xb0 kernel/softirq.c:389
  local_bh_enable include/linux/bottom_half.h:33 [inline]
  rcu_read_unlock_bh include/linux/rcupdate.h:919 [inline]
  __dev_queue_xmit+0x2758/0x57d0 net/core/dev.c:4611
  dev_queue_xmit include/linux/netdevice.h:3311 [inline]
  packet_xmit+0x9c/0x6c0 net/packet/af_packet.c:276
  packet_snd net/packet/af_packet.c:3132 [inline]
  packet_sendmsg+0x93e0/0xa7e0 net/packet/af_packet.c:3164
  sock_sendmsg_nosec net/socket.c:718 [inline]

Fixes: 2ad7bf363841 ("ipvlan: Initial check-in of the IPVLAN driver.")
Reported-by: syzbot+93ab4a777bafb9d9f960@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/netdev/67b74f01.050a0220.14d86d.02d8.GAE@google.com/T/#u
Signed-off-by: Eric Dumazet 
Cc: Mahesh Bandewar 
Link: https://patch.msgid.link/20250220155336.61884-1-edumazet@google.com
Signed-off-by: Jakub Kicinski

ipvlan: Prepare ipvlan_process_v4_outbound() to future .flowi4_tos conversion.

2024-11-03T22:28:37+00:00

Use ip4h_dscp() to get the DSCP from the IPv4 header, then convert the
dscp_t value to __u8 with inet_dscp_to_dsfield().

Then, when we'll convert .flowi4_tos to dscp_t, we'll just have to drop
the inet_dscp_to_dsfield() call.

Signed-off-by: Guillaume Nault 
Reviewed-by: Ido Schimmel 
Link: https://patch.msgid.link/f48335504a05b3587e0081a9b4511e0761571ca5.1730292157.git.gnault@redhat.com
Signed-off-by: Jakub Kicinski

ipvlan: Unmask upper DSCP bits in ipvlan_process_v4_outbound()

2024-08-31T16:44:51+00:00

Unmask the upper DSCP bits when calling ip_route_output_flow() so that
in the future it could perform the FIB lookup according to the full DSCP
value.

Signed-off-by: Ido Schimmel 
Reviewed-by: Guillaume Nault 
Signed-off-by: David S. Miller

ipvlan: Dont Use skb->sk in ipvlan_process_v{4,6}_outbound

2024-05-30T10:05:52+00:00

Raw packet from PF_PACKET socket ontop of an IPv6-backed ipvlan device will
hit WARN_ON_ONCE() in sk_mc_loop() through sch_direct_xmit() path.

WARNING: CPU: 2 PID: 0 at net/core/sock.c:775 sk_mc_loop+0x2d/0x70
Modules linked in: sch_netem ipvlan rfkill cirrus drm_shmem_helper sg drm_kms_helper
CPU: 2 PID: 0 Comm: swapper/2 Kdump: loaded Not tainted 6.9.0+ #279
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014
RIP: 0010:sk_mc_loop+0x2d/0x70
Code: fa 0f 1f 44 00 00 65 0f b7 15 f7 96 a3 4f 31 c0 66 85 d2 75 26 48 85 ff 74 1c
RSP: 0018:ffffa9584015cd78 EFLAGS: 00010212
RAX: 0000000000000011 RBX: ffff91e585793e00 RCX: 0000000002c6a001
RDX: 0000000000000000 RSI: 0000000000000040 RDI: ffff91e589c0f000
RBP: ffff91e5855bd100 R08: 0000000000000000 R09: 3d00545216f43d00
R10: ffff91e584fdcc50 R11: 00000060dd8616f4 R12: ffff91e58132d000
R13: ffff91e584fdcc68 R14: ffff91e5869ce800 R15: ffff91e589c0f000
FS:  0000000000000000(0000) GS:ffff91e898100000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f788f7c44c0 CR3: 0000000008e1a000 CR4: 00000000000006f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:

 ? __warn (kernel/panic.c:693)
 ? sk_mc_loop (net/core/sock.c:760)
 ? report_bug (lib/bug.c:201 lib/bug.c:219)
 ? handle_bug (arch/x86/kernel/traps.c:239)
 ? exc_invalid_op (arch/x86/kernel/traps.c:260 (discriminator 1))
 ? asm_exc_invalid_op (./arch/x86/include/asm/idtentry.h:621)
 ? sk_mc_loop (net/core/sock.c:760)
 ip6_finish_output2 (net/ipv6/ip6_output.c:83 (discriminator 1))
 ? nf_hook_slow (net/netfilter/core.c:626)
 ip6_finish_output (net/ipv6/ip6_output.c:222)
 ? __pfx_ip6_finish_output (net/ipv6/ip6_output.c:215)
 ipvlan_xmit_mode_l3 (drivers/net/ipvlan/ipvlan_core.c:602) ipvlan
 ipvlan_start_xmit (drivers/net/ipvlan/ipvlan_main.c:226) ipvlan
 dev_hard_start_xmit (net/core/dev.c:3594)
 sch_direct_xmit (net/sched/sch_generic.c:343)
 __qdisc_run (net/sched/sch_generic.c:416)
 net_tx_action (net/core/dev.c:5286)
 handle_softirqs (kernel/softirq.c:555)
 __irq_exit_rcu (kernel/softirq.c:589)
 sysvec_apic_timer_interrupt (arch/x86/kernel/apic/apic.c:1043)

The warning triggers as this:
packet_sendmsg
   packet_snd //skb->sk is packet sk
      __dev_queue_xmit
         __dev_xmit_skb //q->enqueue is not NULL
             __qdisc_run
               sch_direct_xmit
                 dev_hard_start_xmit
                   ipvlan_start_xmit
                      ipvlan_xmit_mode_l3 //l3 mode
                        ipvlan_process_outbound //vepa flag
                          ipvlan_process_v6_outbound
                            ip6_local_out
                                __ip6_finish_output
                                  ip6_finish_output2 //multicast packet
                                    sk_mc_loop //sk->sk_family is AF_PACKET

Call ip{6}_local_out() with NULL sk in ipvlan as other tunnels to fix this.

Fixes: 2ad7bf363841 ("ipvlan: Initial check-in of the IPVLAN driver.")
Suggested-by: Eric Dumazet 
Signed-off-by: Yue Haibing 
Reviewed-by: Eric Dumazet 
Link: https://lore.kernel.org/r/20240529095633.613103-1-yuehaibing@huawei.com
Signed-off-by: Paolo Abeni

ipvlan: add ipvlan_route_v6_outbound() helper

2023-11-10T10:59:22+00:00

Inspired by syzbot reports using a stack of multiple ipvlan devices.

Reduce stack size needed in ipvlan_process_v6_outbound() by moving
the flowi6 struct used for the route lookup in an non inlined
helper. ipvlan_route_v6_outbound() needs 120 bytes on the stack,
immediately reclaimed.

Also make sure ipvlan_process_v4_outbound() is not inlined.

We might also have to lower MAX_NEST_DEV, because only syzbot uses
setups with more than four stacked devices.

BUG: TASK stack guard page was hit at ffffc9000e803ff8 (stack is ffffc9000e804000..ffffc9000e808000)
stack guard page: 0000 [#1] SMP KASAN
CPU: 0 PID: 13442 Comm: syz-executor.4 Not tainted 6.1.52-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/09/2023
RIP: 0010:kasan_check_range+0x4/0x2a0 mm/kasan/generic.c:188
Code: 48 01 c6 48 89 c7 e8 db 4e c1 03 31 c0 5d c3 cc 0f 0b eb 02 0f 0b b8 ea ff ff ff 5d c3 cc 00 00 cc cc 00 00 cc cc 55 48 89 e5 <41> 57 41 56 41 55 41 54 53 b0 01 48 85 f6 0f 84 a4 01 00 00 48 89
RSP: 0018:ffffc9000e804000 EFLAGS: 00010246
RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffffff817e5bf2
RDX: 0000000000000000 RSI: 0000000000000008 RDI: ffffffff887c6568
RBP: ffffc9000e804000 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: dffffc0000000001 R12: 1ffff92001d0080c
R13: dffffc0000000000 R14: ffffffff87e6b100 R15: 0000000000000000
FS: 00007fd0c55826c0(0000) GS:ffff8881f6800000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: ffffc9000e803ff8 CR3: 0000000170ef7000 CR4: 00000000003506f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<#DF>


[] __kasan_check_read+0x11/0x20 mm/kasan/shadow.c:31
[] instrument_atomic_read include/linux/instrumented.h:72 [inline]
[] _test_bit include/asm-generic/bitops/instrumented-non-atomic.h:141 [inline]
[] cpumask_test_cpu include/linux/cpumask.h:506 [inline]
[] cpu_online include/linux/cpumask.h:1092 [inline]
[] trace_lock_acquire include/trace/events/lock.h:24 [inline]
[] lock_acquire+0xe2/0x590 kernel/locking/lockdep.c:5632
[] rcu_lock_acquire+0x2e/0x40 include/linux/rcupdate.h:306
[] rcu_read_lock include/linux/rcupdate.h:747 [inline]
[] ip6_pol_route+0x15d/0x1440 net/ipv6/route.c:2221
[] ip6_pol_route_output+0x50/0x80 net/ipv6/route.c:2606
[] pol_lookup_func include/net/ip6_fib.h:584 [inline]
[] fib6_rule_lookup+0x265/0x620 net/ipv6/fib6_rules.c:116
[] ip6_route_output_flags_noref+0x2d9/0x3a0 net/ipv6/route.c:2638
[] ip6_route_output_flags+0xca/0x340 net/ipv6/route.c:2651
[] ip6_route_output include/net/ip6_route.h:100 [inline]
[] ipvlan_process_v6_outbound drivers/net/ipvlan/ipvlan_core.c:473 [inline]
[] ipvlan_process_outbound drivers/net/ipvlan/ipvlan_core.c:529 [inline]
[] ipvlan_xmit_mode_l3 drivers/net/ipvlan/ipvlan_core.c:602 [inline]
[] ipvlan_queue_xmit+0xc33/0x1be0 drivers/net/ipvlan/ipvlan_core.c:677
[] ipvlan_start_xmit+0x49/0x100 drivers/net/ipvlan/ipvlan_main.c:229
[] netdev_start_xmit include/linux/netdevice.h:4966 [inline]
[] xmit_one net/core/dev.c:3644 [inline]
[] dev_hard_start_xmit+0x320/0x980 net/core/dev.c:3660
[] __dev_queue_xmit+0x16b2/0x3370 net/core/dev.c:4324
[] dev_queue_xmit include/linux/netdevice.h:3067 [inline]
[] neigh_hh_output include/net/neighbour.h:529 [inline]
[] neigh_output include/net/neighbour.h:543 [inline]
[] ip6_finish_output2+0x160d/0x1ae0 net/ipv6/ip6_output.c:139
[] __ip6_finish_output net/ipv6/ip6_output.c:200 [inline]
[] ip6_finish_output+0x6c6/0xb10 net/ipv6/ip6_output.c:211
[] NF_HOOK_COND include/linux/netfilter.h:298 [inline]
[] ip6_output+0x2bc/0x3d0 net/ipv6/ip6_output.c:232
[] dst_output include/net/dst.h:444 [inline]
[] ip6_local_out+0x10f/0x140 net/ipv6/output_core.c:161
[] ipvlan_process_v6_outbound drivers/net/ipvlan/ipvlan_core.c:483 [inline]
[] ipvlan_process_outbound drivers/net/ipvlan/ipvlan_core.c:529 [inline]
[] ipvlan_xmit_mode_l3 drivers/net/ipvlan/ipvlan_core.c:602 [inline]
[] ipvlan_queue_xmit+0x1174/0x1be0 drivers/net/ipvlan/ipvlan_core.c:677
[] ipvlan_start_xmit+0x49/0x100 drivers/net/ipvlan/ipvlan_main.c:229
[] netdev_start_xmit include/linux/netdevice.h:4966 [inline]
[] xmit_one net/core/dev.c:3644 [inline]
[] dev_hard_start_xmit+0x320/0x980 net/core/dev.c:3660
[] __dev_queue_xmit+0x16b2/0x3370 net/core/dev.c:4324
[] dev_queue_xmit include/linux/netdevice.h:3067 [inline]
[] neigh_hh_output include/net/neighbour.h:529 [inline]
[] neigh_output include/net/neighbour.h:543 [inline]
[] ip6_finish_output2+0x160d/0x1ae0 net/ipv6/ip6_output.c:139
[] __ip6_finish_output net/ipv6/ip6_output.c:200 [inline]
[] ip6_finish_output+0x6c6/0xb10 net/ipv6/ip6_output.c:211
[] NF_HOOK_COND include/linux/netfilter.h:298 [inline]
[] ip6_output+0x2bc/0x3d0 net/ipv6/ip6_output.c:232
[] dst_output include/net/dst.h:444 [inline]
[] ip6_local_out+0x10f/0x140 net/ipv6/output_core.c:161
[] ipvlan_process_v6_outbound drivers/net/ipvlan/ipvlan_core.c:483 [inline]
[] ipvlan_process_outbound drivers/net/ipvlan/ipvlan_core.c:529 [inline]
[] ipvlan_xmit_mode_l3 drivers/net/ipvlan/ipvlan_core.c:602 [inline]
[] ipvlan_queue_xmit+0x1174/0x1be0 drivers/net/ipvlan/ipvlan_core.c:677
[] ipvlan_start_xmit+0x49/0x100 drivers/net/ipvlan/ipvlan_main.c:229
[] netdev_start_xmit include/linux/netdevice.h:4966 [inline]
[] xmit_one net/core/dev.c:3644 [inline]
[] dev_hard_start_xmit+0x320/0x980 net/core/dev.c:3660
[] __dev_queue_xmit+0x16b2/0x3370 net/core/dev.c:4324
[] dev_queue_xmit include/linux/netdevice.h:3067 [inline]
[] neigh_hh_output include/net/neighbour.h:529 [inline]
[] neigh_output include/net/neighbour.h:543 [inline]
[] ip6_finish_output2+0x160d/0x1ae0 net/ipv6/ip6_output.c:139
[] __ip6_finish_output net/ipv6/ip6_output.c:200 [inline]
[] ip6_finish_output+0x6c6/0xb10 net/ipv6/ip6_output.c:211
[] NF_HOOK_COND include/linux/netfilter.h:298 [inline]
[] ip6_output+0x2bc/0x3d0 net/ipv6/ip6_output.c:232
[] dst_output include/net/dst.h:444 [inline]
[] ip6_local_out+0x10f/0x140 net/ipv6/output_core.c:161
[] ipvlan_process_v6_outbound drivers/net/ipvlan/ipvlan_core.c:483 [inline]
[] ipvlan_process_outbound drivers/net/ipvlan/ipvlan_core.c:529 [inline]
[] ipvlan_xmit_mode_l3 drivers/net/ipvlan/ipvlan_core.c:602 [inline]
[] ipvlan_queue_xmit+0x1174/0x1be0 drivers/net/ipvlan/ipvlan_core.c:677
[] ipvlan_start_xmit+0x49/0x100 drivers/net/ipvlan/ipvlan_main.c:229
[] netdev_start_xmit include/linux/netdevice.h:4966 [inline]
[] xmit_one net/core/dev.c:3644 [inline]
[] dev_hard_start_xmit+0x320/0x980 net/core/dev.c:3660
[] __dev_queue_xmit+0x16b2/0x3370 net/core/dev.c:4324
[] dev_queue_xmit include/linux/netdevice.h:3067 [inline]
[] neigh_hh_output include/net/neighbour.h:529 [inline]
[] neigh_output include/net/neighbour.h:543 [inline]
[] ip6_finish_output2+0x160d/0x1ae0 net/ipv6/ip6_output.c:139
[] __ip6_finish_output net/ipv6/ip6_output.c:200 [inline]
[] ip6_finish_output+0x6c6/0xb10 net/ipv6/ip6_output.c:211
[] NF_HOOK_COND include/linux/netfilter.h:298 [inline]
[] ip6_output+0x2bc/0x3d0 net/ipv6/ip6_output.c:232
[] dst_output include/net/dst.h:444 [inline]
[] ip6_local_out+0x10f/0x140 net/ipv6/output_core.c:161
[] ipvlan_process_v6_outbound drivers/net/ipvlan/ipvlan_core.c:483 [inline]
[] ipvlan_process_outbound drivers/net/ipvlan/ipvlan_core.c:529 [inline]
[] ipvlan_xmit_mode_l3 drivers/net/ipvlan/ipvlan_core.c:602 [inline]
[] ipvlan_queue_xmit+0x1174/0x1be0 drivers/net/ipvlan/ipvlan_core.c:677
[] ipvlan_start_xmit+0x49/0x100 drivers/net/ipvlan/ipvlan_main.c:229
[] netdev_start_xmit include/linux/netdevice.h:4966 [inline]
[] xmit_one net/core/dev.c:3644 [inline]
[] dev_hard_start_xmit+0x320/0x980 net/core/dev.c:3660
[] __dev_queue_xmit+0x16b2/0x3370 net/core/dev.c:4324
[] dev_queue_xmit include/linux/netdevice.h:3067 [inline]
[] neigh_resolve_output+0x64e/0x750 net/core/neighbour.c:1560
[] neigh_output include/net/neighbour.h:545 [inline]
[] ip6_finish_output2+0x1643/0x1ae0 net/ipv6/ip6_output.c:139
[] __ip6_finish_output net/ipv6/ip6_output.c:200 [inline]
[] ip6_finish_output+0x6c6/0xb10 net/ipv6/ip6_output.c:211
[] NF_HOOK_COND include/linux/netfilter.h:298 [inline]
[] ip6_output+0x2bc/0x3d0 net/ipv6/ip6_output.c:232
[] dst_output include/net/dst.h:444 [inline]
[] NF_HOOK include/linux/netfilter.h:309 [inline]
[] ip6_xmit+0x11a4/0x1b20 net/ipv6/ip6_output.c:352
[] sctp_v6_xmit+0x9ae/0x1230 net/sctp/ipv6.c:250
[] sctp_packet_transmit+0x25de/0x2bc0 net/sctp/output.c:653
[] sctp_packet_singleton+0x202/0x310 net/sctp/outqueue.c:783
[] sctp_outq_flush_ctrl net/sctp/outqueue.c:914 [inline]
[] sctp_outq_flush+0x661/0x3d40 net/sctp/outqueue.c:1212
[] sctp_outq_uncork+0x79/0xb0 net/sctp/outqueue.c:764
[] sctp_side_effects net/sctp/sm_sideeffect.c:1199 [inline]
[] sctp_do_sm+0x55c0/0x5c30 net/sctp/sm_sideeffect.c:1170
[] sctp_primitive_ASSOCIATE+0x97/0xc0 net/sctp/primitive.c:73
[] sctp_sendmsg_to_asoc+0xf62/0x17b0 net/sctp/socket.c:1839
[] sctp_sendmsg+0x212e/0x33b0 net/sctp/socket.c:2029
[] inet_sendmsg+0x149/0x310 net/ipv4/af_inet.c:849
[] sock_sendmsg_nosec net/socket.c:716 [inline]
[] sock_sendmsg net/socket.c:736 [inline]
[] ____sys_sendmsg+0x572/0x8c0 net/socket.c:2504
[] ___sys_sendmsg net/socket.c:2558 [inline]
[] __sys_sendmsg+0x271/0x360 net/socket.c:2587
[] __do_sys_sendmsg net/socket.c:2596 [inline]
[] __se_sys_sendmsg net/socket.c:2594 [inline]
[] __x64_sys_sendmsg+0x7f/0x90 net/socket.c:2594
[] do_syscall_x64 arch/x86/entry/common.c:51 [inline]
[] do_syscall_64+0x53/0x80 arch/x86/entry/common.c:84
[] entry_SYSCALL_64_after_hwframe+0x63/0xcd

Fixes: 2ad7bf363841 ("ipvlan: Initial check-in of the IPVLAN driver.")
Reported-by: syzbot 
Signed-off-by: Eric Dumazet 
Cc: Mahesh Bandewar 
Cc: Willem de Bruijn 
Reviewed-by: Willem de Bruijn 
Signed-off-by: David S. Miller

ipvlan: properly track tx_errors

2023-10-27T21:49:09+00:00

Both ipvlan_process_v4_outbound() and ipvlan_process_v6_outbound()
increment dev->stats.tx_errors in case of errors.

Unfortunately there are two issues :

1) ipvlan_get_stats64() does not propagate dev->stats.tx_errors to user.

2) Increments are not atomic. KCSAN would complain eventually.

Use DEV_STATS_INC() to not miss an update, and change ipvlan_get_stats64()
to copy the value back to user.

Fixes: 2ad7bf363841 ("ipvlan: Initial check-in of the IPVLAN driver.")
Signed-off-by: Eric Dumazet 
Cc: Mahesh Bandewar 
Link: https://lore.kernel.org/r/20231026131446.3933175-1-edumazet@google.com
Signed-off-by: Jakub Kicinski

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2023-06-27T16:45:22+00:00

Merge in late fixes to prepare for the 6.5 net-next PR.

Signed-off-by: Jakub Kicinski

ipvlan: Fix return value of ipvlan_queue_xmit()

2023-06-27T09:44:46+00:00

ipvlan_queue_xmit() should return NET_XMIT_XXX, but
ipvlan_xmit_mode_l2/l3() returns rx_handler_result_t or NET_RX_XXX
in some cases. ipvlan_rcv_frame() will only return RX_HANDLER_CONSUMED
in ipvlan_xmit_mode_l2/l3() because 'local' is true. It's equal to
NET_XMIT_SUCCESS. But dev_forward_skb() can return NET_RX_SUCCESS or
NET_RX_DROP, and returning NET_RX_DROP(NET_XMIT_DROP) will increase
both ipvlan and ipvlan->phy_dev drops counter.

The skb to forward can be treated as xmitted successfully. This patch
makes ipvlan_queue_xmit() return NET_XMIT_SUCCESS for forward skb.

Fixes: 2ad7bf363841 ("ipvlan: Initial check-in of the IPVLAN driver.")
Signed-off-by: Cambda Zhu 
Link: https://lore.kernel.org/r/20230626093347.7492-1-cambda@linux.alibaba.com
Signed-off-by: Paolo Abeni

ipvlan: Remove NULL check before dev_{put, hold}

2023-05-12T07:56:57+00:00

The call netdev_{put, hold} of dev_{put, hold} will check NULL,
so there is no need to check before using dev_{put, hold},
remove it to silence the warning:

./drivers/net/ipvlan/ipvlan_core.c:559:3-11: WARNING: NULL check before dev_{put, hold} functions is not needed.

Reported-by: Abaci Robot 
Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=4930
Signed-off-by: Yang Li 
Reviewed-by: Simon Horman 
Signed-off-by: David S. Miller