kernel/git/next/linux-next.git/net/ipv6, branch akpmThe linux-next integration testing treehttps://git.landau.one/pub/scm/linux/kernel/git/next/linux-next.git/atom?h=akpm2022-06-28T01:09:17+00:00Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git2022-06-28T01:09:17+00:00Stephen Rothwellsfr@canb.auug.org.au2022-06-28T01:09:17+00:00urn:sha1:8a264bbdb657dfed382360ecb4742b754be86af9ip6mr: convert mrt_lock to a spinlock2022-06-24T10:34:38+00:00Eric Dumazetedumazet@google.com2022-06-23T04:34:49+00:00urn:sha1:a96f7a6a60b310fdb7913d5ae70961eeeca9527d
mrt_lock is only held in write mode, from process context only.
We can switch to a mere spinlock, and avoid blocking BH.
Also, vif_dev_read() is always called under standard rcu_read_lock().
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
ipmr: convert /proc handlers to rcu_read_lock()2022-06-24T10:34:38+00:00Eric Dumazetedumazet@google.com2022-06-23T04:34:47+00:00urn:sha1:b96ef16d2f837870daaea51c38cd50458b95ad5c
We can use standard rcu_read_lock(), to get rid
of last read_lock(&mrt_lock) call points.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
ipmr: adopt rcu_read_lock() in mr_dump()2022-06-24T10:34:38+00:00Eric Dumazetedumazet@google.com2022-06-23T04:34:46+00:00urn:sha1:194366b28b8306b7a24596c57c09635ab2891252
We no longer need to acquire mrt_lock() in mr_dump,
using rcu_read_lock() is enough.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
ip6mr: switch ip6mr_get_route() to rcu_read_lock()2022-06-24T10:34:38+00:00Eric Dumazetedumazet@google.com2022-06-23T04:34:45+00:00urn:sha1:6fa40a29021976c91b6ad720285bdfd4410aaa34
Like ipmr_get_route(), we can use standard RCU here.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
ip6mr: do not acquire mrt_lock while calling ip6_mr_forward()2022-06-24T10:34:37+00:00Eric Dumazetedumazet@google.com2022-06-23T04:34:44+00:00urn:sha1:9b1c21d898fdcab75c47c9827b6ded526eb33a18
ip6_mr_forward() uses standard RCU protection already.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
ip6mr: do not acquire mrt_lock before calling ip6mr_cache_unresolved2022-06-24T10:34:37+00:00Eric Dumazetedumazet@google.com2022-06-23T04:34:43+00:00urn:sha1:db9eb7c8ae34c4acdb8a94c3566d1b4f4b5e7b1c
rcu_read_lock() protection is good enough.
ip6mr_cache_unresolved() uses a dedicated spinlock (mfc_unres_lock)
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
ip6mr: do not acquire mrt_lock in ioctl(SIOCGETMIFCNT_IN6)2022-06-24T10:34:37+00:00Eric Dumazetedumazet@google.com2022-06-23T04:34:42+00:00urn:sha1:638cf4a24a09d14c51415dd0964f978f97d54642
rcu_read_lock() protection is good enough.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
ip6mr: do not acquire mrt_lock in pim6_rcv()2022-06-24T10:34:37+00:00Eric Dumazetedumazet@google.com2022-06-23T04:34:41+00:00urn:sha1:6d08658736fc8b4baae778a7f51d2c7baa47eeff
rcu_read_lock() protection is more than enough.
vif_dev_read() supports either mrt_lock or rcu_read_lock().
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
ip6mr: ip6mr_cache_report() changes2022-06-24T10:34:37+00:00Eric Dumazetedumazet@google.com2022-06-23T04:34:40+00:00urn:sha1:3493a5b730e5c0dfecb445e56a4ad36a36819ba9
ip6mr_cache_report() first argument can be marked const, and we change
the caller convention about which lock needs to be held.
Instead of read_lock(&mrt_lock), we can use rcu_read_lock().
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>