Commit 5fd8bb98 authored by Marco Crivellari's avatar Marco Crivellari Committed by Jakub Kicinski
Browse files

net: replace use of system_wq with system_percpu_wq 



Currently if a user enqueue a work item using schedule_delayed_work() the
used wq is "system_wq" (per-cpu wq) while queue_delayed_work() use
WORK_CPU_UNBOUND (used when a cpu is not specified). The same applies to
schedule_work() that is using system_wq and queue_work(), that makes use
again of WORK_CPU_UNBOUND.

This lack of consistentcy cannot be addressed without refactoring the API.

system_unbound_wq should be the default workqueue so as not to enforce
locality constraints for random work whenever it's not required.

Adding system_dfl_wq to encourage its use when unbound work should be used.

The old system_unbound_wq will be kept for a few release cycles.

Suggested-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarMarco Crivellari <marco.crivellari@suse.com>
Link: https://patch.msgid.link/20250918142427.309519-3-marco.crivellari@suse.com


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

drivers/net/ethernet/sfc/efx_channels.c

+1 −1
Original line number Diff line number Diff line
@@ -1281,7 +1281,7 @@ static int efx_poll(struct napi_struct *napi, int budget) 
		time = jiffies - channel->rfs_last_expiry;

		/* Would our quota be >= 20? */

		if (channel->rfs_filter_count * time >= 600 * HZ)

			mod_delayed_work(system_wq, &channel->filter_work, 0);

			mod_delayed_work(system_percpu_wq, &channel->filter_work, 0);

#endif



		/* There is no race here; although napi_disable() will

drivers/net/ethernet/sfc/siena/efx_channels.c

+1 −1
Original line number Diff line number Diff line
@@ -1300,7 +1300,7 @@ static int efx_poll(struct napi_struct *napi, int budget) 
		time = jiffies - channel->rfs_last_expiry;

		/* Would our quota be >= 20? */

		if (channel->rfs_filter_count * time >= 600 * HZ)

			mod_delayed_work(system_wq, &channel->filter_work, 0);

			mod_delayed_work(system_percpu_wq, &channel->filter_work, 0);

#endif



		/* There is no race here; although napi_disable() will

drivers/net/phy/sfp.c

+6 −6
Original line number Diff line number Diff line
@@ -911,7 +911,7 @@ static void sfp_soft_start_poll(struct sfp *sfp) 


	if (sfp->state_soft_mask & (SFP_F_LOS | SFP_F_TX_FAULT) &&

	    !sfp->need_poll)

		mod_delayed_work(system_wq, &sfp->poll, poll_jiffies);

		mod_delayed_work(system_percpu_wq, &sfp->poll, poll_jiffies);

	mutex_unlock(&sfp->st_mutex);

}
@@ -1682,7 +1682,7 @@ static void sfp_hwmon_probe(struct work_struct *work) 
	err = sfp_read(sfp, true, 0, &sfp->diag, sizeof(sfp->diag));

	if (err < 0) {

		if (sfp->hwmon_tries--) {

			mod_delayed_work(system_wq, &sfp->hwmon_probe,

			mod_delayed_work(system_percpu_wq, &sfp->hwmon_probe,

					 T_PROBE_RETRY_SLOW);

		} else {

			dev_warn(sfp->dev, "hwmon probe failed: %pe\n",
@@ -1709,7 +1709,7 @@ static void sfp_hwmon_probe(struct work_struct *work) 
static int sfp_hwmon_insert(struct sfp *sfp)

{

	if (sfp->have_a2 && sfp->id.ext.diagmon & SFP_DIAGMON_DDM) {

		mod_delayed_work(system_wq, &sfp->hwmon_probe, 1);

		mod_delayed_work(system_percpu_wq, &sfp->hwmon_probe, 1);

		sfp->hwmon_tries = R_PROBE_RETRY_SLOW;

	}
@@ -2563,7 +2563,7 @@ static void sfp_sm_module(struct sfp *sfp, unsigned int event) 
		/* Force a poll to re-read the hardware signal state after

		 * sfp_sm_mod_probe() changed state_hw_mask.

		 */

		mod_delayed_work(system_wq, &sfp->poll, 1);

		mod_delayed_work(system_percpu_wq, &sfp->poll, 1);



		err = sfp_hwmon_insert(sfp);

		if (err)
