Commit a8760d0d authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Jakub Kicinski
Browse files

dev: Remove PREEMPT_RT ifdefs from backlog_lock.*(). 



The backlog_napi locking (previously RPS) relies on explicit locking if
either RPS or backlog NAPI is enabled. If both are disabled then locking
was achieved by disabling interrupts except on PREEMPT_RT. PREEMPT_RT
was excluded because the needed synchronisation was already provided
local_bh_disable().

Since the introduction of backlog NAPI and making it mandatory for
PREEMPT_RT the ifdef within backlog_lock.*() is obsolete and can be
removed.

Remove the ifdefs in backlog_lock.*().

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Link: https://patch.msgid.link/20240620132727.660738-10-bigeasy@linutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ecefbc09

net/core/dev.c

+4 −4
Original line number Diff line number Diff line
@@ -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();

}