From patchwork Thu Dec 24 14:14:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dexuan Cui X-Patchwork-Id: 560925 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C444A140C3C for ; Thu, 24 Dec 2015 23:41:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932390AbbLXMkn (ORCPT ); Thu, 24 Dec 2015 07:40:43 -0500 Received: from p3plsmtps2ded02.prod.phx3.secureserver.net ([208.109.80.59]:43972 "EHLO p3plsmtps2ded02.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754289AbbLXMkd (ORCPT ); Thu, 24 Dec 2015 07:40:33 -0500 Received: from linuxonhyperv.com ([72.167.245.219]) by : HOSTING RELAY : with SMTP id C5C4aMF6BWeTGC5C4aULKr; Thu, 24 Dec 2015 05:40:32 -0700 x-originating-ip: 72.167.245.219 Received: by linuxonhyperv.com (Postfix, from userid 518) id D307E190343; Thu, 24 Dec 2015 06:14:46 -0800 (PST) From: Dexuan Cui To: gregkh@linuxfoundation.org, davem@davemloft.net, stephen@networkplumber.org, 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 Cc: pebolle@tiscali.nl, stefanha@redhat.com, vkuznets@redhat.com, dan.carpenter@oracle.com Subject: [PATCH V5 6/9] Drivers: hv: vmbus: add a hvsock flag in struct hv_driver Date: Thu, 24 Dec 2015 06:14:46 -0800 Message-Id: <1450966486-13243-1-git-send-email-decui@microsoft.com> X-Mailer: git-send-email 1.7.4.1 X-CMAE-Envelope: MS4wfNzLbaKmlkuzDhaYEB57jsBvCcP03hoiNZ6WhYSUVdEg86yM9vzAwhwX96r1zkGdjCaORmfIhKHwN+jRWQZLVLDJmQRCWQ1qF7mVXx5SnHV9LOG+zNGP zpIFRlFY18LZmzD1HkvKv9dcvIE52t/Olyfoyf3n1PaT/40FgamU3aw1bAlK/oYzuauMC2ABDfN494+zsVigCCHO0Ghcyd+F/rjKQePOLkLm7mYGQgaLMm0w vZkEJ8q4gnIYumhgMOizA+EnqfANYBeUqgnm7lRSXSfcgSxlkpTG/3iRNCHllaMM0dISEzwXzWYVnIsT1FcL4GrvfGj4io2B9Y13aus7xsQQ4PZFk5im6LRN S1JdgHoEN4/ukwrOpUBVY5VlA511eGVaojB4ZCCPpq01hwHlu5q1OdHSblIrapy/UdDQ/VMLRA5KW3NRvFJWE1GWcDBmjx8eIP40dRFYPQGL7NWKeY7E7FM9 VmhpkvE8lRCrvwk7iqBIAOf2lcoIKxmyS1FaIZcgjheR9cPxWL8rqOOXPV+fDwh0OBcl/4/AxIYpXYaph/VTx2mVSIfCD8dVjhwJQuV37a44T9n7qnauMDCB TZGjaFSzmE1D51/zXXKavVx0VJoY655xfl2L0OSd5kgmjg== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Only the coming hv_sock driver has a "true" value for this flag. We treat the hvsock offers/channels as special VMBus devices. Since the hv_sock driver handles all the hvsock offers/channels, we need to tweak vmbus_match() for hv_sock driver, so we introduce this flag. Signed-off-by: Dexuan Cui --- drivers/hv/vmbus_drv.c | 4 ++++ include/linux/hyperv.h | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 328e4c3..c1c9d71 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -562,6 +562,10 @@ static int vmbus_match(struct device *device, struct device_driver *driver) struct hv_driver *drv = drv_to_hv_drv(driver); struct hv_device *hv_dev = device_to_hv_device(device); + /* The hv_sock driver handles all hv_sock offers. */ + if (is_hvsock_channel(hv_dev->channel)) + return drv->hvsock; + if (hv_vmbus_get_id(drv->id_table, &hv_dev->dev_type)) return 1; diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 646c20d..b4cc44c 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -970,6 +970,20 @@ extern void vmbus_ontimer(unsigned long data); struct hv_driver { const char *name; + /* + * A hvsock offer, which has a VMBUS_CHANNEL_TLNPI_PROVIDER_OFFER + * channel flag, actually doesn't mean a synthetic device because the + * offer's if_type/if_instance can change for every new hvsock + * connection. + * + * However, to facilitate the notification of new-offer/rescind-offer + * from vmbus driver to hvsock driver, we can handle hvsock offer as + * a special vmbus device, and hence we need the below flag to + * indicate if the driver is the hvsock driver or not: we need to + * specially treat the hvosck offer & driver in vmbus_match(). + */ + bool hvsock; + /* the device type supported by this driver */ uuid_le dev_type; const struct hv_vmbus_device_id *id_table;