Drivers: hv: Minor cleanup around init_vp_index()
Subsystems (2)
cover Drivers: hv: Minor cleanup around init_vp_index()
Two minor changes with no functional change intended:
- s,alloced,allocated
- compare cpumasks and not their weights
Vitaly Kuznetsov (2):
Drivers: hv: Rename 'alloced' to 'allocated'
Drivers: hv: Compare cpumasks and not their weights in init_vp_index()
drivers/hv/channel_mgmt.c | 19 +++++++++---------- drivers/hv/hyperv_vmbus.h | 14 +++++++------- drivers/hv/vmbus_drv.c | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/2 Drivers: hv: Rename 'alloced' to 'allocated'
'Alloced' is not a real word and only saves us two letters, let's use 'allocated' instead.
No functional change intended.
--- drivers/hv/channel_mgmt.c | 18 +++++++++--------- drivers/hv/hyperv_vmbus.h | 14 +++++++------- drivers/hv/vmbus_drv.c | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-)
drivers/hv/channel_mgmt.c +9 -9
@@ -459,7 +459,7 @@ void hv_process_channel_removal(struct vmbus_channel *channel)* init_vp_index() can (re-)use the CPU. */ if (hv_is_perf_channel (channel)) -hv_clear_alloced_cpu (channel->target_cpu); +hv_clear_allocated_cpu (channel->target_cpu);/* * Upon suspend, an in-use hv_sock channel is marked as "rescinded" and
@@ -728,7 +728,7 @@ static void init_vp_index(struct vmbus_channel *channel)bool perf_chn =hv_is_perf_channel (channel);u32 i, ncpu =num_online_cpus ();cpumask_var_t available_mask; -struct cpumask *alloced_mask; +struct cpumask *allocated_mask;u32 target_cpu;int numa_node;
@@ -745,7 +745,7 @@ static void init_vp_index(struct vmbus_channel *channel)*/ channel->target_cpu =VMBUS_CONNECT_CPU ;if (perf_chn) -hv_set_alloced_cpu (VMBUS_CONNECT_CPU ); +hv_set_allocated_cpu (VMBUS_CONNECT_CPU );return ; }
@@ -760,22 +760,22 @@ static void init_vp_index(struct vmbus_channel *channel)continue ;break ; } - alloced_mask = &hv_context.hv_numa_map[numa_node]; + allocated_mask = &hv_context.hv_numa_map[numa_node]; -if (cpumask_weight (alloced_mask) == +if (cpumask_weight (allocated_mask) ==cpumask_weight (cpumask_of_node (numa_node))) {/* * We have cycled through all the CPUs in the node; -* reset the alloced map. +* reset the allocated map. */ -cpumask_clear (alloced_mask); +cpumask_clear (allocated_mask); } -cpumask_xor (available_mask, alloced_mask, +cpumask_xor (available_mask, allocated_mask,cpumask_of_node (numa_node)); target_cpu =cpumask_first (available_mask); -cpumask_set_cpu (target_cpu, alloced_mask); +cpumask_set_cpu (target_cpu, allocated_mask);if (channel->offermsg.offer.sub_channel_index >= ncpu || i > ncpu || !hv_cpuself_used (target_cpu, channel))
drivers/hv/hyperv_vmbus.h +7 -7
@@ -405,7 +405,7 @@ static inline bool hv_is_perf_channel(struct vmbus_channel *channel)return vmbus_devs[channel->device_id].perf_device; } -static inline bool hv_is_alloced_cpu (unsigned int cpu) +static inline bool hv_is_allocated_cpu (unsigned int cpu) {struct vmbus_channel *channel, *sc;
@@ -427,23 +427,23 @@ static inline bool hv_is_alloced_cpu(unsigned int cpu)return false; } -static inline void hv_set_alloced_cpu (unsigned int cpu) +static inline void hv_set_allocated_cpu (unsigned int cpu) {cpumask_set_cpu (cpu, &hv_context.hv_numa_map[cpu_to_node (cpu)]); } -static inline void hv_clear_alloced_cpu (unsigned int cpu) +static inline void hv_clear_allocated_cpu (unsigned int cpu) { -if (hv_is_alloced_cpu (cpu)) +if (hv_is_allocated_cpu (cpu))return ;cpumask_clear_cpu (cpu, &hv_context.hv_numa_map[cpu_to_node (cpu)]); } -static inline void hv_update_alloced_cpus (unsigned int old_cpu, +static inline void hv_update_allocated_cpus (unsigned int old_cpu,unsigned int new_cpu) { -hv_set_alloced_cpu (new_cpu); -hv_clear_alloced_cpu (old_cpu); +hv_set_allocated_cpu (new_cpu); +hv_clear_allocated_cpu (old_cpu); }#ifdef CONFIG_HYPERV_TESTING
drivers/hv/vmbus_drv.c +1 -1
@@ -1874,7 +1874,7 @@ static ssize_t target_cpu_store(struct vmbus_channel *channel,/* See init_vp_index(). */ if (hv_is_perf_channel (channel)) -hv_update_alloced_cpus (origin_cpu, target_cpu); +hv_update_allocated_cpus (origin_cpu, target_cpu);/* Currently set only for storvsc channels. */ if (channel->change_target_cpu_callback) {
Signature · 1 line
2.34.1
RE: [PATCH 1/2] Drivers: hv: Rename 'alloced' to 'allocated'
From: Vitaly Kuznetsov <[email protected]> Sent: Friday, January 28, 2022 2:34 AM
Quoted 4 lines
'Alloced' is not a real word and only saves us two letters, let's use 'allocated' instead.
Quoted 9 lines
No functional change intended.
Signed-off-by Vitaly Kuznetsov <[email protected]>--- drivers/hv/channel_mgmt.c | 18 +++++++++--------- drivers/hv/hyperv_vmbus.h | 14 +++++++------- drivers/hv/vmbus_drv.c | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-)
PATCH 2/2 Drivers: hv: Compare cpumasks and not their weights in init_vp_index()
In reply to Vitaly KuznetsovThe condition is supposed to check whether 'allocated_mask' got fully exhausted, i.e. there's no free CPU on the NUMA node left so we have to use one of the already used CPUs. As only bits which correspond to CPUs from 'cpumask_of_node(numa_node)' get set in 'allocated_mask', checking for the equal weights is technically correct but not obvious. Let's compare cpumasks directly.
No functional change intended.
--- drivers/hv/channel_mgmt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/hv/channel_mgmt.c +1 -2
@@ -762,8 +762,7 @@ static void init_vp_index(struct vmbus_channel *channel) } allocated_mask = &hv_context.hv_numa_map[numa_node]; -if (cpumask_weight (allocated_mask) == -cpumask_weight (cpumask_of_node (numa_node))) { +if (cpumask_equal (allocated_mask,cpumask_of_node (numa_node))) {/* * We have cycled through all the CPUs in the node; * reset the allocated map.
Signature · 1 line
2.34.1
RE: [PATCH 2/2] Drivers: hv: Compare cpumasks and not their weights in init_vp_index()
From: Vitaly Kuznetsov <[email protected]> Sent: Friday, January 28, 2022 2:34 AM
Quoted 30 lines
The condition is supposed to check whether '
allocated_mask' got fully exhausted, i.e. there's no free CPU on the NUMA node left so we have to use one of the already used CPUs. As only bits which correspond to CPUs from 'cpumask_of_node(numa_node)' get set in 'allocated_mask', checking for the equal weights is technically correct but not obvious. Let's compare cpumasks directly.No functional change intended.
Suggested-by Michael Kelley <[email protected]>Signed-off-by Vitaly Kuznetsov <[email protected]>--- drivers/hv/channel_mgmt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/hv/channel_mgmt.c +1
-2@@ -762,8 +762,7 @@ static void init_vp_index(struct vmbus_channel *channel) } allocated_mask = &hv_context.hv_numa_map[numa_node]; -if (cpumask_weight (allocated_mask) == -cpumask_weight (cpumask_of_node (numa_node))) { +if (cpumask_equal (allocated_mask,cpumask_of_node (numa_node))) {/* * We have cycled through all the CPUs in the node;
Quoted 3 lines
* reset the allocated map.
--
2.34.1
Wei Liu
maintainerQuoted 7 lines · Vitaly Kuznetsov
Two minor changes with no functional change intended:
- s,alloced,allocated
- compare cpumasks and not their weightsVitaly Kuznetsov (2):
Drivers: hv: Rename 'alloced' to 'allocated'
Drivers: hv: Compare cpumasks and not their weights ininit_vp_index()
Series applied to hyperv-next. Thanks.
Quoted 9 lines
drivers/hv/channel_mgmt.c | 19 +++++++++---------- drivers/hv/hyperv_vmbus.h | 14 +++++++------- drivers/hv/vmbus_drv.c | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-)Signature · 1 line
2.34.1