ipvs: Fix estimator kthreads preferred affinity
Subsystems (5)
PATCH v2 1/1 ipvs: Fix estimator kthreads preferred affinity
The estimator kthreads' affinity are defined by sysctl overwritten preferences and applied through a plain call to the scheduler's affinity API.
However since the introduction of managed kthreads preferred affinity, such a practice shortcuts the kthreads core code which eventually overwrites the target to the default unbound affinity.
Fix this with using the appropriate kthread's API.
--- include/net/ip_vs.h | 13 +++++++++++++ kernel/kthread.c | 1 + net/netfilter/ipvs/ip_vs_est.c | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-)
include/net/ip_vs.h +13 -0
@@ -1163,6 +1163,14 @@ static inline const struct cpumask *sysctl_est_cpulist(struct netns_ipvs *ipvs)return housekeeping_cpumask (HK_TYPE_KTHREAD ); } +static inline const struct cpumask *sysctl_est_preferred_cpulist (struct netns_ipvs *ipvs) +{ +if (ipvs->est_cpulist_valid) +return ipvs->sysctl_est_cpulist; +else +return NULL ; +} +static inline int sysctl_est_nice (struct netns_ipvs *ipvs) {return ipvs->sysctl_est_nice;
@@ -1270,6 +1278,11 @@ static inline const struct cpumask *sysctl_est_cpulist(struct netns_ipvs *ipvs)return housekeeping_cpumask (HK_TYPE_KTHREAD ); } +static inline const struct cpumask *sysctl_est_preferred_cpulist (struct netns_ipvs *ipvs) +{ +return NULL ; +} +static inline int sysctl_est_nice (struct netns_ipvs *ipvs) {return IPVS_EST_NICE ;
kernel/kthread.c +1 -0
@@ -899,6 +899,7 @@ int kthread_affine_preferred(struct task_struct *p, const struct cpumask *mask)return ret; } +EXPORT_SYMBOL_GPL (kthread_affine_preferred);static int kthreads_update_affinity (bool force) {
net/netfilter/ipvs/ip_vs_est.c +2 -1
@@ -265,7 +265,8 @@ int ip_vs_est_kthread_start(struct netns_ipvs *ipvs, }set_user_nice (kd->task,sysctl_est_nice (ipvs)); -set_cpus_allowed_ptr (kd->task,sysctl_est_cpulist (ipvs)); +if (sysctl_est_preferred_cpulist (ipvs)) +kthread_affine_preferred (kd->task,sysctl_est_preferred_cpulist (ipvs));pr_info ("starting estimator thread %d...\n" , kd->id);wake_up_process (kd->task);
Signature · 1 line
2.48.1
Hello,
Quoted 4 lines · Frederic Weisbecker
The estimator kthreads' affinity are defined by sysctl overwritten preferences and applied through a plain call to the scheduler's affinity API.
Quoted 8 lines
However since the introduction of managed kthreads preferred affinity, such a practice shortcuts the kthreads core code which eventually overwrites the target to the default unbound affinity.
Fix this with using the appropriate kthread's API.
Fixes d1a89197589c ("kthread: Default affine kthread to its preferred NUMA node")Signed-off-by Frederic Weisbecker <[email protected]>
Looks good to me for the nf tree, thanks!
Quoted 65 lines
--- include/net/ip_vs.h | 13 +++++++++++++ kernel/kthread.c | 1 + net/netfilter/ipvs/ip_vs_est.c | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-)include/net/ip_vs.h +13
-0@@ -1163,6 +1163,14 @@ static inline const struct cpumask *sysctl_est_cpulist(struct netns_ipvs *ipvs)return housekeeping_cpumask (HK_TYPE_KTHREAD ); } +static inline const struct cpumask *sysctl_est_preferred_cpulist (struct netns_ipvs *ipvs) +{ +if (ipvs->est_cpulist_valid) +return ipvs->sysctl_est_cpulist; +else +return NULL ; +} +static inline int sysctl_est_nice (struct netns_ipvs *ipvs) {return ipvs->sysctl_est_nice;@@ -1270,6 +1278,11 @@ static inline const struct cpumask *sysctl_est_cpulist(struct netns_ipvs *ipvs)return housekeeping_cpumask (HK_TYPE_KTHREAD ); } +static inline const struct cpumask *sysctl_est_preferred_cpulist (struct netns_ipvs *ipvs) +{ +return NULL ; +} +static inline int sysctl_est_nice (struct netns_ipvs *ipvs) {return IPVS_EST_NICE ;kernel/kthread.c +1
-0@@ -899,6 +899,7 @@ int kthread_affine_preferred(struct task_struct *p, const struct cpumask *mask)return ret; } +EXPORT_SYMBOL_GPL (kthread_affine_preferred);static int kthreads_update_affinity (bool force) {net/netfilter/ipvs/ip_vs_est.c +2
-1@@ -265,7 +265,8 @@ int ip_vs_est_kthread_start(struct netns_ipvs *ipvs, }set_user_nice (kd->task,sysctl_est_nice (ipvs)); -set_cpus_allowed_ptr (kd->task,sysctl_est_cpulist (ipvs)); +if (sysctl_est_preferred_cpulist (ipvs)) +kthread_affine_preferred (kd->task,sysctl_est_preferred_cpulist (ipvs));pr_info ("starting estimator thread %d...\n" , kd->id);wake_up_process (kd->task);Signature · 1 line
2.48.1
Regards
--
Julian Anastasov <[email protected]>
Pablo Neira Ayuso
maintainerQuoted 13 lines · Julian Anastasov
Hello,
Quoted 8 lines · Frederic Weisbecker
The estimator kthreads' affinity are defined by sysctl overwritten preferences and applied through a plain call to the scheduler's affinity API.
However since the introduction of managed kthreads preferred affinity, such a practice shortcuts the kthreads core code which eventually overwrites the target to the default unbound affinity.
Quoted 8 lines
Quoted 4 lines
Fix this with using the appropriate kthread's API.
Fixes d1a89197589c ("kthread: Default affine kthread to its preferred NUMA node")Signed-off-by Frederic Weisbecker <[email protected]>Looks good to me for the nf tree, thanks!
Acked-by Julian Anastasov <[email protected]>
For the record: Apologies, I will include this patch in the next pull request.