ipvs: Replace use of system_unbound_wq with system_dfl_long_wq

This patch continues the effort to refactor workqueue APIs, which has
begun with the changes introducing new workqueues and a new
alloc_workqueue flag:

   commit 128ea9f6ccfb ("workqueue: Add system_percpu_wq and system_dfl_wq")
   commit 930c2ea566af ("workqueue: Add new WQ_PERCPU flag")

The point of the refactoring is to eventually alter the default behavior
of workqueues to become unbound by default so that their workload
placement is optimized by the scheduler.

Before that to happen, workqueue users must be converted to the better
named new workqueues with no intended behaviour changes:

   system_wq -> system_percpu_wq
   system_unbound_wq -> system_dfl_wq

This way the old obsolete workqueues (system_wq, system_unbound_wq) can
be removed in the future.

This specific work is considered long, so enqueue it using
system_dfl_long_wq instead of system_dfl_wq.

Link: https://lore.kernel.org/all/20250221112003.1dSuoGyc@linutronix.de/
Suggested-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Marco Crivellari <marco.crivellari@suse.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index e76a73d183d53146afca41dbc4789c49b5df170c..cb36641f8d1cc103fab31e48c12a35367642d88b 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -285,7 +285,7 @@ static inline int ip_vs_conn_hash(struct ip_vs_conn *cp)
        /* Schedule resizing if load increases */
        if (atomic_read(&ipvs->conn_count) > t->u_thresh &&
            !test_and_set_bit(IP_VS_WORK_CONN_RESIZE, &ipvs->work_flags))
-               mod_delayed_work(system_unbound_wq, &ipvs->conn_resize_work, 0);
+               mod_delayed_work(system_dfl_long_wq, &ipvs->conn_resize_work, 0);
 
        return ret;
 }
@@ -916,7 +916,7 @@ same_bucket:
 
 out:
        /* Monitor if we need to shrink table */
-       queue_delayed_work(system_unbound_wq, &ipvs->conn_resize_work,
+       queue_delayed_work(system_dfl_long_wq, &ipvs->conn_resize_work,
                           more_work ? 1 : 2 * HZ);
 }
 

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index f765d1506839e64f0628f440eff12dcfc768fb5b..bcf40b8c41cf26f2007ab2dd61d131c55ce3eaba 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -821,7 +821,7 @@ out:
        if (!READ_ONCE(ipvs->enable) || !more_work ||
            test_bit(IP_VS_WORK_SVC_NORESIZE, &ipvs->work_flags))
                return;
-       queue_delayed_work(system_unbound_wq, &ipvs->svc_resize_work, 1);
+       queue_delayed_work(system_dfl_long_wq, &ipvs->svc_resize_work, 1);
        return;
 
 unlock_m:
@@ -1869,7 +1869,7 @@ ip_vs_add_service(struct netns_ipvs *ipvs, struct ip_vs_service_user_kern *u,
 
        /* Schedule resize work */
        if (grow && !test_and_set_bit(IP_VS_WORK_SVC_RESIZE, &ipvs->work_flags))
-               queue_delayed_work(system_unbound_wq, &ipvs->svc_resize_work,
+               queue_delayed_work(system_dfl_long_wq, &ipvs->svc_resize_work,
                                   1);
 
        *svc_p = svc;
@@ -2125,7 +2125,7 @@ static int ip_vs_del_service(struct ip_vs_service *svc)
                rcu_read_unlock();
                if (shrink && !test_and_set_bit(IP_VS_WORK_SVC_RESIZE,
                                                &ipvs->work_flags))
-                       queue_delayed_work(system_unbound_wq,
+                       queue_delayed_work(system_dfl_long_wq,
                                           &ipvs->svc_resize_work, 1);
        }
        return 0;
@@ -2606,7 +2606,7 @@ static int ipvs_proc_conn_lfactor(const struct ctl_table *table, int write,
                } else {
                        WRITE_ONCE(*valp, val);
                        if (rcu_access_pointer(ipvs->conn_tab))
-                               mod_delayed_work(system_unbound_wq,
+                               mod_delayed_work(system_dfl_long_wq,
                                                 &ipvs->conn_resize_work, 0);
                }
        }
@@ -2638,7 +2638,7 @@ static int ipvs_proc_svc_lfactor(const struct ctl_table *table, int write,
                            READ_ONCE(ipvs->enable) &&
                            !test_bit(IP_VS_WORK_SVC_NORESIZE,
                                      &ipvs->work_flags))
-                               mod_delayed_work(system_unbound_wq,
+                               mod_delayed_work(system_dfl_long_wq,
                                                 &ipvs->svc_resize_work, 0);
                        mutex_unlock(&ipvs->service_mutex);
                }