Drivers: hv: Miscellaneous fixes
Subsystems (3)
cover Drivers: hv: Miscellaneous fixes
From: "K. Y. Srinivasan" <[email protected]>
Miscellaneous fixes.
Dexuan Cui (4):
Drivers: hv: vmbus: Fix the descriptions of some function parameters
Drivers: hv: kvp: Fix the indentation of some "break" statements
Drivers: hv: kvp: Fix two "this statement may fall through" warnings
Drivers: hv: vmbus: Use cpumask_var_t for on-stack cpu mask
drivers/hv/channel.c | 24 +++++++++++++----------- drivers/hv/channel_mgmt.c | 37 ++++++++++++++++++------------------- drivers/hv/hv_kvp.c | 14 ++++++++------ 3 files changed, 39 insertions(+), 36 deletions(-)
Signature · 1 line
2.18.0
PATCH 2/4 Drivers: hv: kvp: Fix the indentation of some "break" statements
In reply to [email protected]From: Dexuan Cui <[email protected]>
No functional change.
--- drivers/hv/hv_kvp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/hv/hv_kvp.c +4 -4
@@ -421,7 +421,7 @@ kvp_send_key(struct work_struct *dummy)UTF16_LITTLE_ENDIAN , message->body.kvp_set.data.value, HV_KVP_EXCHANGE_MAX_VALUE_SIZE - 1) + 1; -break ; +break ;case REG_U32 :/*
@@ -454,7 +454,7 @@ kvp_send_key(struct work_struct *dummy)UTF16_LITTLE_ENDIAN , message->body.kvp_set.data.key, HV_KVP_EXCHANGE_MAX_KEY_SIZE - 1) + 1; -break ; +break ;case KVP_OP_DELETE : message->body.kvp_delete.key_size =
@@ -464,12 +464,12 @@ kvp_send_key(struct work_struct *dummy)UTF16_LITTLE_ENDIAN , message->body.kvp_delete.key, HV_KVP_EXCHANGE_MAX_KEY_SIZE - 1) + 1; -break ; +break ;case KVP_OP_ENUMERATE : message->body.kvp_enum_data.index = in_msg->body.kvp_enum_data.index; -break ; +break ; } kvp_transaction.state =HVUTIL_USERSPACE_REQ ;
Signature · 1 line
2.18.0
PATCH 1/4 Drivers: hv: vmbus: Fix the descriptions of some function parameters
In reply to [email protected]From: Dexuan Cui <[email protected]>
No functional change.
Added descriptions for some parameters. Fixed some typos.
Removed some out-of-date comments.
--- drivers/hv/channel.c | 24 +++++++++++++----------- drivers/hv/channel_mgmt.c | 23 +++++++++-------------- 2 files changed, 22 insertions(+), 25 deletions(-)
drivers/hv/channel.c +13 -11
@@ -709,15 +709,16 @@ EXPORT_SYMBOL_GPL(vmbus_close);/** * vmbus_sendpacket() - Send the specified buffer on the given channel -* @channel: Pointer to vmbus_channel structure. -* @buffer: Pointer to the buffer you want to receive the data into. -* @bufferlen: Maximum size of what the the buffer will hold +* @channel: Pointer to vmbus_channel structure +* @buffer: Pointer to the buffer you want to send the data from. +* @bufferlen: Maximum size of what the buffer holds. * @requestid: Identifier of the request -* @type: Type of packet that is being send e.g. negotiate, time -* packet etc. +* @type: Type of packet that is being sent e.g. negotiate, time +* packet etc. +* @flags: 0 or VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED * -* Sends data in @buffer directly to hyper-v via the vmbus -* This will send the data unparsed to hyper-v. +* Sends data in @buffer directly to Hyper-V via the vmbus. +* This will send the data unparsed to Hyper-V. * * Mainly used by Hyper-V drivers. */
@@ -850,12 +851,13 @@ int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,EXPORT_SYMBOL_GPL (vmbus_sendpacket_mpb_desc);/** -* vmbus_recvpacket() - Retrieve the user packet on the specified channel -* @channel: Pointer to vmbus_channel structure. +* __vmbus_recvpacket() - Retrieve the user packet on the specified channel +* @channel: Pointer to vmbus_channel structure * @buffer: Pointer to the buffer you want to receive the data into. -* @bufferlen: Maximum size of what the the buffer will hold -* @buffer_actual_len: The actual size of the data after it was received +* @bufferlen: Maximum size of what the buffer can hold. +* @buffer_actual_len: The actual size of the data after it was received. * @requestid: Identifier of the request +* @raw: true means keep the vmpacket_descriptor header in the received data. * * Receives directly from the hyper-v vmbus and puts the data it received * into Buffer. This will receive the data unparsed from hyper-v.
drivers/hv/channel_mgmt.c +9 -14
@@ -198,24 +198,19 @@ static u16 hv_get_dev_type(const struct vmbus_channel *channel) }/** -* vmbus_prep_negotiate_resp() - Create default response for Hyper-V Negotiate message +* vmbus_prep_negotiate_resp() - Create default response for Negotiate message * @icmsghdrp: Pointer to msg header structure -* @icmsg_negotiate: Pointer to negotiate message structure * @buf: Raw buffer channel data +* @fw_version: The framework versions we can support. +* @fw_vercnt: The size of @fw_version. +* @srv_version: The service versions we can support. +* @srv_vercnt: The size of @srv_version. +* @nego_fw_version: The selected framework version. +* @nego_srv_version: The selected service version. * -* @icmsghdrp is of type &struct icmsg_hdr. -* Set up and fill in default negotiate response message. -* -* The fw_version and fw_vercnt specifies the framework version that -* we can support. -* -* The srv_version and srv_vercnt specifies the service -* versions we can support. -* -* Versions are given in decreasing order. -* -* nego_fw_version and nego_srv_version store the selected protocol versions. +* Note: Versions are given in decreasing order. * +* Set up and fill in default negotiate response message. * Mainly used by Hyper-V drivers. */ bool vmbus_prep_negotiate_resp(struct icmsg_hdr *icmsghdrp,
Signature · 1 line
2.18.0
PATCH 4/4 Drivers: hv: vmbus: Use cpumask_var_t for on-stack cpu mask
From: Dexuan Cui <[email protected]>
A cpumask structure on the stack can cause a warning with CONFIG_NR_CPUS=8192 (e.g. Ubuntu 16.04 and 18.04 use this):
drivers/hv//channel_mgmt.c: In function ‘init_vp_index’:
drivers/hv//channel_mgmt.c:702:1: warning: the frame size of 1032 bytes
is larger than 1024 bytes [-Wframe-larger-than=]
Nowadays it looks most distros enable CONFIG_CPUMASK_OFFSTACK=y, and hence we can work around the warning by using cpumask_var_t.
--- drivers/hv/channel_mgmt.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/hv/channel_mgmt.c +9 -5
@@ -601,16 +601,18 @@ static void init_vp_index(struct vmbus_channel *channel, u16 dev_type)bool perf_chn = vmbus_devs[dev_type].perf_device;struct vmbus_channel *primary = channel->primary_channel;int next_node; -struct cpumask available_mask; +cpumask_var_t available_mask;struct cpumask *alloced_mask;if ((vmbus_proto_version ==VERSION_WS2008 ) || - (vmbus_proto_version ==VERSION_WIN7 ) || (!perf_chn)) { + (vmbus_proto_version ==VERSION_WIN7 ) || (!perf_chn) || + !alloc_cpumask_var (&available_mask,GFP_KERNEL )) {/* * Prior to win8, all channel interrupts are * delivered on cpu 0. * Also if the channel is not a performance critical * channel, bind it to cpu 0. +* In case alloc_cpumask_var() fails, bind it to cpu 0. */ channel->numa_node =0 ; channel->target_cpu =0 ;
@@ -648,7 +650,7 @@ static void init_vp_index(struct vmbus_channel *channel, u16 dev_type)cpumask_clear (alloced_mask); } -cpumask_xor (&available_mask, alloced_mask, +cpumask_xor (available_mask, alloced_mask,cpumask_of_node (primary->numa_node)); cur_cpu =-1 ;
@@ -666,10 +668,10 @@ static void init_vp_index(struct vmbus_channel *channel, u16 dev_type) }while (true) { - cur_cpu =cpumask_next (cur_cpu, &available_mask); + cur_cpu =cpumask_next (cur_cpu, available_mask);if (cur_cpu >= nr_cpu_ids) { cur_cpu =-1 ; -cpumask_copy (&available_mask, +cpumask_copy (available_mask,cpumask_of_node (primary->numa_node));continue ; }
@@ -699,6 +701,8 @@ static void init_vp_index(struct vmbus_channel *channel, u16 dev_type) channel->target_cpu = cur_cpu; channel->target_vp =hv_cpu_number_to_vp_number (cur_cpu); + +free_cpumask_var (available_mask); }static void vmbus_wait_for_unload (void )
Signature · 1 line
2.18.0
PATCH 3/4 Drivers: hv: kvp: Fix two "this statement may fall through" warnings
In reply to [email protected]From: Dexuan Cui <[email protected]>
We don't need to call process_ib_ipinfo() if message->kvp_hdr.operation is KVP_OP_GET_IP_INFO in kvp_send_key(), because here we just need to pass on the op code from the host to the userspace; when the userspace returns the info requested by the host, we pass the info on to the host in kvp_respond_to_host() -> process_ob_ipinfo(). BTW, the current buggy code actually doesn't cause any harm, because only message->kvp_hdr.operation is used by the userspace, in the case of KVP_OP_GET_IP_INFO.
The patch also adds a missing "break;" in kvp_send_key(). BTW, the current buggy code actually doesn't cause any harm, because in the case of KVP_OP_SET, the unexpected fall-through corrupts message->body.kvp_set.data.key_size, but that is not really used: see the definition of struct hv_kvp_exchg_msg_value.
--- drivers/hv/hv_kvp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/hv/hv_kvp.c +4 -2
@@ -353,7 +353,6 @@ static void process_ib_ipinfo(void *in_msg, void *out_msg, int op) out->body.kvp_ip_val.dhcp_enabled = in->kvp_ip_val.dhcp_enabled; -default : utf16s_to_utf8s((wchar_t *)in->kvp_ip_val.adapter_id, MAX_ADAPTER_ID_SIZE, UTF16_LITTLE_ENDIAN,
@@ -406,7 +405,7 @@ kvp_send_key(struct work_struct *dummy)process_ib_ipinfo (in_msg, message,KVP_OP_SET_IP_INFO );break ;case KVP_OP_GET_IP_INFO : -process_ib_ipinfo (in_msg, message,KVP_OP_GET_IP_INFO ); +/* We only need to pass on message->kvp_hdr.operation. */ break ;case KVP_OP_SET :switch (in_msg->body.kvp_set.data.value_type) {
@@ -446,6 +445,9 @@ kvp_send_key(struct work_struct *dummy)break ; } + +break ; +case KVP_OP_GET : message->body.kvp_set.data.key_size = utf16s_to_utf8s(
Signature · 1 line
2.18.0