redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Drivers: hv: fcopy: full handshake support 

Introduce FCOPY_VERSION_1 to support kernel replying to the negotiation
message with its own version.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Tested-by: Alex Ng <alexng@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Vitaly Kuznetsov 2015-04-11 18:07:58 -07:00 committed by Greg Kroah-Hartman
parent cd8dc05485
commit a4d1ee5b02
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/hv/hv_fcopy.c
View File

@ -62,6 +62,10 @@ static DECLARE_WORK(fcopy_send_work, fcopy_send_data);
static const char fcopy_devname[] = "vmbus/hv_fcopy";
static u8 *recv_buffer;
static struct hvutil_transport *hvt;
/*
* This state maintains the version number registered by the daemon.
*/
static int dm_reg_value;
static void fcopy_timeout_func(struct work_struct *dummy)
{
@ -81,8 +85,18 @@ static void fcopy_timeout_func(struct work_struct *dummy)
static int fcopy_handle_handshake(u32 version)
{
u32 our_ver = FCOPY_CURRENT_VERSION;
switch (version) {
case FCOPY_CURRENT_VERSION:
case FCOPY_VERSION_0:
/* Daemon doesn't expect us to reply */
dm_reg_value = version;
break;
case FCOPY_VERSION_1:
/* Daemon expects us to reply with our own version */
if (hvutil_transport_send(hvt, &our_ver, sizeof(our_ver)))
return -EFAULT;
dm_reg_value = version;
break;
default:
/*

3
include/uapi/linux/hyperv.h
View File

@ -105,7 +105,8 @@ struct hv_vss_msg {
*/
#define FCOPY_VERSION_0 0
#define FCOPY_CURRENT_VERSION FCOPY_VERSION_0
#define FCOPY_VERSION_1 1
#define FCOPY_CURRENT_VERSION FCOPY_VERSION_1
#define W_MAX_PATH 260
enum hv_fcopy_op {

15
tools/hv/hv_fcopy_daemon.c
View File

@ -137,6 +137,8 @@ int main(int argc, char *argv[])
int version = FCOPY_CURRENT_VERSION;
char *buffer[4096 * 2];
struct hv_fcopy_hdr *in_msg;
int in_handshake = 1;
__u32 kernel_modver;
static struct option long_options[] = {
{"help", no_argument, 0, 'h' },
@ -191,6 +193,19 @@ int main(int argc, char *argv[])
syslog(LOG_ERR, "pread failed: %s", strerror(errno));
exit(EXIT_FAILURE);
}
if (in_handshake) {
if (len != sizeof(kernel_modver)) {
syslog(LOG_ERR, "invalid version negotiation");
exit(EXIT_FAILURE);
}
kernel_modver = *(__u32 *)buffer;
in_handshake = 0;
syslog(LOG_INFO, "HV_FCOPY: kernel module version: %d",
kernel_modver);
continue;
}
in_msg = (struct hv_fcopy_hdr *)buffer;
switch (in_msg->operation) {