Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755615AbbGFNXb (ORCPT ); Mon, 6 Jul 2015 09:23:31 -0400 Received: from p3plsmtps2ded04.prod.phx3.secureserver.net ([208.109.80.198]:58206 "EHLO p3plsmtps2ded04.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755533AbbGFNX0 (ORCPT ); Mon, 6 Jul 2015 09:23:26 -0400 x-originating-ip: 72.167.245.219 From: Dexuan Cui To: gregkh@linuxfoundation.org, davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, driverdev-devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, jasowang@redhat.com, kys@microsoft.com, haiyangz@microsoft.com Subject: [PATCH 4/7] Drivers: hv: vmbus: add APIs to register callbacks to process hvsock connection Date: Mon, 6 Jul 2015 07:46:50 -0700 Message-Id: <1436194010-27421-1-git-send-email-decui@microsoft.com> X-Mailer: git-send-email 1.7.4.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5048 Lines: 160 With the 2 APIs supplied by the VMBus driver, the coming net/hvsock driver can register 2 callbacks and can know when a new hvsock connection is offered by the host, and when a hvsock connection is being closed by the host. Signed-off-by: Dexuan Cui --- drivers/hv/Makefile | 4 ++- drivers/hv/channel_mgmt.c | 9 ++++++ drivers/hv/hvsock_callbacks.c | 71 +++++++++++++++++++++++++++++++++++++++++++ include/linux/hyperv.h | 9 ++++++ 4 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 drivers/hv/hvsock_callbacks.c diff --git a/drivers/hv/Makefile b/drivers/hv/Makefile index 39c9b2c..ef6f8a8 100644 --- a/drivers/hv/Makefile +++ b/drivers/hv/Makefile @@ -4,5 +4,7 @@ obj-$(CONFIG_HYPERV_BALLOON) += hv_balloon.o hv_vmbus-y := vmbus_drv.o \ hv.o connection.o channel.o \ - channel_mgmt.o ring_buffer.o + channel_mgmt.o ring_buffer.o \ + hvsock_callbacks.o + hv_utils-y := hv_util.o hv_kvp.o hv_snapshot.o hv_fcopy.o hv_utils_transport.o diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c index 7018c53..a8b1e61 100644 --- a/drivers/hv/channel_mgmt.c +++ b/drivers/hv/channel_mgmt.c @@ -300,6 +300,12 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) return; } + if (is_hvsock_channel(newchannel)) { + if (hvsock_process_offer(newchannel) != 0) + goto err_deq_chan; + return; + } + /* * Start the process of binding this offer to the driver * We need to set the DeviceObject field before calling @@ -564,7 +570,10 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr) vmbus_device_unregister(channel->device_obj); put_device(dev); } + } else if (is_hvsock_channel(channel)) { + hvsock_process_offer_rescind(channel); } else { + /* it is a sub-channel. */ hv_process_channel_removal(channel, channel->offermsg.child_relid); } diff --git a/drivers/hv/hvsock_callbacks.c b/drivers/hv/hvsock_callbacks.c new file mode 100644 index 0000000..28f7b75 --- /dev/null +++ b/drivers/hv/hvsock_callbacks.c @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2015, Microsoft Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include + +/* We should hold the mutex when getting/setting the function pointers */ +static DEFINE_MUTEX(hvsock_cb_mutex); +static int (*__process_offer)(struct vmbus_channel *channel); +static void (*__process_offer_rescind)(struct vmbus_channel *channel); + +int hvsock_process_offer(struct vmbus_channel *channel) +{ + int ret = -ENODEV; + + mutex_lock(&hvsock_cb_mutex); + + if (__process_offer != NULL) + ret = __process_offer(channel); + + mutex_unlock(&hvsock_cb_mutex); + + return ret; +} + +void hvsock_process_offer_rescind(struct vmbus_channel *channel) +{ + mutex_lock(&hvsock_cb_mutex); + + if (__process_offer_rescind != NULL) + __process_offer_rescind(channel); + else + hv_process_channel_removal(channel, + channel->offermsg.child_relid); + + mutex_unlock(&hvsock_cb_mutex); +} + +void vmbus_register_hvsock_callbacks( + int (*process_offer)(struct vmbus_channel *), + void (*process_offer_rescind)(struct vmbus_channel *)) +{ + mutex_lock(&hvsock_cb_mutex); + + __process_offer = process_offer; + __process_offer_rescind = process_offer_rescind; + + mutex_unlock(&hvsock_cb_mutex); +} +EXPORT_SYMBOL_GPL(vmbus_register_hvsock_callbacks); + +void vmbus_unregister_hvsock_callbacks(void) +{ + mutex_lock(&hvsock_cb_mutex); + + __process_offer = NULL; + __process_offer_rescind = NULL; + + mutex_unlock(&hvsock_cb_mutex); +} +EXPORT_SYMBOL_GPL(vmbus_unregister_hvsock_callbacks); diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 1e4c58e..307910b3 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1270,6 +1270,15 @@ extern __u32 vmbus_proto_version; int vmbus_send_tl_connect_request(const uuid_le *shv_guest_servie_id, const uuid_le *shv_host_servie_id); +extern int hvsock_process_offer(struct vmbus_channel *channel); +extern void hvsock_process_offer_rescind(struct vmbus_channel *channel); + +extern void vmbus_register_hvsock_callbacks( + int (*process_offer)(struct vmbus_channel *), + void (*process_offer_rescind)(struct vmbus_channel *)); + +void vmbus_unregister_hvsock_callbacks(void); + struct vmpipe_proto_header { u32 pkt_type; -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/