@@ -3008,7 +3008,7 @@ static void sfp_poll(struct work_struct *work) 
	// it's unimportant if we race while reading this.

	if (sfp->state_soft_mask & (SFP_F_LOS | SFP_F_TX_FAULT) ||

	    sfp->need_poll)

		mod_delayed_work(system_wq, &sfp->poll, poll_jiffies);

		mod_delayed_work(system_percpu_wq, &sfp->poll, poll_jiffies);

}



static struct sfp *sfp_alloc(struct device *dev)
@@ -3178,7 +3178,7 @@ static int sfp_probe(struct platform_device *pdev) 
	}



	if (sfp->need_poll)

		mod_delayed_work(system_wq, &sfp->poll, poll_jiffies);

		mod_delayed_work(system_percpu_wq, &sfp->poll, poll_jiffies);



	/* We could have an issue in cases no Tx disable pin is available or

	 * wired as modules using a laser as their light source will continue to

net/bridge/br_cfm.c

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void ccm_rx_timer_start(struct br_cfm_peer_mep *peer_mep) 
	 * of the configured CC 'expected_interval'

	 * in order to detect CCM defect after 3.25 interval.

	 */

	queue_delayed_work(system_wq, &peer_mep->ccm_rx_dwork,

	queue_delayed_work(system_percpu_wq, &peer_mep->ccm_rx_dwork,

			   usecs_to_jiffies(interval_us / 4));

}
@@ -285,7 +285,7 @@ static void ccm_tx_work_expired(struct work_struct *work) 
		ccm_frame_tx(skb);



	interval_us = interval_to_us(mep->cc_config.exp_interval);

	queue_delayed_work(system_wq, &mep->ccm_tx_dwork,

	queue_delayed_work(system_percpu_wq, &mep->ccm_tx_dwork,

			   usecs_to_jiffies(interval_us));

}
@@ -809,7 +809,7 @@ int br_cfm_cc_ccm_tx(struct net_bridge *br, const u32 instance, 
	 * to send first frame immediately

	 */

	mep->ccm_tx_end = jiffies + usecs_to_jiffies(tx_info->period * 1000000);

	queue_delayed_work(system_wq, &mep->ccm_tx_dwork, 0);

	queue_delayed_work(system_percpu_wq, &mep->ccm_tx_dwork, 0);



save:

	mep->cc_ccm_tx_info = *tx_info;

net/bridge/br_mrp.c

+4 −4
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static void br_mrp_test_work_expired(struct work_struct *work) 
out:

	rcu_read_unlock();



	queue_delayed_work(system_wq, &mrp->test_work,

	queue_delayed_work(system_percpu_wq, &mrp->test_work,

			   usecs_to_jiffies(mrp->test_interval));

}
@@ -418,7 +418,7 @@ static void br_mrp_in_test_work_expired(struct work_struct *work) 
out:

	rcu_read_unlock();



	queue_delayed_work(system_wq, &mrp->in_test_work,

	queue_delayed_work(system_percpu_wq, &mrp->in_test_work,

			   usecs_to_jiffies(mrp->in_test_interval));

}
@@ -725,7 +725,7 @@ int br_mrp_start_test(struct net_bridge *br, 
	mrp->test_max_miss = test->max_miss;

	mrp->test_monitor = test->monitor;

	mrp->test_count_miss = 0;

	queue_delayed_work(system_wq, &mrp->test_work,

	queue_delayed_work(system_percpu_wq, &mrp->test_work,

			   usecs_to_jiffies(test->interval));



	return 0;
@@ -865,7 +865,7 @@ int br_mrp_start_in_test(struct net_bridge *br, 
	mrp->in_test_end = jiffies + usecs_to_jiffies(in_test->period);

	mrp->in_test_max_miss = in_test->max_miss;

	mrp->in_test_count_miss = 0;

	queue_delayed_work(system_wq, &mrp->in_test_work,

	queue_delayed_work(system_percpu_wq, &mrp->in_test_work,

			   usecs_to_jiffies(in_test->interval));



	return 0;