openstlinux/linux-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
6f62d2d396f166a6ea00aec9e00e2a2e76b76249
linux-st/net
History
Matthieu Baerts 9f291f2348 hsr: ratelimit only when errors are printed 
commit 1b0120e4db0bf2838d1ce741195ce4b7cc100b91 upstream.

Recently, when automatically merging -net and net-next in MPTCP devel
tree, our CI reported [1] a conflict in hsr, the same as the one
reported by Stephen in netdev [2].

When looking at the conflict, I noticed it is in fact the v1 [3] that
has been applied in -net and the v2 [4] in net-next. Maybe the v1 was
applied by accident.

As mentioned by Jakub Kicinski [5], the new condition makes more sense
before the net_ratelimit(), not to update net_ratelimit's state which is
unnecessary if we're not going to print either way.

Here, this modification applies the v2 but in -net.

Link: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/4423171069 [1]
Link: https://lore.kernel.org/netdev/20230315100914.53fc1760@canb.auug.org.au/ [2]
Link: https://lore.kernel.org/netdev/20230307133229.127442-1-koverskeid@gmail.com/ [3]
Link: https://lore.kernel.org/netdev/20230309092302.179586-1-koverskeid@gmail.com/ [4]
Link: https://lore.kernel.org/netdev/20230308232001.2fb62013@kernel.org/ [5]
Fixes: 28e8cabe80f3 ("net: hsr: Don't log netdev_err message on unknown prp dst node")
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
Link: https://lore.kernel.org/r/20230315-net-20230315-hsr_framereg-ratelimit-v1-1-61d2ef176d11@tessares.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2023-04-06 12:10:58 +02:00
..
6lowpan
…
9p
net/9p: fix bug in client create for .L
2023-03-22 13:33:54 +01:00
802
…
8021q
…
appletalk
…
atm
…
ax25
…
batman-adv
…
bluetooth
Bluetooth: Fix race condition in hci_cmd_sync_clear
2023-03-30 12:49:22 +02:00
bpf
Revert "bpf, test_run: fix &xdp_frame misplacement for LIVE_FRAMES"
2023-03-17 08:50:32 +01:00
bpfilter
…
bridge
netfilter: ebtables: fix table blob use-after-free
2023-03-11 13:55:24 +01:00
caif
net: caif: Fix use-after-free in cfusbl_device_notify()
2023-03-17 08:50:24 +01:00
can
can: j1939: prevent deadlock by moving j1939_sk_errqueue()
2023-04-06 12:10:52 +02:00
ceph
use less confusing names for iov_iter direction initializers
2023-02-09 11:28:04 +01:00
core
net: use indirect calls helpers for sk_exit_memory_pressure()
2023-03-17 08:50:24 +01:00
dcb
…
dccp
dccp/tcp: Avoid negative sk_forward_alloc by ipv6_pinfo.pktoptions.
2023-02-22 12:59:52 +01:00
dns_resolver
…
dsa
net: dsa: tag_brcm: legacy: fix daisy-chained switches
2023-03-30 12:49:09 +02:00
ethernet
…
ethtool
…
hsr
hsr: ratelimit only when errors are printed
2023-04-06 12:10:58 +02:00
ieee802154
…
ife
…
ipv4
erspan: do not use skb_mac_header() in ndo_start_xmit()
2023-03-30 12:49:09 +02:00
ipv6
erspan: do not use skb_mac_header() in ndo_start_xmit()
2023-03-30 12:49:09 +02:00
iucv
net/iucv: Fix size of interrupt data
2023-03-22 13:33:50 +01:00
kcm
…
key
…
l2tp
l2tp: Avoid possible recursive deadlock in l2tp_tunnel_register()
2023-03-10 09:33:07 +01:00
l3mdev
…
lapb
…
llc
…
mac80211
wifi: mac80211: fix qos on mesh interfaces
2023-03-30 12:49:27 +02:00
mac802154
…
mctp
net: mctp: purge receive queues on sk destruction
2023-02-06 08:06:34 +01:00
mpls
net: mpls: fix stale pointer if allocation fails during device rename
2023-02-22 12:59:53 +01:00
mptcp
mptcp: fix UaF in listener shutdown
2023-03-30 12:49:00 +02:00
ncsi
…
netfilter
netfilter: nft_redir: correct value of inet type .maxattrs
2023-03-22 13:33:42 +01:00
netlabel
…
netlink
netlink: annotate data races around sk_state
2023-02-01 08:34:45 +01:00
netrom
netrom: Fix use-after-free caused by accept on already connected socket
2023-02-09 11:28:06 +01:00
nfc
nfc: change order inside nfc_se_io error path
2023-03-17 08:50:17 +01:00
nsh
…
openvswitch
net: openvswitch: fix possible memory leak in ovs_meter_cmd_set()
2023-02-22 12:59:52 +01:00
packet
…
phonet
…
psample
…
qrtr
net: qrtr: free memory on error path in radix_tree_insert()
2023-02-09 11:28:15 +01:00
rds
rds: rds_rm_zerocopy_callback() correct order for list_add_tail()
2023-03-10 09:33:02 +01:00
rfkill
…
rose
net/rose: Fix to not accept on connected socket
2023-02-22 12:59:42 +01:00
rxrpc
…
sched
act_mirred: use the backlog for nested calls to mirred ingress
2023-03-30 12:49:20 +02:00
sctp
sctp: add a refcnt in sctp_stream_priorities to avoid a nested loop
2023-03-11 13:55:26 +01:00
smc
net/smc: fix deadlock triggered by cancel_delayed_work_syn()
2023-03-22 13:33:47 +01:00
strparser
…
sunrpc
SUNRPC: fix shutdown of NFS TCP client socket
2023-04-06 12:10:44 +02:00
switchdev
…
tipc
tipc: fix kernel warning when sending SYN message
2023-02-22 12:59:53 +01:00
tls
net: tls: fix device-offloaded sendpage straddling records
2023-03-17 08:50:26 +01:00
unix
af_unix: fix struct pid leaks in OOB support
2023-03-17 08:50:28 +01:00
vmw_vsock
…
wireless
wifi: cfg80211: fix MLO connection ownership
2023-03-22 13:33:43 +01:00
x25
net/x25: Fix to not accept on connected socket
2023-02-09 11:28:13 +01:00
xdp
xsk: Add missing overflow check in xdp_umem_reg
2023-03-30 12:49:02 +02:00
xfrm
xfrm: Zero padding when dumping algos and encap
2023-04-06 12:10:37 +02:00
compat.c
use less confusing names for iov_iter direction initializers
2023-02-09 11:28:04 +01:00
devres.c
…
Kconfig
…
Kconfig.debug
…
Makefile
…
socket.c
net: avoid double iput when sock_alloc_file fails
2023-03-10 09:34:34 +01:00
sysctl_net.c
…