* [PATCH net] net: bridge: mcast: Associate the seqcount with its protecting lock.
@ 2021-09-28 14:10 ` Sebastian Andrzej Siewior
0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Andrzej Siewior @ 2021-09-28 14:10 UTC (permalink / raw)
To: bridge, netdev
Cc: Roopa Prabhu, Nikolay Aleksandrov, David S. Miller,
Jakub Kicinski, Thomas Gleixner, Mike Galbraith,
Sebastian Andrzej Siewior
From: Thomas Gleixner <tglx@linutronix.de>
The sequence count bridge_mcast_querier::seq is protected by
net_bridge::multicast_lock but seqcount_init() does not associate the
seqcount with the lock. This leads to a warning on PREEMPT_RT because
preemption is still enabled.
Let seqcount_init() associate the seqcount with lock that protects the
write section. Remove lockdep_assert_held_once() because lockdep already checks
whether the associated lock is held.
Fixes: 67b746f94ff39 ("net: bridge: mcast: make sure querier port/address updates are consistent")
Reported-by: Mike Galbraith <efault@gmx.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Tested-by: Mike Galbraith <efault@gmx.de>
---
net/bridge/br_multicast.c | 6 ++----
net/bridge/br_private.h | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1677,8 +1677,6 @@ static void br_multicast_update_querier(
int ifindex,
struct br_ip *saddr)
{
- lockdep_assert_held_once(&brmctx->br->multicast_lock);
-
write_seqcount_begin(&querier->seq);
querier->port_ifidx = ifindex;
memcpy(&querier->addr, saddr, sizeof(*saddr));
@@ -3867,13 +3865,13 @@ void br_multicast_ctx_init(struct net_br
brmctx->ip4_other_query.delay_time = 0;
brmctx->ip4_querier.port_ifidx = 0;
- seqcount_init(&brmctx->ip4_querier.seq);
+ seqcount_spinlock_init(&brmctx->ip4_querier.seq, &br->multicast_lock);
brmctx->multicast_igmp_version = 2;
#if IS_ENABLED(CONFIG_IPV6)
brmctx->multicast_mld_version = 1;
brmctx->ip6_other_query.delay_time = 0;
brmctx->ip6_querier.port_ifidx = 0;
- seqcount_init(&brmctx->ip6_querier.seq);
+ seqcount_spinlock_init(&brmctx->ip6_querier.seq, &br->multicast_lock);
#endif
timer_setup(&brmctx->ip4_mc_router_timer,
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -82,7 +82,7 @@ struct bridge_mcast_other_query {
struct bridge_mcast_querier {
struct br_ip addr;
int port_ifidx;
- seqcount_t seq;
+ seqcount_spinlock_t seq;
};
/* IGMP/MLD statistics */
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Bridge] [PATCH net] net: bridge: mcast: Associate the seqcount with its protecting lock.
@ 2021-09-28 14:10 ` Sebastian Andrzej Siewior
0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Andrzej Siewior @ 2021-09-28 14:10 UTC (permalink / raw)
To: bridge, netdev
Cc: Sebastian Andrzej Siewior, Mike Galbraith, Nikolay Aleksandrov,
Roopa Prabhu, Jakub Kicinski, Thomas Gleixner, David S. Miller
From: Thomas Gleixner <tglx@linutronix.de>
The sequence count bridge_mcast_querier::seq is protected by
net_bridge::multicast_lock but seqcount_init() does not associate the
seqcount with the lock. This leads to a warning on PREEMPT_RT because
preemption is still enabled.
Let seqcount_init() associate the seqcount with lock that protects the
write section. Remove lockdep_assert_held_once() because lockdep already checks
whether the associated lock is held.
Fixes: 67b746f94ff39 ("net: bridge: mcast: make sure querier port/address updates are consistent")
Reported-by: Mike Galbraith <efault@gmx.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Tested-by: Mike Galbraith <efault@gmx.de>
---
net/bridge/br_multicast.c | 6 ++----
net/bridge/br_private.h | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1677,8 +1677,6 @@ static void br_multicast_update_querier(
int ifindex,
struct br_ip *saddr)
{
- lockdep_assert_held_once(&brmctx->br->multicast_lock);
-
write_seqcount_begin(&querier->seq);
querier->port_ifidx = ifindex;
memcpy(&querier->addr, saddr, sizeof(*saddr));
@@ -3867,13 +3865,13 @@ void br_multicast_ctx_init(struct net_br
brmctx->ip4_other_query.delay_time = 0;
brmctx->ip4_querier.port_ifidx = 0;
- seqcount_init(&brmctx->ip4_querier.seq);
+ seqcount_spinlock_init(&brmctx->ip4_querier.seq, &br->multicast_lock);
brmctx->multicast_igmp_version = 2;
#if IS_ENABLED(CONFIG_IPV6)
brmctx->multicast_mld_version = 1;
brmctx->ip6_other_query.delay_time = 0;
brmctx->ip6_querier.port_ifidx = 0;
- seqcount_init(&brmctx->ip6_querier.seq);
+ seqcount_spinlock_init(&brmctx->ip6_querier.seq, &br->multicast_lock);
#endif
timer_setup(&brmctx->ip4_mc_router_timer,
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -82,7 +82,7 @@ struct bridge_mcast_other_query {
struct bridge_mcast_querier {
struct br_ip addr;
int port_ifidx;
- seqcount_t seq;
+ seqcount_spinlock_t seq;
};
/* IGMP/MLD statistics */
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net] net: bridge: mcast: Associate the seqcount with its protecting lock.
2021-09-28 14:10 ` [Bridge] " Sebastian Andrzej Siewior
@ 2021-09-28 14:41 ` Nikolay Aleksandrov
-1 siblings, 0 replies; 6+ messages in thread
From: Nikolay Aleksandrov @ 2021-09-28 14:41 UTC (permalink / raw)
To: Sebastian Andrzej Siewior, bridge, netdev
Cc: Roopa Prabhu, David S. Miller, Jakub Kicinski, Thomas Gleixner,
Mike Galbraith
On 28/09/2021 17:10, Sebastian Andrzej Siewior wrote:
> From: Thomas Gleixner <tglx@linutronix.de>
>
> The sequence count bridge_mcast_querier::seq is protected by
> net_bridge::multicast_lock but seqcount_init() does not associate the
> seqcount with the lock. This leads to a warning on PREEMPT_RT because
> preemption is still enabled.
>
> Let seqcount_init() associate the seqcount with lock that protects the
> write section. Remove lockdep_assert_held_once() because lockdep already checks
> whether the associated lock is held.
>
> Fixes: 67b746f94ff39 ("net: bridge: mcast: make sure querier port/address updates are consistent")
> Reported-by: Mike Galbraith <efault@gmx.de>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> Tested-by: Mike Galbraith <efault@gmx.de>
> ---
> net/bridge/br_multicast.c | 6 ++----
> net/bridge/br_private.h | 2 +-
> 2 files changed, 3 insertions(+), 5 deletions(-)
>
> --- a/net/bridge/br_multicast.c
> +++ b/net/bridge/br_multicast.c
> @@ -1677,8 +1677,6 @@ static void br_multicast_update_querier(
> int ifindex,
> struct br_ip *saddr)
> {
> - lockdep_assert_held_once(&brmctx->br->multicast_lock);
> -
> write_seqcount_begin(&querier->seq);
> querier->port_ifidx = ifindex;
> memcpy(&querier->addr, saddr, sizeof(*saddr));
> @@ -3867,13 +3865,13 @@ void br_multicast_ctx_init(struct net_br
>
> brmctx->ip4_other_query.delay_time = 0;
> brmctx->ip4_querier.port_ifidx = 0;
> - seqcount_init(&brmctx->ip4_querier.seq);
> + seqcount_spinlock_init(&brmctx->ip4_querier.seq, &br->multicast_lock);
> brmctx->multicast_igmp_version = 2;
> #if IS_ENABLED(CONFIG_IPV6)
> brmctx->multicast_mld_version = 1;
> brmctx->ip6_other_query.delay_time = 0;
> brmctx->ip6_querier.port_ifidx = 0;
> - seqcount_init(&brmctx->ip6_querier.seq);
> + seqcount_spinlock_init(&brmctx->ip6_querier.seq, &br->multicast_lock);
> #endif
>
> timer_setup(&brmctx->ip4_mc_router_timer,
> --- a/net/bridge/br_private.h
> +++ b/net/bridge/br_private.h
> @@ -82,7 +82,7 @@ struct bridge_mcast_other_query {
> struct bridge_mcast_querier {
> struct br_ip addr;
> int port_ifidx;
> - seqcount_t seq;
> + seqcount_spinlock_t seq;
> };
>
> /* IGMP/MLD statistics */
>
Thanks for fixing it,
Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Bridge] [PATCH net] net: bridge: mcast: Associate the seqcount with its protecting lock.
@ 2021-09-28 14:41 ` Nikolay Aleksandrov
0 siblings, 0 replies; 6+ messages in thread
From: Nikolay Aleksandrov @ 2021-09-28 14:41 UTC (permalink / raw)
To: Sebastian Andrzej Siewior, bridge, netdev
Cc: Jakub Kicinski, Thomas Gleixner, Mike Galbraith, David S. Miller,
Roopa Prabhu
On 28/09/2021 17:10, Sebastian Andrzej Siewior wrote:
> From: Thomas Gleixner <tglx@linutronix.de>
>
> The sequence count bridge_mcast_querier::seq is protected by
> net_bridge::multicast_lock but seqcount_init() does not associate the
> seqcount with the lock. This leads to a warning on PREEMPT_RT because
> preemption is still enabled.
>
> Let seqcount_init() associate the seqcount with lock that protects the
> write section. Remove lockdep_assert_held_once() because lockdep already checks
> whether the associated lock is held.
>
> Fixes: 67b746f94ff39 ("net: bridge: mcast: make sure querier port/address updates are consistent")
> Reported-by: Mike Galbraith <efault@gmx.de>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> Tested-by: Mike Galbraith <efault@gmx.de>
> ---
> net/bridge/br_multicast.c | 6 ++----
> net/bridge/br_private.h | 2 +-
> 2 files changed, 3 insertions(+), 5 deletions(-)
>
> --- a/net/bridge/br_multicast.c
> +++ b/net/bridge/br_multicast.c
> @@ -1677,8 +1677,6 @@ static void br_multicast_update_querier(
> int ifindex,
> struct br_ip *saddr)
> {
> - lockdep_assert_held_once(&brmctx->br->multicast_lock);
> -
> write_seqcount_begin(&querier->seq);
> querier->port_ifidx = ifindex;
> memcpy(&querier->addr, saddr, sizeof(*saddr));
> @@ -3867,13 +3865,13 @@ void br_multicast_ctx_init(struct net_br
>
> brmctx->ip4_other_query.delay_time = 0;
> brmctx->ip4_querier.port_ifidx = 0;
> - seqcount_init(&brmctx->ip4_querier.seq);
> + seqcount_spinlock_init(&brmctx->ip4_querier.seq, &br->multicast_lock);
> brmctx->multicast_igmp_version = 2;
> #if IS_ENABLED(CONFIG_IPV6)
> brmctx->multicast_mld_version = 1;
> brmctx->ip6_other_query.delay_time = 0;
> brmctx->ip6_querier.port_ifidx = 0;
> - seqcount_init(&brmctx->ip6_querier.seq);
> + seqcount_spinlock_init(&brmctx->ip6_querier.seq, &br->multicast_lock);
> #endif
>
> timer_setup(&brmctx->ip4_mc_router_timer,
> --- a/net/bridge/br_private.h
> +++ b/net/bridge/br_private.h
> @@ -82,7 +82,7 @@ struct bridge_mcast_other_query {
> struct bridge_mcast_querier {
> struct br_ip addr;
> int port_ifidx;
> - seqcount_t seq;
> + seqcount_spinlock_t seq;
> };
>
> /* IGMP/MLD statistics */
>
Thanks for fixing it,
Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net] net: bridge: mcast: Associate the seqcount with its protecting lock.
2021-09-28 14:10 ` [Bridge] " Sebastian Andrzej Siewior
@ 2021-09-29 2:40 ` patchwork-bot+netdevbpf
-1 siblings, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-09-29 2:40 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: bridge, netdev, roopa, nikolay, davem, kuba, tglx, efault
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Tue, 28 Sep 2021 16:10:49 +0200 you wrote:
> From: Thomas Gleixner <tglx@linutronix.de>
>
> The sequence count bridge_mcast_querier::seq is protected by
> net_bridge::multicast_lock but seqcount_init() does not associate the
> seqcount with the lock. This leads to a warning on PREEMPT_RT because
> preemption is still enabled.
>
> [...]
Here is the summary with links:
- [net] net: bridge: mcast: Associate the seqcount with its protecting lock.
https://git.kernel.org/netdev/net/c/f936bb42aeb9
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Bridge] [PATCH net] net: bridge: mcast: Associate the seqcount with its protecting lock.
@ 2021-09-29 2:40 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-09-29 2:40 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: efault, netdev, bridge, nikolay, roopa, kuba, tglx, davem
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Tue, 28 Sep 2021 16:10:49 +0200 you wrote:
> From: Thomas Gleixner <tglx@linutronix.de>
>
> The sequence count bridge_mcast_querier::seq is protected by
> net_bridge::multicast_lock but seqcount_init() does not associate the
> seqcount with the lock. This leads to a warning on PREEMPT_RT because
> preemption is still enabled.
>
> [...]
Here is the summary with links:
- [net] net: bridge: mcast: Associate the seqcount with its protecting lock.
https://git.kernel.org/netdev/net/c/f936bb42aeb9
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-09-29 2:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-28 14:10 [PATCH net] net: bridge: mcast: Associate the seqcount with its protecting lock Sebastian Andrzej Siewior
2021-09-28 14:10 ` [Bridge] " Sebastian Andrzej Siewior
2021-09-28 14:41 ` Nikolay Aleksandrov
2021-09-28 14:41 ` [Bridge] " Nikolay Aleksandrov
2021-09-29 2:40 ` patchwork-bot+netdevbpf
2021-09-29 2:40 ` [Bridge] " patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.