xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drivers: hv: vmbus: Remove the numa_node field from the vmbus_channel struct

Browse Source 
The field is read only in numa_node_show() and it is already stored twice
(after a call to cpu_to_node()) in target_cpu_store() and init_vp_index();
there is no need to "cache" its value in the channel data structure.

Signed-off-by: Andrea Parri (Microsoft) <parri.andrea@gmail.com>
Link: https://lore.kernel.org/r/20200617164642.37393-3-parri.andrea@gmail.com
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Signed-off-by: Wei Liu <wei.liu@kernel.org>
This commit is contained in:
Andrea Parri (Microsoft)
2020-06-17 18:46:36 +02:00
committed by Wei Liu
parent 5bf7468211
commit 458d090fba
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hv/channel_mgmt.c
View File

@@ -702,7 +702,6 @@ static void init_vp_index(struct vmbus_channel *channel)
* In case alloc_cpumask_var() fails, bind it to * In case alloc_cpumask_var() fails, bind it to
* VMBUS_CONNECT_CPU. * VMBUS_CONNECT_CPU.
*/ */
channel->numa_node = cpu_to_node(VMBUS_CONNECT_CPU);
channel->target_cpu = VMBUS_CONNECT_CPU; channel->target_cpu = VMBUS_CONNECT_CPU;
if (perf_chn) if (perf_chn)
hv_set_alloced_cpu(VMBUS_CONNECT_CPU); hv_set_alloced_cpu(VMBUS_CONNECT_CPU);
@@ -719,7 +718,6 @@ static void init_vp_index(struct vmbus_channel *channel)
continue; continue;
break; break;
} }
channel->numa_node = numa_node;
alloced_mask = &hv_context.hv_numa_map[numa_node]; alloced_mask = &hv_context.hv_numa_map[numa_node];
if (cpumask_weight(alloced_mask) == if (cpumask_weight(alloced_mask) ==

3
drivers/hv/vmbus_drv.c
View File

@@ -226,7 +226,7 @@ static ssize_t numa_node_show(struct device *dev,
if (!hv_dev->channel) if (!hv_dev->channel)
return -ENODEV; return -ENODEV;
return sprintf(buf, "%d\n", hv_dev->channel->numa_node); return sprintf(buf, "%d\n", cpu_to_node(hv_dev->channel->target_cpu));
} }
static DEVICE_ATTR_RO(numa_node); static DEVICE_ATTR_RO(numa_node);
#endif #endif
@@ -1778,7 +1778,6 @@ static ssize_t target_cpu_store(struct vmbus_channel *channel,
*/ */
channel->target_cpu = target_cpu; channel->target_cpu = target_cpu;
channel->numa_node = cpu_to_node(target_cpu);
/* See init_vp_index(). */ /* See init_vp_index(). */
if (hv_is_perf_channel(channel)) if (hv_is_perf_channel(channel))

1
include/linux/hyperv.h
View File

@@ -812,7 +812,6 @@ struct vmbus_channel {
* the earlier behavior. * the earlier behavior.
*/ */
u32 target_cpu; u32 target_cpu;
int numa_node;
/* /*
* Support for sub-channels. For high performance devices, * Support for sub-channels. For high performance devices,
* it will be useful to have multiple sub-channels to support * it will be useful to have multiple sub-channels to support