Re: [PATCH v1 12/19] xen/sysctl: wrap around XEN_SYSCTL_cpupool_op

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Wed, 12 Mar 2025, Penny Zheng wrote:
> Function cpupool_do_sysctl is designed for doing
> cpupool related sysctl operations, and shall be
> wrapped.
> 
> The following static functions are only called by cpupool_do_sysctl(), then
> shall be wrapped too:
> - cpupool_get_next_by_id
> - cpupool_destroy
> - cpupool_unassign_cpu_helper
> - cpupool_unassign_cpu
> 
> Signed-off-by: Penny Zheng <Penny.Zheng@xxxxxxx>


Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>


> ---
>  xen/common/sched/cpupool.c | 9 +++++++++
>  xen/include/xen/sched.h    | 7 +++++++
>  2 files changed, 16 insertions(+)
> 
> diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c
> index 3d02c7b706..0efd8a4591 100644
> --- a/xen/common/sched/cpupool.c
> +++ b/xen/common/sched/cpupool.c
> @@ -241,10 +241,12 @@ struct cpupool *cpupool_get_by_id(unsigned int poolid)
>      return __cpupool_get_by_id(poolid, true);
>  }
>  
> +#ifdef CONFIG_SYSCTL
>  static struct cpupool *cpupool_get_next_by_id(unsigned int poolid)
>  {
>      return __cpupool_get_by_id(poolid, false);
>  }
> +#endif /* CONFIG_SYSCTL */
>  
>  void cpupool_put(struct cpupool *pool)
>  {
> @@ -352,6 +354,8 @@ static struct cpupool *cpupool_create(unsigned int poolid,
>  
>      return ERR_PTR(ret);
>  }
> +
> +#ifdef CONFIG_SYSCTL
>  /*
>   * destroys the given cpupool
>   * returns 0 on success, 1 else
> @@ -379,6 +383,7 @@ static int cpupool_destroy(struct cpupool *c)
>      debugtrace_printk("cpupool_destroy(pool=%u)\n", c->cpupool_id);
>      return 0;
>  }
> +#endif /* CONFIG_SYSCTL */
>  
>  /*
>   * Move domain to another cpupool
> @@ -568,6 +573,7 @@ static int cpupool_unassign_cpu_start(struct cpupool *c, 
> unsigned int cpu)
>      return ret;
>  }
>  
> +#ifdef CONFIG_SYSCTL
>  static long cf_check cpupool_unassign_cpu_helper(void *info)
>  {
>      struct cpupool *c = info;
> @@ -633,6 +639,7 @@ static int cpupool_unassign_cpu(struct cpupool *c, 
> unsigned int cpu)
>      }
>      return continue_hypercall_on_cpu(work_cpu, cpupool_unassign_cpu_helper, 
> c);
>  }
> +#endif /* CONFIG_SYSCTL */
>  
>  /*
>   * add a new domain to a cpupool
> @@ -810,6 +817,7 @@ static void cpupool_cpu_remove_forced(unsigned int cpu)
>      rcu_read_unlock(&sched_res_rculock);
>  }
>  
> +#ifdef CONFIG_SYSCTL
>  /*
>   * do cpupool related sysctl operations
>   */
> @@ -975,6 +983,7 @@ int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op)
>  
>      return ret;
>  }
> +#endif /* CONFIG_SYSCTL */
>  
>  unsigned int cpupool_get_id(const struct domain *d)
>  {
> diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
> index 9bdeb85aa4..ea81832c50 100644
> --- a/xen/include/xen/sched.h
> +++ b/xen/include/xen/sched.h
> @@ -1259,7 +1259,14 @@ static always_inline bool is_cpufreq_controller(const 
> struct domain *d)
>  }
>  
>  int cpupool_move_domain(struct domain *d, struct cpupool *c);
> +#ifdef CONFIG_SYSCTL
>  int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op);
> +#else
> +static inline int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op)
> +{
> +    return -EOPNOTSUPP;
> +}
> +#endif
>  unsigned int cpupool_get_id(const struct domain *d);
>  const cpumask_t *cpupool_valid_cpus(const struct cpupool *pool);
>  
> -- 
> 2.34.1
>