2024-06-09 07:20:57

by Yajun Deng

Subject: [PATCH net-next] net: dev: Simplify the conditional of backlog lock functions

The use_backlog_threads() contains the conditional of PREEMPT_RT, so we
don't need to add PREEMPT_RT in the backlog lock.

Remove the conditional of PREEMPT_RT in the backlog lock.

Signed-off-by: Yajun Deng <[email protected]>
---
net/core/dev.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index e62698c7a0e6..db6b6fc997e6 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -229,7 +229,7 @@ static inline void backlog_lock_irq_save(struct softnet_data *sd,
{
if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads())
spin_lock_irqsave(&sd->input_pkt_queue.lock, *flags);
- else if (!IS_ENABLED(CONFIG_PREEMPT_RT))
+ else
local_irq_save(*flags);
}

@@ -237,7 +237,7 @@ static inline void backlog_lock_irq_disable(struct softnet_data *sd)
{
if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads())
spin_lock_irq(&sd->input_pkt_queue.lock);
- else if (!IS_ENABLED(CONFIG_PREEMPT_RT))
+ else
local_irq_disable();
}

@@ -246,7 +246,7 @@ static inline void backlog_unlock_irq_restore(struct softnet_data *sd,
{
if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads())
spin_unlock_irqrestore(&sd->input_pkt_queue.lock, *flags);
- else if (!IS_ENABLED(CONFIG_PREEMPT_RT))
+ else
local_irq_restore(*flags);
}

@@ -254,7 +254,7 @@ static inline void backlog_unlock_irq_enable(struct softnet_data *sd)
{
if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads())
spin_unlock_irq(&sd->input_pkt_queue.lock);
- else if (!IS_ENABLED(CONFIG_PREEMPT_RT))
+ else
local_irq_enable();
}

--
2.34.1

2024-06-10 06:27:12

by Sebastian Andrzej Siewior

Subject: Re: [PATCH net-next] net: dev: Simplify the conditional of backlog lock functions

On 2024-06-09 15:20:22 [+0800], Yajun Deng wrote:
> The use_backlog_threads() contains the conditional of PREEMPT_RT, so we
> don't need to add PREEMPT_RT in the backlog lock.
>
> Remove the conditional of PREEMPT_RT in the backlog lock.

This is part of
https://lore.kernel.org/all/[email protected]/

> Signed-off-by: Yajun Deng <[email protected]>

Sebastian