summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2014-09-26 03:03:58 +0000
committergjb <gjb@FreeBSD.org>2014-09-26 03:03:58 +0000
commit91dd3107b120da0b78ee5edda663e91a6f9e5a79 (patch)
tree42087c96251fd97a010878503dc6d8dea801c8a5 /sys
parentd7f74356449e59ba511e94714ccff7ee2f7219ff (diff)
downloadFreeBSD-src-91dd3107b120da0b78ee5edda663e91a6f9e5a79.zip
FreeBSD-src-91dd3107b120da0b78ee5edda663e91a6f9e5a79.tar.gz
Properly revert r272128.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files.amd641
-rw-r--r--sys/conf/files.i3861
-rw-r--r--sys/dev/hyperv/include/hyperv.h29
-rw-r--r--sys/dev/hyperv/utilities/hv_kvp.c1001
-rw-r--r--sys/dev/hyperv/utilities/hv_kvp.h143
-rw-r--r--sys/dev/hyperv/utilities/hv_util.c47
-rw-r--r--sys/dev/hyperv/utilities/unicode.h201
-rw-r--r--sys/modules/hyperv/utilities/Makefile2
8 files changed, 103 insertions, 1322 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 4d5cb60..28f9619 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -234,7 +234,6 @@ dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv
dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv
dev/hyperv/stordisengage/hv_ata_pci_disengage.c optional hyperv
dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv
-dev/hyperv/utilities/hv_kvp.c optional hyperv
dev/hyperv/utilities/hv_util.c optional hyperv
dev/hyperv/vmbus/hv_channel.c optional hyperv
dev/hyperv/vmbus/hv_channel_mgmt.c optional hyperv
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 2446a7b..43b0e5b 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -227,7 +227,6 @@ dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv
dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv
dev/hyperv/stordisengage/hv_ata_pci_disengage.c optional hyperv
dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv
-dev/hyperv/utilities/hv_kvp.c optional hyperv
dev/hyperv/utilities/hv_util.c optional hyperv
dev/hyperv/vmbus/hv_channel.c optional hyperv
dev/hyperv/vmbus/hv_channel_mgmt.c optional hyperv
diff --git a/sys/dev/hyperv/include/hyperv.h b/sys/dev/hyperv/include/hyperv.h
index 8a45d89..4257b37 100644
--- a/sys/dev/hyperv/include/hyperv.h
+++ b/sys/dev/hyperv/include/hyperv.h
@@ -795,34 +795,5 @@ hv_get_phys_addr(void *virt)
return (ret);
}
-
-/**
- * KVP related structures
- *
- */
-typedef struct hv_vmbus_service {
- hv_guid guid; /* Hyper-V GUID */
- char *name; /* name of service */
- boolean_t enabled; /* service enabled */
- hv_work_queue *work_queue; /* background work queue */
-
- /*
- * function to initialize service
- */
- int (*init)(struct hv_vmbus_service *);
-
- /*
- * function to process Hyper-V messages
- */
- void (*callback)(void *);
-} hv_vmbus_service;
-
-extern uint8_t* receive_buffer[];
-extern hv_vmbus_service service_table[];
-
-void hv_kvp_callback(void *context);
-int hv_kvp_init(hv_vmbus_service *serv);
-void hv_kvp_deinit(void);
-
#endif /* __HYPERV_H__ */
diff --git a/sys/dev/hyperv/utilities/hv_kvp.c b/sys/dev/hyperv/utilities/hv_kvp.c
deleted file mode 100644
index 848d364..0000000
--- a/sys/dev/hyperv/utilities/hv_kvp.c
+++ /dev/null
@@ -1,1001 +0,0 @@
-/*-
- * Copyright (c) 2014 Microsoft Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice unmodified, this list of conditions, and the following
- * disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Author: Sainath Varanasi.
- * Date: 4/2012
- * Email: bsdic@microsoft.com
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/uio.h>
-#include <sys/bus.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/module.h>
-#include <sys/reboot.h>
-#include <sys/lock.h>
-#include <sys/taskqueue.h>
-#include <sys/sysctl.h>
-#include <sys/poll.h>
-#include <sys/proc.h>
-#include <sys/kthread.h>
-#include <sys/syscallsubr.h>
-#include <sys/sysproto.h>
-#include <sys/un.h>
-#include <sys/endian.h>
-#include <sys/_null.h>
-#include <sys/signal.h>
-#include <sys/syslog.h>
-#include <sys/mutex.h>
-#include <net/if_arp.h>
-
-#include <dev/hyperv/include/hyperv.h>
-#include <dev/hyperv/netvsc/hv_net_vsc.h>
-
-#include "unicode.h"
-#include "hv_kvp.h"
-
-/* hv_kvp defines */
-#define BUFFERSIZE sizeof(struct hv_kvp_msg)
-#define KVP_SUCCESS 0
-#define KVP_ERROR 1
-#define kvp_hdr hdr.kvp_hdr
-
-/* hv_kvp debug control */
-static int hv_kvp_log = 0;
-SYSCTL_INT(_dev, OID_AUTO, hv_kvp_log, CTLFLAG_RW, &hv_kvp_log, 0,
- "hv_kvp log");
-
-#define hv_kvp_log_error(...) do { \
- if (hv_kvp_log > 0) \
- log(LOG_ERR, "hv_kvp: " __VA_ARGS__); \
-} while (0)
-
-#define hv_kvp_log_info(...) do { \
- if (hv_kvp_log > 1) \
- log(LOG_INFO, "hv_kvp: " __VA_ARGS__); \
-} while (0)
-
-/* character device prototypes */
-static d_open_t hv_kvp_dev_open;
-static d_close_t hv_kvp_dev_close;
-static d_read_t hv_kvp_dev_daemon_read;
-static d_write_t hv_kvp_dev_daemon_write;
-static d_poll_t hv_kvp_dev_daemon_poll;
-
-/* hv_kvp prototypes */
-static int hv_kvp_req_in_progress(void);
-static void hv_kvp_transaction_init(uint32_t, hv_vmbus_channel *, uint64_t, uint8_t *);
-static void hv_kvp_send_msg_to_daemon(void);
-static void hv_kvp_process_request(void *context);
-
-/* hv_kvp character device structure */
-static struct cdevsw hv_kvp_cdevsw =
-{
- .d_version = D_VERSION,
- .d_open = hv_kvp_dev_open,
- .d_close = hv_kvp_dev_close,
- .d_read = hv_kvp_dev_daemon_read,
- .d_write = hv_kvp_dev_daemon_write,
- .d_poll = hv_kvp_dev_daemon_poll,
- .d_name = "hv_kvp_dev",
-};
-static struct cdev *hv_kvp_dev;
-static struct hv_kvp_msg *hv_kvp_dev_buf;
-struct proc *daemon_task;
-
-/*
- * Global state to track and synchronize multiple
- * KVP transaction requests from the host.
- */
-static struct {
-
- /* Pre-allocated work item for queue */
- hv_work_item work_item;
-
- /* Unless specified the pending mutex should be
- * used to alter the values of the following paramters:
- * 1. req_in_progress
- * 2. req_timed_out
- * 3. pending_reqs.
- */
- struct mtx pending_mutex;
-
- /* To track if transaction is active or not */
- boolean_t req_in_progress;
- /* Tracks if daemon did not reply back in time */
- boolean_t req_timed_out;
- /* Tracks if daemon is serving a request currently */
- boolean_t daemon_busy;
- /* Count of KVP requests from Hyper-V. */
- uint64_t pending_reqs;
-
-
- /* Length of host message */
- uint32_t host_msg_len;
-
- /* Pointer to channel */
- hv_vmbus_channel *channelp;
-
- /* Host message id */
- uint64_t host_msg_id;
-
- /* Current kvp message from the host */
- struct hv_kvp_msg *host_kvp_msg;
-
- /* Current kvp message for daemon */
- struct hv_kvp_msg daemon_kvp_msg;
-
- /* Rcv buffer for communicating with the host*/
- uint8_t *rcv_buf;
-
- /* Device semaphore to control communication */
- struct sema dev_sema;
-
- /* Indicates if daemon registered with driver */
- boolean_t register_done;
-
- /* Character device status */
- boolean_t dev_accessed;
-} kvp_globals;
-
-/* global vars */
-MALLOC_DECLARE(M_HV_KVP_DEV_BUF);
-MALLOC_DEFINE(M_HV_KVP_DEV_BUF, "hv_kvp_dev buffer", "buffer for hv_kvp_dev module");
-
-/*
- * hv_kvp low level functions
- */
-
-/*
- * Check if kvp transaction is in progres
- */
-static int
-hv_kvp_req_in_progress(void)
-{
-
- return (kvp_globals.req_in_progress);
-}
-
-
-/*
- * This routine is called whenever a message is received from the host
- */
-static void
-hv_kvp_transaction_init(uint32_t rcv_len, hv_vmbus_channel *rcv_channel,
- uint64_t request_id, uint8_t *rcv_buf)
-{
-
- /* Store all the relevant message details in the global structure */
- /* Do not need to use mutex for req_in_progress here */
- kvp_globals.req_in_progress = true;
- kvp_globals.host_msg_len = rcv_len;
- kvp_globals.channelp = rcv_channel;
- kvp_globals.host_msg_id = request_id;
- kvp_globals.rcv_buf = rcv_buf;
- kvp_globals.host_kvp_msg = (struct hv_kvp_msg *)&rcv_buf[
- sizeof(struct hv_vmbus_pipe_hdr) +
- sizeof(struct hv_vmbus_icmsg_hdr)];
-}
-
-
-/*
- * hv_kvp - version neogtiation function
- */
-static void
-hv_kvp_negotiate_version(struct hv_vmbus_icmsg_hdr *icmsghdrp,
- struct hv_vmbus_icmsg_negotiate *negop,
- uint8_t *buf)
-{
- int icframe_vercnt;
- int icmsg_vercnt;
-
- icmsghdrp->icmsgsize = 0x10;
-
- negop = (struct hv_vmbus_icmsg_negotiate *)&buf[
- sizeof(struct hv_vmbus_pipe_hdr) +
- sizeof(struct hv_vmbus_icmsg_hdr)];
- icframe_vercnt = negop->icframe_vercnt;
- icmsg_vercnt = negop->icmsg_vercnt;
-
- /*
- * Select the framework version number we will support
- */
- if ((icframe_vercnt >= 2) && (negop->icversion_data[1].major == 3)) {
- icframe_vercnt = 3;
- if (icmsg_vercnt >= 2)
- icmsg_vercnt = 4;
- else
- icmsg_vercnt = 3;
- } else {
- icframe_vercnt = 1;
- icmsg_vercnt = 1;
- }
-
- negop->icframe_vercnt = 1;
- negop->icmsg_vercnt = 1;
- negop->icversion_data[0].major = icframe_vercnt;
- negop->icversion_data[0].minor = 0;
- negop->icversion_data[1].major = icmsg_vercnt;
- negop->icversion_data[1].minor = 0;
-}
-
-
-/*
- * Convert ip related info in umsg from utf8 to utf16 and store in hmsg
- */
-static int
-hv_kvp_convert_utf8_ipinfo_to_utf16(struct hv_kvp_msg *umsg,
- struct hv_kvp_ip_msg *host_ip_msg)
-{
- int err_ip, err_subnet, err_gway, err_dns, err_adap;
- int UNUSED_FLAG = 1;
-
- utf8_to_utf16((uint16_t *)host_ip_msg->kvp_ip_val.ip_addr,
- MAX_IP_ADDR_SIZE,
- (char *)umsg->body.kvp_ip_val.ip_addr,
- strlen((char *)umsg->body.kvp_ip_val.ip_addr),
- UNUSED_FLAG,
- &err_ip);
- utf8_to_utf16((uint16_t *)host_ip_msg->kvp_ip_val.sub_net,
- MAX_IP_ADDR_SIZE,
- (char *)umsg->body.kvp_ip_val.sub_net,
- strlen((char *)umsg->body.kvp_ip_val.sub_net),
- UNUSED_FLAG,
- &err_subnet);
- utf8_to_utf16((uint16_t *)host_ip_msg->kvp_ip_val.gate_way,
- MAX_GATEWAY_SIZE,
- (char *)umsg->body.kvp_ip_val.gate_way,
- strlen((char *)umsg->body.kvp_ip_val.gate_way),
- UNUSED_FLAG,
- &err_gway);
- utf8_to_utf16((uint16_t *)host_ip_msg->kvp_ip_val.dns_addr,
- MAX_IP_ADDR_SIZE,
- (char *)umsg->body.kvp_ip_val.dns_addr,
- strlen((char *)umsg->body.kvp_ip_val.dns_addr),
- UNUSED_FLAG,
- &err_dns);
- utf8_to_utf16((uint16_t *)host_ip_msg->kvp_ip_val.adapter_id,
- MAX_IP_ADDR_SIZE,
- (char *)umsg->body.kvp_ip_val.adapter_id,
- strlen((char *)umsg->body.kvp_ip_val.adapter_id),
- UNUSED_FLAG,
- &err_adap);
-
- host_ip_msg->kvp_ip_val.dhcp_enabled = umsg->body.kvp_ip_val.dhcp_enabled;
- host_ip_msg->kvp_ip_val.addr_family = umsg->body.kvp_ip_val.addr_family;
-
- return (err_ip | err_subnet | err_gway | err_dns | err_adap);
-}
-
-
-/*
- * Convert ip related info in hmsg from utf16 to utf8 and store in umsg
- */
-static int
-hv_kvp_convert_utf16_ipinfo_to_utf8(struct hv_kvp_ip_msg *host_ip_msg,
- struct hv_kvp_msg *umsg)
-{
- int err_ip, err_subnet, err_gway, err_dns, err_adap;
- int UNUSED_FLAG = 1;
- int guid_index;
- struct hv_device *hv_dev; /* GUID Data Structure */
- hn_softc_t *sc; /* hn softc structure */
- char if_name[4];
- unsigned char guid_instance[40];
- char *guid_data = NULL;
- char buf[39];
-
- struct guid_extract {
- char a1[2];
- char a2[2];
- char a3[2];
- char a4[2];
- char b1[2];
- char b2[2];
- char c1[2];
- char c2[2];
- char d[4];
- char e[12];
- };
-
- struct guid_extract *id;
- device_t *devs;
- int devcnt;
-
- /* IP Address */
- utf16_to_utf8((char *)umsg->body.kvp_ip_val.ip_addr,
- MAX_IP_ADDR_SIZE,
- (uint16_t *)host_ip_msg->kvp_ip_val.ip_addr,
- MAX_IP_ADDR_SIZE,
- UNUSED_FLAG,
- &err_ip);
-
- /* Adapter ID : GUID */
- utf16_to_utf8((char *)umsg->body.kvp_ip_val.adapter_id,
- MAX_ADAPTER_ID_SIZE,
- (uint16_t *)host_ip_msg->kvp_ip_val.adapter_id,
- MAX_ADAPTER_ID_SIZE,
- UNUSED_FLAG,
- &err_adap);
-
- if (devclass_get_devices(devclass_find("hn"), &devs, &devcnt) == 0) {
- for (devcnt = devcnt - 1; devcnt >= 0; devcnt--) {
- sc = device_get_softc(devs[devcnt]);
-
- /* Trying to find GUID of Network Device */
- hv_dev = sc->hn_dev_obj;
-
- for (guid_index = 0; guid_index < 16; guid_index++) {
- sprintf(&guid_instance[guid_index * 2], "%02x",
- hv_dev->device_id.data[guid_index]);
- }
-
- guid_data = (char *)guid_instance;
- id = (struct guid_extract *)guid_data;
- snprintf(buf, sizeof(buf), "{%.2s%.2s%.2s%.2s-%.2s%.2s-%.2s%.2s-%.4s-%s}",
- id->a4, id->a3, id->a2, id->a1,
- id->b2, id->b1, id->c2, id->c1, id->d, id->e);
- guid_data = NULL;
- sprintf(if_name, "%s%d", "hn", device_get_unit(devs[devcnt]));
-
- if (strncmp(buf, (char *)umsg->body.kvp_ip_val.adapter_id, 39) == 0) {
- strcpy((char *)umsg->body.kvp_ip_val.adapter_id, if_name);
- break;
- }
- }
- free(devs, M_TEMP);
- }
-
- /* Address Family , DHCP , SUBNET, Gateway, DNS */
- umsg->kvp_hdr.operation = host_ip_msg->operation;
- umsg->body.kvp_ip_val.addr_family = host_ip_msg->kvp_ip_val.addr_family;
- umsg->body.kvp_ip_val.dhcp_enabled = host_ip_msg->kvp_ip_val.dhcp_enabled;
- utf16_to_utf8((char *)umsg->body.kvp_ip_val.sub_net, MAX_IP_ADDR_SIZE,
- (uint16_t *)host_ip_msg->kvp_ip_val.sub_net,
- MAX_IP_ADDR_SIZE,
- UNUSED_FLAG,
- &err_subnet);
-
- utf16_to_utf8((char *)umsg->body.kvp_ip_val.gate_way, MAX_GATEWAY_SIZE,
- (uint16_t *)host_ip_msg->kvp_ip_val.gate_way,
- MAX_GATEWAY_SIZE,
- UNUSED_FLAG,
- &err_gway);
-
- utf16_to_utf8((char *)umsg->body.kvp_ip_val.dns_addr, MAX_IP_ADDR_SIZE,
- (uint16_t *)host_ip_msg->kvp_ip_val.dns_addr,
- MAX_IP_ADDR_SIZE,
- UNUSED_FLAG,
- &err_dns);
-
- return (err_ip | err_subnet | err_gway | err_dns | err_adap);
-}
-
-
-/*
- * Prepare a user kvp msg based on host kvp msg (utf16 to utf8)
- * Ensure utf16_utf8 takes care of the additional string terminating char!!
- */
-static void
-hv_kvp_convert_hostmsg_to_usermsg(void)
-{
- int utf_err = 0;
- uint32_t value_type;
- struct hv_kvp_ip_msg *host_ip_msg = (struct hv_kvp_ip_msg *)
- kvp_globals.host_kvp_msg;
-
- struct hv_kvp_msg *hmsg = kvp_globals.host_kvp_msg;
- struct hv_kvp_msg *umsg = &kvp_globals.daemon_kvp_msg;
-
- memset(umsg, 0, sizeof(struct hv_kvp_msg));
-
- umsg->kvp_hdr.operation = hmsg->kvp_hdr.operation;
- umsg->kvp_hdr.pool = hmsg->kvp_hdr.pool;
-
- switch (umsg->kvp_hdr.operation) {
- case HV_KVP_OP_SET_IP_INFO:
- hv_kvp_convert_utf16_ipinfo_to_utf8(host_ip_msg, umsg);
- break;
-
- case HV_KVP_OP_GET_IP_INFO:
- utf16_to_utf8((char *)umsg->body.kvp_ip_val.adapter_id,
- MAX_ADAPTER_ID_SIZE,
- (uint16_t *)host_ip_msg->kvp_ip_val.adapter_id,
- MAX_ADAPTER_ID_SIZE, 1, &utf_err);
-
- umsg->body.kvp_ip_val.addr_family =
- host_ip_msg->kvp_ip_val.addr_family;
- break;
-
- case HV_KVP_OP_SET:
- value_type = hmsg->body.kvp_set.data.value_type;
-
- switch (value_type) {
- case HV_REG_SZ:
- umsg->body.kvp_set.data.value_size =
- utf16_to_utf8(
- (char *)umsg->body.kvp_set.data.msg_value.value,
- HV_KVP_EXCHANGE_MAX_VALUE_SIZE - 1,
- (uint16_t *)hmsg->body.kvp_set.data.msg_value.value,
- hmsg->body.kvp_set.data.value_size,
- 1, &utf_err);
- /* utf8 encoding */
- umsg->body.kvp_set.data.value_size =
- umsg->body.kvp_set.data.value_size / 2;
- break;
-
- case HV_REG_U32:
- umsg->body.kvp_set.data.value_size =
- sprintf(umsg->body.kvp_set.data.msg_value.value, "%d",
- hmsg->body.kvp_set.data.msg_value.value_u32) + 1;
- break;
-
- case HV_REG_U64:
- umsg->body.kvp_set.data.value_size =
- sprintf(umsg->body.kvp_set.data.msg_value.value, "%llu",
- (unsigned long long)
- hmsg->body.kvp_set.data.msg_value.value_u64) + 1;
- break;
- }
-
- umsg->body.kvp_set.data.key_size =
- utf16_to_utf8(
- umsg->body.kvp_set.data.key,
- HV_KVP_EXCHANGE_MAX_KEY_SIZE - 1,
- (uint16_t *)hmsg->body.kvp_set.data.key,
- hmsg->body.kvp_set.data.key_size,
- 1, &utf_err);
-
- /* utf8 encoding */
- umsg->body.kvp_set.data.key_size =
- umsg->body.kvp_set.data.key_size / 2;
- break;
-
- case HV_KVP_OP_GET:
- umsg->body.kvp_get.data.key_size =
- utf16_to_utf8(umsg->body.kvp_get.data.key,
- HV_KVP_EXCHANGE_MAX_KEY_SIZE - 1,
- (uint16_t *)hmsg->body.kvp_get.data.key,
- hmsg->body.kvp_get.data.key_size,
- 1, &utf_err);
- /* utf8 encoding */
- umsg->body.kvp_get.data.key_size =
- umsg->body.kvp_get.data.key_size / 2;
- break;
-
- case HV_KVP_OP_DELETE:
- umsg->body.kvp_delete.key_size =
- utf16_to_utf8(umsg->body.kvp_delete.key,
- HV_KVP_EXCHANGE_MAX_KEY_SIZE - 1,
- (uint16_t *)hmsg->body.kvp_delete.key,
- hmsg->body.kvp_delete.key_size,
- 1, &utf_err);
- /* utf8 encoding */
- umsg->body.kvp_delete.key_size =
- umsg->body.kvp_delete.key_size / 2;
- break;
-
- case HV_KVP_OP_ENUMERATE:
- umsg->body.kvp_enum_data.index =
- hmsg->body.kvp_enum_data.index;
- break;
-
- default:
- hv_kvp_log_info("%s: daemon_kvp_msg: Invalid operation : %d\n",
- __func__, umsg->kvp_hdr.operation);
- }
-}
-
-
-/*
- * Prepare a host kvp msg based on user kvp msg (utf8 to utf16)
- */
-static int
-hv_kvp_convert_usermsg_to_hostmsg(void)
-{
- int hkey_len = 0, hvalue_len = 0, utf_err = 0;
- struct hv_kvp_exchg_msg_value *host_exchg_data;
- char *key_name, *value;
-
- struct hv_kvp_msg *umsg = &kvp_globals.daemon_kvp_msg;
- struct hv_kvp_msg *hmsg = kvp_globals.host_kvp_msg;
- struct hv_kvp_ip_msg *host_ip_msg = (struct hv_kvp_ip_msg *)hmsg;
-
- switch (hmsg->kvp_hdr.operation) {
- case HV_KVP_OP_GET_IP_INFO:
- return (hv_kvp_convert_utf8_ipinfo_to_utf16(umsg, host_ip_msg));
-
- case HV_KVP_OP_SET_IP_INFO:
- case HV_KVP_OP_SET:
- case HV_KVP_OP_DELETE:
- return (KVP_SUCCESS);
-
- case HV_KVP_OP_ENUMERATE:
- host_exchg_data = &hmsg->body.kvp_enum_data.data;
- key_name = umsg->body.kvp_enum_data.data.key;
- hkey_len = utf8_to_utf16((uint16_t *)host_exchg_data->key,
- ((HV_KVP_EXCHANGE_MAX_KEY_SIZE / 2) - 2),
- key_name, strlen(key_name),
- 1, &utf_err);
- /* utf16 encoding */
- host_exchg_data->key_size = 2 * (hkey_len + 1);
- value = umsg->body.kvp_enum_data.data.msg_value.value;
- hvalue_len = utf8_to_utf16(
- (uint16_t *)host_exchg_data->msg_value.value,
- ((HV_KVP_EXCHANGE_MAX_VALUE_SIZE / 2) - 2),
- value, strlen(value),
- 1, &utf_err);
- host_exchg_data->value_size = 2 * (hvalue_len + 1);
- host_exchg_data->value_type = HV_REG_SZ;
-
- if ((hkey_len < 0) || (hvalue_len < 0))
- return (HV_KVP_E_FAIL);
-
- return (KVP_SUCCESS);
-
- case HV_KVP_OP_GET:
- host_exchg_data = &hmsg->body.kvp_get.data;
- value = umsg->body.kvp_get.data.msg_value.value;
- hvalue_len = utf8_to_utf16(
- (uint16_t *)host_exchg_data->msg_value.value,
- ((HV_KVP_EXCHANGE_MAX_VALUE_SIZE / 2) - 2),
- value, strlen(value),
- 1, &utf_err);
- /* Convert value size to uft16 */
- host_exchg_data->value_size = 2 * (hvalue_len + 1);
- /* Use values by string */
- host_exchg_data->value_type = HV_REG_SZ;
-
- if ((hkey_len < 0) || (hvalue_len < 0))
- return (HV_KVP_E_FAIL);
-
- return (KVP_SUCCESS);
-
- default:
- return (HV_KVP_E_FAIL);
- }
-}
-
-
-/*
- * Send the response back to the host.
- */
-static void
-hv_kvp_respond_host(int error)
-{
- struct hv_vmbus_icmsg_hdr *hv_icmsg_hdrp;
-
- hv_icmsg_hdrp = (struct hv_vmbus_icmsg_hdr *)
- &kvp_globals.rcv_buf[sizeof(struct hv_vmbus_pipe_hdr)];
-
- if (error)
- error = HV_KVP_E_FAIL;
-
- hv_icmsg_hdrp->status = error;
- hv_icmsg_hdrp->icflags = HV_ICMSGHDRFLAG_TRANSACTION | HV_ICMSGHDRFLAG_RESPONSE;
-
- error = hv_vmbus_channel_send_packet(kvp_globals.channelp,
- kvp_globals.rcv_buf,
- kvp_globals.host_msg_len, kvp_globals.host_msg_id,
- HV_VMBUS_PACKET_TYPE_DATA_IN_BAND, 0);
-
- if (error)
- hv_kvp_log_info("%s: hv_kvp_respond_host: sendpacket error:%d\n",
- __func__, error);
-}
-
-
-/*
- * This is the main kvp kernel process that interacts with both user daemon
- * and the host
- */
-static void
-hv_kvp_send_msg_to_daemon(void)
-{
- /* Prepare kvp_msg to be sent to user */
- hv_kvp_convert_hostmsg_to_usermsg();
-
- /* Send the msg to user via function deamon_read - setting sema */
- sema_post(&kvp_globals.dev_sema);
-}
-
-
-/*
- * Function to read the kvp request buffer from host
- * and interact with daemon
- */
-static void
-hv_kvp_process_request(void *context)
-{
- uint8_t *kvp_buf;
- hv_vmbus_channel *channel = context;
- uint32_t recvlen = 0;
- uint64_t requestid;
- struct hv_vmbus_icmsg_hdr *icmsghdrp;
- int ret = 0;
- uint64_t pending_cnt = 1;
-
- hv_kvp_log_info("%s: entering hv_kvp_process_request\n", __func__);
- kvp_buf = receive_buffer[HV_KVP];
- ret = hv_vmbus_channel_recv_packet(channel, kvp_buf, 2 * PAGE_SIZE,
- &recvlen, &requestid);
-
- /*
- * We start counting only after the daemon registers
- * and therefore there could be requests pending in
- * the VMBus that are not reflected in pending_cnt.
- * Therefore we continue reading as long as either of
- * the below conditions is true.
- */
-
- while ((pending_cnt>0) || ((ret == 0) && (recvlen > 0))) {
-
- if ((ret == 0) && (recvlen>0)) {
-
- icmsghdrp = (struct hv_vmbus_icmsg_hdr *)
- &kvp_buf[sizeof(struct hv_vmbus_pipe_hdr)];
-
- hv_kvp_transaction_init(recvlen, channel, requestid, kvp_buf);
- if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) {
- hv_kvp_negotiate_version(icmsghdrp, NULL, kvp_buf);
- hv_kvp_respond_host(ret);
-
- /*
- * It is ok to not acquire the mutex before setting
- * req_in_progress here because negotiation is the
- * first thing that happens and hence there is no
- * chance of a race condition.
- */
-
- kvp_globals.req_in_progress = false;
- hv_kvp_log_info("%s :version negotiated\n", __func__);
-
- } else {
- if (!kvp_globals.daemon_busy) {
-
- hv_kvp_log_info("%s: issuing qury to daemon\n", __func__);
- mtx_lock(&kvp_globals.pending_mutex);
- kvp_globals.req_timed_out = false;
- kvp_globals.daemon_busy = true;
- mtx_unlock(&kvp_globals.pending_mutex);
-
- hv_kvp_send_msg_to_daemon();
- hv_kvp_log_info("%s: waiting for daemon\n", __func__);
- }
-
- /* Wait 5 seconds for daemon to respond back */
- tsleep(&kvp_globals, 0, "kvpworkitem", 5 * hz);
- hv_kvp_log_info("%s: came out of wait\n", __func__);
- }
- }
-
- mtx_lock(&kvp_globals.pending_mutex);
-
- /* Notice that once req_timed_out is set to true
- * it will remain true until the next request is
- * sent to the daemon. The response from daemon
- * is forwarded to host only when this flag is
- * false.
- */
- kvp_globals.req_timed_out = true;
-
- /*
- * Cancel request if so need be.
- */
- if (hv_kvp_req_in_progress()) {
- hv_kvp_log_info("%s: request was still active after wait so failing\n", __func__);
- hv_kvp_respond_host(HV_KVP_E_FAIL);
- kvp_globals.req_in_progress = false;
- }
-
- /*
- * Decrement pending request count and
- */
- if (kvp_globals.pending_reqs>0) {
- kvp_globals.pending_reqs = kvp_globals.pending_reqs - 1;
- }
- pending_cnt = kvp_globals.pending_reqs;
-
- mtx_unlock(&kvp_globals.pending_mutex);
-
- /*
- * Try reading next buffer
- */
- recvlen = 0;
- ret = hv_vmbus_channel_recv_packet(channel, kvp_buf, 2 * PAGE_SIZE,
- &recvlen, &requestid);
- hv_kvp_log_info("%s: read: context %p, pending_cnt %ju ret =%d, recvlen=%d\n",
- __func__, context, pending_cnt, ret, recvlen);
- }
-}
-
-
-/*
- * Callback routine that gets called whenever there is a message from host
- */
-void
-hv_kvp_callback(void *context)
-{
- uint64_t pending_cnt = 0;
-
- if (kvp_globals.register_done == false) {
-
- kvp_globals.channelp = context;
- } else {
-
- mtx_lock(&kvp_globals.pending_mutex);
- kvp_globals.pending_reqs = kvp_globals.pending_reqs + 1;
- pending_cnt = kvp_globals.pending_reqs;
- mtx_unlock(&kvp_globals.pending_mutex);
- if (pending_cnt == 1) {
- hv_kvp_log_info("%s: Queuing work item\n", __func__);
- hv_queue_work_item(
- service_table[HV_KVP].work_queue,
- hv_kvp_process_request,
- context
- );
- }
- }
-}
-
-
-/*
- * This function is called by the hv_kvp_init -
- * creates character device hv_kvp_dev
- * allocates memory to hv_kvp_dev_buf
- *
- */
-static int
-hv_kvp_dev_init(void)
-{
- int error = 0;
-
- /* initialize semaphore */
- sema_init(&kvp_globals.dev_sema, 0, "hv_kvp device semaphore");
- /* create character device */
- error = make_dev_p(MAKEDEV_CHECKNAME | MAKEDEV_WAITOK,
- &hv_kvp_dev,
- &hv_kvp_cdevsw,
- 0,
- UID_ROOT,
- GID_WHEEL,
- 0640,
- "hv_kvp_dev");
-
- if (error != 0)
- return (error);
-
- /*
- * Malloc with M_WAITOK flag will never fail.
- */
- hv_kvp_dev_buf = malloc(sizeof(*hv_kvp_dev_buf), M_HV_KVP_DEV_BUF, M_WAITOK |
- M_ZERO);
-
- return (0);
-}
-
-
-/*
- * This function is called by the hv_kvp_deinit -
- * destroy character device
- */
-static void
-hv_kvp_dev_destroy(void)
-{
-
- if (daemon_task != NULL) {
- PROC_LOCK(daemon_task);
- kern_psignal(daemon_task, SIGKILL);
- PROC_UNLOCK(daemon_task);
- }
-
- destroy_dev(hv_kvp_dev);
- free(hv_kvp_dev_buf, M_HV_KVP_DEV_BUF);
- return;
-}
-
-
-static int
-hv_kvp_dev_open(struct cdev *dev, int oflags, int devtype,
- struct thread *td)
-{
-
- hv_kvp_log_info("%s: Opened device \"hv_kvp_device\" successfully.\n", __func__);
- if (kvp_globals.dev_accessed)
- return (-EBUSY);
-
- daemon_task = curproc;
- kvp_globals.dev_accessed = true;
- kvp_globals.daemon_busy = false;
- return (0);
-}
-
-
-static int
-hv_kvp_dev_close(struct cdev *dev __unused, int fflag __unused, int devtype __unused,
- struct thread *td __unused)
-{
-
- hv_kvp_log_info("%s: Closing device \"hv_kvp_device\".\n", __func__);
- kvp_globals.dev_accessed = false;
- kvp_globals.register_done = false;
- return (0);
-}
-
-
-/*
- * hv_kvp_daemon read invokes this function
- * acts as a send to daemon
- */
-static int
-hv_kvp_dev_daemon_read(struct cdev *dev __unused, struct uio *uio, int ioflag __unused)
-{
- size_t amt;
- int error = 0;
-
- /* Check hv_kvp daemon registration status*/
- if (!kvp_globals.register_done)
- return (KVP_ERROR);
-
- sema_wait(&kvp_globals.dev_sema);
-
- memcpy(hv_kvp_dev_buf, &kvp_globals.daemon_kvp_msg, sizeof(struct hv_kvp_msg));
-
- amt = MIN(uio->uio_resid, uio->uio_offset >= BUFFERSIZE + 1 ? 0 :
- BUFFERSIZE + 1 - uio->uio_offset);
-
- if ((error = uiomove(hv_kvp_dev_buf, amt, uio)) != 0)
- hv_kvp_log_info("%s: hv_kvp uiomove read failed!\n", __func__);
-
- return (error);
-}
-
-
-/*
- * hv_kvp_daemon write invokes this function
- * acts as a recieve from daemon
- */
-static int
-hv_kvp_dev_daemon_write(struct cdev *dev __unused, struct uio *uio, int ioflag __unused)
-{
- size_t amt;
- int error = 0;
-
- uio->uio_offset = 0;
-
- amt = MIN(uio->uio_resid, BUFFERSIZE);
- error = uiomove(hv_kvp_dev_buf, amt, uio);
-
- if (error != 0)
- return (error);
-
- memcpy(&kvp_globals.daemon_kvp_msg, hv_kvp_dev_buf, sizeof(struct hv_kvp_msg));
-
- if (kvp_globals.register_done == false) {
- if (kvp_globals.daemon_kvp_msg.kvp_hdr.operation == HV_KVP_OP_REGISTER) {
-
- kvp_globals.register_done = true;
- if (kvp_globals.channelp) {
-
- hv_kvp_callback(kvp_globals.channelp);
- }
- }
- else {
- hv_kvp_log_info("%s, KVP Registration Failed\n", __func__);
- return (KVP_ERROR);
- }
- } else {
-
- mtx_lock(&kvp_globals.pending_mutex);
-
- if(!kvp_globals.req_timed_out) {
-
- hv_kvp_convert_usermsg_to_hostmsg();
- hv_kvp_respond_host(KVP_SUCCESS);
- wakeup(&kvp_globals);
- kvp_globals.req_in_progress = false;
- }
-
- kvp_globals.daemon_busy = false;
- mtx_unlock(&kvp_globals.pending_mutex);
- }
-
- return (error);
-}
-
-
-/*
- * hv_kvp_daemon poll invokes this function to check if data is available
- * for daemon to read.
- */
-static int
-hv_kvp_dev_daemon_poll(struct cdev *dev __unused, int events, struct thread *td __unused)
-{
- int revents = 0;
-
- mtx_lock(&kvp_globals.pending_mutex);
- /*
- * We check global flag daemon_busy for the data availiability for
- * userland to read. Deamon_busy is set to true before driver has data
- * for daemon to read. It is set to false after daemon sends
- * then response back to driver.
- */
- if (kvp_globals.daemon_busy == true)
- revents = POLLIN;
- mtx_unlock(&kvp_globals.pending_mutex);
-
- return (revents);
-}
-
-
-/*
- * hv_kvp initialization function
- * called from hv_util service.
- *
- */
-int
-hv_kvp_init(hv_vmbus_service *srv)
-{
- int error = 0;
- hv_work_queue *work_queue = NULL;
-
- memset(&kvp_globals, 0, sizeof(kvp_globals));
-
- work_queue = hv_work_queue_create("KVP Service");
- if (work_queue == NULL) {
- hv_kvp_log_info("%s: Work queue alloc failed\n", __func__);
- error = ENOMEM;
- hv_kvp_log_error("%s: ENOMEM\n", __func__);
- goto Finish;
- }
- srv->work_queue = work_queue;
-
- error = hv_kvp_dev_init();
- mtx_init(&kvp_globals.pending_mutex, "hv-kvp pending mutex",
- NULL, MTX_DEF);
- kvp_globals.pending_reqs = 0;
-
-
-Finish:
- return (error);
-}
-
-
-void
-hv_kvp_deinit(void)
-{
- hv_kvp_dev_destroy();
- mtx_destroy(&kvp_globals.pending_mutex);
-
- return;
-}
diff --git a/sys/dev/hyperv/utilities/hv_kvp.h b/sys/dev/hyperv/utilities/hv_kvp.h
index b67373fa..f7dccf7 100644
--- a/sys/dev/hyperv/utilities/hv_kvp.h
+++ b/sys/dev/hyperv/utilities/hv_kvp.h
@@ -1,5 +1,7 @@
/*-
- * Copyright (c) 2014 Microsoft Corp.
+ * Copyright (c) 2009-2012 Microsoft Corp.
+ * Copyright (c) 2012 NetApp Inc.
+ * Copyright (c) 2012 Citrix Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -22,15 +24,13 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#ifndef _KVP_H
#define _KVP_H
/*
- * An implementation of HyperV key value pair (KVP) functionality for FreeBSD
+ * An implementation of HyperV key value pair (KVP) functionality for FreeBSD
*
*/
@@ -53,15 +53,15 @@
/*
* bytes, including any null terminators
*/
-#define HV_KVP_EXCHANGE_MAX_VALUE_SIZE (2048)
+#define HV_KVP_EXCHANGE_MAX_VALUE_SIZE (2048)
/*
* Maximum key size - the registry limit for the length of an entry name
* is 256 characters, including the null terminator
*/
-#define HV_KVP_EXCHANGE_MAX_KEY_SIZE (512)
+#define HV_KVP_EXCHANGE_MAX_KEY_SIZE (512)
/*
* In FreeBSD, we implement the KVP functionality in two components:
@@ -111,20 +111,30 @@
* (not supported), a NULL key string is returned.
*/
-
+
/*
* Registry value types.
*/
-#define HV_REG_SZ 1
-#define HV_REG_U32 4
-#define HV_REG_U64 8
+#define HV_REG_SZ 1
+#define HV_REG_U32 4
+#define HV_REG_U64 8
+
+
+/*
+ * Daemon code not supporting IP injection (legacy daemon).
+ */
+
+#define HV_KVP_OP_REGISTER 4
/*
* Daemon code supporting IP injection.
+ * The KVP opcode field is used to communicate the
+ * registration information; so define a namespace that
+ * will be distinct from the host defined KVP opcode.
*/
-#define HV_KVP_OP_REGISTER 4
+#define KVP_OP_REGISTER1 100
enum hv_kvp_exchg_op {
HV_KVP_OP_GET = 0,
@@ -145,41 +155,41 @@ enum hv_kvp_exchg_pool {
HV_KVP_POOL_COUNT /* Number of pools, must be last. */
};
-
/*
* Some Hyper-V status codes.
*/
-#define HV_KVP_S_OK 0x00000000
-#define HV_KVP_E_FAIL 0x80004005
-#define HV_KVP_S_CONT 0x80070103
-#define HV_ERROR_NOT_SUPPORTED 0x80070032
-#define HV_ERROR_MACHINE_LOCKED 0x800704F7
-#define HV_ERROR_DEVICE_NOT_CONNECTED 0x8007048F
-#define HV_INVALIDARG 0x80070057
-#define HV_KVP_GUID_NOTFOUND 0x80041002
+#define HV_KVP_S_OK 0x00000000
+#define HV_KVP_E_FAIL 0x80004005
+#define HV_KVP_S_CONT 0x80070103
+#define HV_ERROR_NOT_SUPPORTED 0x80070032
+#define HV_ERROR_MACHINE_LOCKED 0x800704F7
+#define HV_ERROR_DEVICE_NOT_CONNECTED 0x8007048F
+#define HV_INVALIDARG 0x80070057
+#define HV_KVP_GUID_NOTFOUND 0x80041002
-#define ADDR_FAMILY_NONE 0x00
-#define ADDR_FAMILY_IPV4 0x01
-#define ADDR_FAMILY_IPV6 0x02
+#define ADDR_FAMILY_NONE 0x00
+#define ADDR_FAMILY_IPV4 0x01
+#define ADDR_FAMILY_IPV6 0x02
-#define MAX_ADAPTER_ID_SIZE 128
-#define MAX_IP_ADDR_SIZE 1024
-#define MAX_GATEWAY_SIZE 512
+#define MAX_ADAPTER_ID_SIZE 128
+#define MAX_IP_ADDR_SIZE 1024
+#define MAX_GATEWAY_SIZE 512
struct hv_kvp_ipaddr_value {
- uint16_t adapter_id[MAX_ADAPTER_ID_SIZE];
- uint8_t addr_family;
- uint8_t dhcp_enabled;
- uint16_t ip_addr[MAX_IP_ADDR_SIZE];
- uint16_t sub_net[MAX_IP_ADDR_SIZE];
- uint16_t gate_way[MAX_GATEWAY_SIZE];
- uint16_t dns_addr[MAX_IP_ADDR_SIZE];
-}__attribute__((packed));
+ uint16_t adapter_id[MAX_ADAPTER_ID_SIZE];
+ uint8_t addr_family;
+ uint8_t dhcp_enabled;
+ uint16_t ip_addr[MAX_IP_ADDR_SIZE];
+ uint16_t sub_net[MAX_IP_ADDR_SIZE];
+ uint16_t gate_way[MAX_GATEWAY_SIZE];
+ uint16_t dns_addr[MAX_IP_ADDR_SIZE];
+} __attribute__((packed));
+
struct hv_kvp_hdr {
- uint8_t operation;
- uint8_t pool;
+ uint8_t operation;
+ uint8_t pool;
uint16_t pad;
} __attribute__((packed));
@@ -187,9 +197,9 @@ struct hv_kvp_exchg_msg_value {
uint32_t value_type;
uint32_t key_size;
uint32_t value_size;
- uint8_t key[HV_KVP_EXCHANGE_MAX_KEY_SIZE];
+ uint8_t key[HV_KVP_EXCHANGE_MAX_KEY_SIZE];
union {
- uint8_t value[HV_KVP_EXCHANGE_MAX_VALUE_SIZE];
+ uint8_t value[HV_KVP_EXCHANGE_MAX_VALUE_SIZE];
uint32_t value_u32;
uint64_t value_u64;
} msg_value;
@@ -219,16 +229,16 @@ struct hv_kvp_register {
struct hv_kvp_msg {
union {
- struct hv_kvp_hdr kvp_hdr;
- uint32_t error;
+ struct hv_kvp_hdr kvp_hdr;
+ int error;
} hdr;
union {
- struct hv_kvp_msg_get kvp_get;
- struct hv_kvp_msg_set kvp_set;
+ struct hv_kvp_msg_get kvp_get;
+ struct hv_kvp_msg_set kvp_set;
struct hv_kvp_msg_delete kvp_delete;
struct hv_kvp_msg_enumerate kvp_enum_data;
- struct hv_kvp_ipaddr_value kvp_ip_val;
- struct hv_kvp_register kvp_register;
+ struct hv_kvp_ipaddr_value kvp_ip_val;
+ struct hv_kvp_register kvp_register;
} body;
} __attribute__((packed));
@@ -238,17 +248,38 @@ struct hv_kvp_ip_msg {
struct hv_kvp_ipaddr_value kvp_ip_val;
} __attribute__((packed));
-
-#define HV_SHUT_DOWN 0
-#define HV_TIME_SYNCH 1
-#define HV_HEART_BEAT 2
-#define HV_KVP 3
-#define HV_MAX_UTIL_SERVICES 4
-
-#define HV_WLTIMEDELTA 116444736000000000L /* in 100ns unit */
-#define HV_ICTIMESYNCFLAG_PROBE 0
-#define HV_ICTIMESYNCFLAG_SYNC 1
-#define HV_ICTIMESYNCFLAG_SAMPLE 2
-#define HV_NANO_SEC_PER_SEC 1000000000
+#define BSD_SOC_PATH "/etc/hyperv/socket"
+
+#define HV_SHUT_DOWN 0
+#define HV_TIME_SYNCH 1
+#define HV_HEART_BEAT 2
+#define HV_KVP 3
+#define HV_MAX_UTIL_SERVICES 4
+
+#define HV_WLTIMEDELTA 116444736000000000L /* in 100ns unit */
+#define HV_ICTIMESYNCFLAG_PROBE 0
+#define HV_ICTIMESYNCFLAG_SYNC 1
+#define HV_ICTIMESYNCFLAG_SAMPLE 2
+#define HV_NANO_SEC_PER_SEC 1000000000
+
+typedef struct hv_vmbus_service {
+ hv_guid guid; /* Hyper-V GUID */
+ char* name; /* name of service */
+ boolean_t enabled; /* service enabled */
+ hv_work_queue* work_queue; /* background work queue */
+
+ //
+ // function to initialize service
+ //
+ int (*init)(struct hv_vmbus_service *);
+
+ //
+ // function to process Hyper-V messages
+ //
+ void (*callback)(void *);
+} hv_vmbus_service;
+
+extern uint8_t* receive_buffer[];
+extern hv_vmbus_service service_table[];
#endif /* _KVP_H */
diff --git a/sys/dev/hyperv/utilities/hv_util.c b/sys/dev/hyperv/utilities/hv_util.c
index 91bbc53..e86cbd7 100644
--- a/sys/dev/hyperv/utilities/hv_util.c
+++ b/sys/dev/hyperv/utilities/hv_util.c
@@ -1,5 +1,7 @@
/*-
- * Copyright (c) 2014 Microsoft Corp.
+ * Copyright (c) 2009-2012 Microsoft Corp.
+ * Copyright (c) 2012 NetApp Inc.
+ * Copyright (c) 2012 Citrix Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -22,11 +24,9 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
-/*
+/**
* A common driver for all hyper-V util services.
*/
@@ -53,7 +53,7 @@ static void hv_timesync_cb(void *context);
static int hv_timesync_init(hv_vmbus_service *serv);
-/*
+/**
* Note: GUID codes below are predefined by the host hypervisor
* (Hyper-V and Azure)interface and required for correct operation.
*/
@@ -80,16 +80,7 @@ hv_vmbus_service service_table[] = {
0xab, 0x55, 0x38, 0x2f, 0x3b, 0xd5, 0x42, 0x2d},
.name = "Hyper-V Heartbeat Service\n",
.enabled = TRUE,
- .callback = hv_heartbeat_cb,
- },
-
- /* KVP (Key Value Pair) Service */
- { .guid.data = {0xe7, 0xf4, 0xa0, 0xa9, 0x45, 0x5a, 0x96, 0x4d,
- 0xb8, 0x27, 0x8a, 0x84, 0x1e, 0x8c, 0x3, 0xe6},
- .name = "Hyper-V KVP Service\n",
- .enabled = TRUE,
- .init = hv_kvp_init,
- .callback = hv_kvp_callback,
+ .callback = hv_heartbeat_cb,
},
};
@@ -99,8 +90,6 @@ hv_vmbus_service service_table[] = {
*/
uint8_t *receive_buffer[HV_MAX_UTIL_SERVICES];
-static boolean_t destroyed_kvp = FALSE;
-
struct hv_ictimesync_data {
uint64_t parenttime;
uint64_t childtime;
@@ -154,7 +143,7 @@ hv_negotiate_version(
static void
hv_set_host_time(void *context)
{
- time_sync_data* time_msg = (time_sync_data*) context;
+ time_sync_data *time_msg = context;
uint64_t hosttime = time_msg->data;
struct timespec guest_ts, host_ts;
uint64_t host_tns;
@@ -264,12 +253,12 @@ hv_timesync_cb(void *context)
static void
hv_shutdown_cb(void *context)
{
- uint8_t* buf;
+ uint8_t* buf;
hv_vmbus_channel* channel = context;
- uint8_t execute_shutdown = 0;
+ uint8_t execute_shutdown = 0;
hv_vmbus_icmsg_hdr* icmsghdrp;
- uint32_t recv_len;
- uint64_t request_id;
+ uint32_t recv_len;
+ uint64_t request_id;
int ret;
hv_vmbus_shutdown_msg_data* shutdown_msg;
@@ -432,11 +421,6 @@ hv_util_detach(device_t dev)
struct hv_vmbus_service* service;
size_t receive_buffer_offset;
- if (!destroyed_kvp) {
- hv_kvp_deinit();
- destroyed_kvp = TRUE;
- }
-
hv_dev = vmbus_get_devctx(dev);
hv_vmbus_channel_close(hv_dev->channel);
@@ -448,22 +432,21 @@ hv_util_detach(device_t dev)
free(receive_buffer[receive_buffer_offset], M_DEVBUF);
receive_buffer[receive_buffer_offset] = NULL;
+
return (0);
}
-static void
-hv_util_init(void)
+static void hv_util_init(void)
{
}
-static int
-hv_util_modevent(module_t mod, int event, void *arg)
+static int hv_util_modevent(module_t mod, int event, void *arg)
{
switch (event) {
case MOD_LOAD:
break;
case MOD_UNLOAD:
- break;
+ break;
default:
break;
}
diff --git a/sys/dev/hyperv/utilities/unicode.h b/sys/dev/hyperv/utilities/unicode.h
deleted file mode 100644
index 696777c..0000000
--- a/sys/dev/hyperv/utilities/unicode.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* $NetBSD: unicode.h,v 1.1.1.1 2007/03/06 00:10:39 dillo Exp $ */
-
-/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dieter Baron.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/types.h>
-
-#define UNICODE_DECOMPOSE 0x01
-#define UNICODE_PRECOMPOSE 0x02
-#define UNICODE_UTF8_LATIN1_FALLBACK 0x03
-
-size_t utf8_to_utf16(uint16_t *, size_t, const char *, size_t, int, int *);
-size_t utf16_to_utf8(char *, size_t, const uint16_t *, size_t, int, int *);
-
-size_t
-utf8_to_utf16(uint16_t *dst, size_t dst_len,
- const char *src, size_t src_len,
- int flags, int *errp)
-{
- const unsigned char *s;
- size_t spos, dpos;
- int error;
- uint16_t c;
-
-#define IS_CONT(c) (((c)&0xc0) == 0x80)
-
- error = 0;
- s = (const unsigned char *)src;
- spos = dpos = 0;
- while (spos<src_len) {
- if (s[spos] < 0x80)
- c = s[spos++];
- else if ((flags & UNICODE_UTF8_LATIN1_FALLBACK)
- && (spos >= src_len || !IS_CONT(s[spos+1]))
- && s[spos]>=0xa0) {
- /* not valid UTF-8, assume ISO 8859-1 */
- c = s[spos++];
- }
- else if (s[spos] < 0xc0 || s[spos] >= 0xf5) {
- /* continuation byte without lead byte
- or lead byte for codepoint above 0x10ffff */
- error++;
- spos++;
- continue;
- }
- else if (s[spos] < 0xe0) {
- if (spos >= src_len || !IS_CONT(s[spos+1])) {
- spos++;
- error++;
- continue;
- }
- c = ((s[spos] & 0x3f) << 6) | (s[spos+1] & 0x3f);
- spos += 2;
- if (c < 0x80) {
- /* overlong encoding */
- error++;
- continue;
- }
- }
- else if (s[spos] < 0xf0) {
- if (spos >= src_len-2
- || !IS_CONT(s[spos+1]) || !IS_CONT(s[spos+2])) {
- spos++;
- error++;
- continue;
- }
- c = ((s[spos] & 0x0f) << 12) | ((s[spos+1] & 0x3f) << 6)
- | (s[spos+2] & 0x3f);
- spos += 3;
- if (c < 0x800 || (c & 0xdf00) == 0xd800 ) {
- /* overlong encoding or encoded surrogate */
- error++;
- continue;
- }
- }
- else {
- uint32_t cc;
- /* UTF-16 surrogate pair */
-
- if (spos >= src_len-3 || !IS_CONT(s[spos+1])
- || !IS_CONT(s[spos+2]) || !IS_CONT(s[spos+3])) {
- spos++;
- error++;
-
- continue;
- }
- cc = ((s[spos] & 0x03) << 18) | ((s[spos+1] & 0x3f) << 12)
- | ((s[spos+2] & 0x3f) << 6) | (s[spos+3] & 0x3f);
- spos += 4;
- if (cc < 0x10000) {
- /* overlong encoding */
- error++;
- continue;
- }
- if (dst && dpos < dst_len)
- dst[dpos] = (0xd800 | ((cc-0x10000)>>10));
- dpos++;
- c = 0xdc00 | ((cc-0x10000) & 0x3ffff);
- }
-
- if (dst && dpos < dst_len)
- dst[dpos] = c;
- dpos++;
- }
-
- if (errp)
- *errp = error;
-
- return dpos;
-
-#undef IS_CONT
-}
-
-
-size_t
-utf16_to_utf8(char *dst, size_t dst_len,
- const uint16_t *src, size_t src_len,
- int flags, int *errp)
-{
- uint16_t spos, dpos;
- int error;
-
-#define CHECK_LENGTH(l) (dpos > dst_len-(l) ? dst=NULL : NULL)
-#define ADD_BYTE(b) (dst ? dst[dpos] = (b) : 0, dpos++)
-
- error = 0;
- dpos = 0;
- for (spos=0; spos<src_len; spos++) {
- if (src[spos] < 0x80) {
- CHECK_LENGTH(1);
- ADD_BYTE(src[spos]);
- }
- else if (src[spos] < 0x800) {
- CHECK_LENGTH(2);
- ADD_BYTE(0xc0 | (src[spos]>>6));
- ADD_BYTE(0x80 | (src[spos] & 0x3f));
- }
- else if ((src[spos] & 0xdc00) == 0xd800) {
- uint32_t c;
- /* first surrogate */
- if (spos == src_len - 1 || (src[spos] & 0xdc00) != 0xdc00) {
- /* no second surrogate present */
- error++;
- continue;
- }
- spos++;
- CHECK_LENGTH(4);
- c = (((src[spos]&0x3ff) << 10) | (src[spos+1]&0x3ff)) + 0x10000;
- ADD_BYTE(0xf0 | (c>>18));
- ADD_BYTE(0x80 | ((c>>12) & 0x3f));
- ADD_BYTE(0x80 | ((c>>6) & 0x3f));
- ADD_BYTE(0x80 | (c & 0x3f));
- }
- else if ((src[spos] & 0xdc00) == 0xdc00) {
- /* second surrogate without preceding first surrogate */
- error++;
- }
- else {
- CHECK_LENGTH(3);
- ADD_BYTE(0xe0 | src[spos]>>12);
- ADD_BYTE(0x80 | ((src[spos]>>6) & 0x3f));
- ADD_BYTE(0x80 | (src[spos] & 0x3f));
- }
- }
-
- if (errp)
- *errp = error;
-
- return dpos;
-
-#undef ADD_BYTE
-#undef CHECK_LENGTH
-}
diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile
index f94e441..57a2428 100644
--- a/sys/modules/hyperv/utilities/Makefile
+++ b/sys/modules/hyperv/utilities/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../../../dev/hyperv/utilities
KMOD= hv_utils
-SRCS= hv_util.c hv_kvp.c
+SRCS= hv_util.c
SRCS+= bus_if.h device_if.h
CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
OpenPOWER on IntegriCloud