On 9/17/20 4:11 PM, Bjorn Helgaas wrote:
> [+cc Ingo, Peter, Juri, Vincent (scheduler maintainers)]
>
> s/hosekeeping/housekeeping/ (in subject)
>
> On Wed, Sep 09, 2020 at 11:08:16AM -0400, Nitesh Narayan Lal wrote:
>> Introduce a new API num_housekeeping_cpus(), that can be used to retrieve
>> the number of housekeeping CPUs by reading an atomic variable
>> __num_housekeeping_cpus. This variable is set from housekeeping_setup().
>>
>> This API is introduced for the purpose of drivers that were previously
>> relying only on num_online_cpus() to determine the number of MSIX vectors
>> to create. In an RT environment with large isolated but a fewer
>> housekeeping CPUs this was leading to a situation where an attempt to
>> move all of the vectors corresponding to isolated CPUs to housekeeping
>> CPUs was failing due to per CPU vector limit.
> Totally kibitzing here, but AFAICT the concepts of "isolated CPU" and
> "housekeeping CPU" are not currently exposed to drivers, and it's not
> completely clear to me that they should be.
>
> We have carefully constructed notions of possible, present, online,
> active CPUs, and it seems like whatever we do here should be
> somehow integrated with those.
At one point I thought about tweaking num_online_cpus(), but then I quickly
moved away from that just because it is extensively used in the kernel and we
don't have to modify the behavior at all those places.
Thank you for including Peter and Vincent as well.
I would be happy to discuss/explore other options.
>
>> If there are no isolated CPUs specified then the API returns the number
>> of all online CPUs.
>>
>> Signed-off-by: Nitesh Narayan Lal <nitesh@xxxxxxxxxx>
>> ---
>> include/linux/sched/isolation.h | 7 +++++++
>> kernel/sched/isolation.c | 23 +++++++++++++++++++++++
>> 2 files changed, 30 insertions(+)
>>
>> diff --git a/include/linux/sched/isolation.h b/include/linux/sched/isolation.h
>> index cc9f393e2a70..94c25d956d8a 100644
>> --- a/include/linux/sched/isolation.h
>> +++ b/include/linux/sched/isolation.h
>> @@ -25,6 +25,7 @@ extern bool housekeeping_enabled(enum hk_flags flags);
>> extern void housekeeping_affine(struct task_struct *t, enum hk_flags flags);
>> extern bool housekeeping_test_cpu(int cpu, enum hk_flags flags);
>> extern void __init housekeeping_init(void);
>> +extern unsigned int num_housekeeping_cpus(void);
>>
>> #else
>>
>> @@ -46,6 +47,12 @@ static inline bool housekeeping_enabled(enum hk_flags flags)
>> static inline void housekeeping_affine(struct task_struct *t,
>> enum hk_flags flags) { }
>> static inline void housekeeping_init(void) { }
>> +
>> +static unsigned int num_housekeeping_cpus(void)
>> +{
>> + return num_online_cpus();
>> +}
>> +
>> #endif /* CONFIG_CPU_ISOLATION */
>>
>> static inline bool housekeeping_cpu(int cpu, enum hk_flags flags)
>> diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c
>> index 5a6ea03f9882..7024298390b7 100644
>> --- a/kernel/sched/isolation.c
>> +++ b/kernel/sched/isolation.c
>> @@ -13,6 +13,7 @@ DEFINE_STATIC_KEY_FALSE(housekeeping_overridden);
>> EXPORT_SYMBOL_GPL(housekeeping_overridden);
>> static cpumask_var_t housekeeping_mask;
>> static unsigned int housekeeping_flags;
>> +static atomic_t __num_housekeeping_cpus __read_mostly;
>>
>> bool housekeeping_enabled(enum hk_flags flags)
>> {
>> @@ -20,6 +21,27 @@ bool housekeeping_enabled(enum hk_flags flags)
>> }
>> EXPORT_SYMBOL_GPL(housekeeping_enabled);
>>
>> +/*
>> + * num_housekeeping_cpus() - Read the number of housekeeping CPUs.
>> + *
>> + * This function returns the number of available housekeeping CPUs
>> + * based on __num_housekeeping_cpus which is of type atomic_t
>> + * and is initialized at the time of the housekeeping setup.
>> + */
>> +unsigned int num_housekeeping_cpus(void)
>> +{
>> + unsigned int cpus;
>> +
>> + if (static_branch_unlikely(&housekeeping_overridden)) {
>> + cpus = atomic_read(&__num_housekeeping_cpus);
>> + /* We should always have at least one housekeeping CPU */
>> + BUG_ON(!cpus);
>> + return cpus;
>> + }
>> + return num_online_cpus();
>> +}
>> +EXPORT_SYMBOL_GPL(num_housekeeping_cpus);
>> +
>> int housekeeping_any_cpu(enum hk_flags flags)
>> {
>> int cpu;
>> @@ -131,6 +153,7 @@ static int __init housekeeping_setup(char *str, enum hk_flags flags)
>>
>> housekeeping_flags |= flags;
>>
>> + atomic_set(&__num_housekeeping_cpus, cpumask_weight(housekeeping_mask));
>> free_bootmem_cpumask_var(non_housekeeping_mask);
>>
>> return 1;
>> --
>> 2.27.0
>>
--
Nitesh
Attachment:
signature.asc
Description: OpenPGP digital signature
