From patchwork Wed Dec 5 22:11:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 48552 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E7F316C9B; Wed, 5 Dec 2018 23:12:22 +0100 (CET) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by dpdk.org (Postfix) with ESMTP id 1143C6833 for ; Wed, 5 Dec 2018 23:12:21 +0100 (CET) Received: by mail-pg1-f196.google.com with SMTP id t13so9626479pgr.11 for ; Wed, 05 Dec 2018 14:12:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dz0Ibotat1ekfWDIMh+K5fL1dzaIAi+KjIo2gCz/hls=; b=I1MyH8K3F2MiOn8PYSoK7v8c8E3J8dsO0p6lmEofdE/tZ4XE/GJBI5txOrrbM3GYnE UbhZxZaPaBkbPR0ku5DxCqDKUjrBDWrdR+WEQEKK8cCAw+LccZN6o+mGv6nk7a/maBdI EFh6gGvbqkd8mTgG0pbTiiH/W+mMOaaBS7rA/hT/s0kK0+cqZlZUdWYMwhWx/bGowA4m 7NS4O0IVto/Juv+ZmJY8dVKnpIf/ouWkqZnS1rnqyIms+qGWe232Kjkk08y8Sr1hAHDc ffpiORGGNQRBatCY71pJ1mho3p9e2X1K+vFjDlHan95QTx8x4IJVXMQMxf9abXohhKKI RRRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dz0Ibotat1ekfWDIMh+K5fL1dzaIAi+KjIo2gCz/hls=; b=m/hOk00mBVZJrwbAkNOq05kZZ6TKKT1ijnmoGwbMmz4tWGVdQ98wc8rfX7q8SYAaQj YNsgWknI6pNFU9QPzXGQh5t4+DKd30WejORJHFCNZdXF+7kRfoJSsAgiACkZqWxa4yfL hYnM4WxMOfS6ERHfgxH244K38eULMvwt8q0YiUTGA2h1WKsicPYzYZEr60jUaZi24Rms xmBEIE2s52N6YYBnvjcBkIkrHHHDijoydBuuZtmyUDLik1pEaPZEJlnQaRInf1JjNtQ5 83QwrayoxbfolYXCI2a211HkWTSqV/cVovs6AbkontYqet2yLIRpsMQ0PVKScYbhht28 KiKw== X-Gm-Message-State: AA+aEWY2An2o/swMm1YjdDZFbi8yK+ymRIJfhMROQ/PMwtmt3gwFoJ2C 89BDMVQkUYgdn28JUEBdcmFUr0e3Szw= X-Google-Smtp-Source: AFSGD/X52bjjqStuc6/C0CaseedkhJnoGwosms6EQ/TiuHdhIz9YorYosLZS11c2tIgn10ydU9fJyA== X-Received: by 2002:a63:e5c:: with SMTP id 28mr9251095pgo.369.1544047939586; Wed, 05 Dec 2018 14:12:19 -0800 (PST) Received: from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id j14sm27704578pfn.175.2018.12.05.14.12.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 14:12:18 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: mgamal@redhat.com, Stephen Hemminger , Stephen Hemminger Date: Wed, 5 Dec 2018 14:11:56 -0800 Message-Id: <20181205221159.6336-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <1543575881.5400.33.camel@redhat.com> References: <1543575881.5400.33.camel@redhat.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 1/4] bus/vmbus: fix race in sub channel creation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When using multiple queues, there was a race with the kernel in setting up the second channel. This regression is due to a kernel change which does not allow accessing sysfs files for Hyper-V channels that are not opened. The fix is simple, just move the logic to detect not ready sub channels earlier in the existing loop. Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support") Reported-by:Mohammed Gamal Signed-off-by: Stephen Hemminger --- drivers/bus/vmbus/linux/vmbus_uio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c index 12e97e3a420a..38df4d724ed5 100644 --- a/drivers/bus/vmbus/linux/vmbus_uio.c +++ b/drivers/bus/vmbus/linux/vmbus_uio.c @@ -357,6 +357,12 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary, continue; } + if (!vmbus_isnew_subchannel(primary, relid)) + continue; /* Already know about you */ + + if (!vmbus_uio_ring_present(dev, relid)) + continue; /* Ring may not be ready yet */ + snprintf(subchan_path, sizeof(subchan_path), "%s/%lu", chan_path, relid); err = vmbus_uio_sysfs_read(subchan_path, "subchannel_id", @@ -370,12 +376,6 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary, if (subid == 0) continue; /* skip primary channel */ - if (!vmbus_isnew_subchannel(primary, relid)) - continue; - - if (!vmbus_uio_ring_present(dev, relid)) - continue; /* Ring may not be ready yet */ - err = vmbus_uio_sysfs_read(subchan_path, "monitor_id", &monid, UINT8_MAX); if (err) { From patchwork Wed Dec 5 22:11:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 48553 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 80E0B7D4A; Wed, 5 Dec 2018 23:12:24 +0100 (CET) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by dpdk.org (Postfix) with ESMTP id B28FC6833 for ; Wed, 5 Dec 2018 23:12:21 +0100 (CET) Received: by mail-pf1-f194.google.com with SMTP id y126so10695951pfb.4 for ; Wed, 05 Dec 2018 14:12:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zA3+jxZGSmk3vlI9gUpesSAloqsc5bS4B6fNVPidkdo=; b=Ryb5SN4RgmlDRqLhDupBdkiSLNRyg2IgMWw2JRW0/xCY04Ouzktg6w7KEPSCMURlhu uamZFJjOpPTetY+g5vK9Pm501xznsjDw3jF29TeiYtJlliSp4K+jbYQKzycAIRSt33pG jTSxH3n9Y3ilXBuVEZe5SUKVryIeTP36XnCLc4KgDEUboVfe+0lC4W6Y1ESj6C6JEcFr mhOQW631weQ87NYrnSu8WVi+2hFdTPpM+zO3V4sC5ZdDTnhhTi7SPRm/eIrpy/YYyXzj +ukvBjTPSqJHkgFc5rx3l5Zdar+exr/hvqWqLa3CC4SxHY7bMdjzjZoFs84tF632pO/C v8Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zA3+jxZGSmk3vlI9gUpesSAloqsc5bS4B6fNVPidkdo=; b=lc+cpvFWfbmXZlacpvmU6/jVJMGY4wU5yLQU9HF3fZhZrn0lN0O3byS85OCNUanKw/ Zf0+UFLcWJp5/SEH39v2/O9xncQDvMRGTgMrAA0/JSlBlI37DPaDCIxejuTxOjoP+CTA kTxbZBaEgKohCFzVWMktQL8287NuuHefsNvc9dzry3y5Wkr1YOXebiaYWAfSZdhyIB7i Le9Gmae055vNIUCCbC/mkLmGmhlkylf7JWdzFNAyvUYkZPa5KEK+74iZs/IBOUK5lDBy 6VDD8zjS1IZvmQNhrZvDw6m6wABoF3HzzqN+Hy0LY5s4+on68qRDDNEZWZCkmcZxGhje ffbg== X-Gm-Message-State: AA+aEWYhvvqnLJ3LIaFEqTew3CDi212Fx0HI9vtviMg7c4VTFtxF/Z5M Es03WUos9aysGad64vt7sPnAUQXtrC4= X-Google-Smtp-Source: AFSGD/UTBewld9Ybfn5hYnnqk7krnpqxOkw6Mo8gnpEauzzLzFT/LMOCqCag5gPipkj5mUhRfeVCog== X-Received: by 2002:a63:d513:: with SMTP id c19mr22010356pgg.287.1544047940486; Wed, 05 Dec 2018 14:12:20 -0800 (PST) Received: from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id j14sm27704578pfn.175.2018.12.05.14.12.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 14:12:19 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: mgamal@redhat.com, Stephen Hemminger , Stephen Hemminger Date: Wed, 5 Dec 2018 14:11:57 -0800 Message-Id: <20181205221159.6336-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181205221159.6336-1-stephen@networkplumber.org> References: <1543575881.5400.33.camel@redhat.com> <20181205221159.6336-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 2/4] net/netvsc: enable SR-IOV X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Make DPDK enable SRIOV flag in same way as Linux and FreeBSD. Fixes: dc7680e8597c ("net/netvsc: support integrated VF") Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_nvs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/netvsc/hn_nvs.c b/drivers/net/netvsc/hn_nvs.c index 9690c5f8a3e7..d58770e0455e 100644 --- a/drivers/net/netvsc/hn_nvs.c +++ b/drivers/net/netvsc/hn_nvs.c @@ -326,9 +326,9 @@ hn_nvs_conf_ndis(struct hn_data *hv, unsigned int mtu) conf.mtu = mtu + ETHER_HDR_LEN; conf.caps = NVS_NDIS_CONF_VLAN; - /* TODO enable SRIOV */ - //if (hv->nvs_ver >= NVS_VERSION_5) - // conf.caps |= NVS_NDIS_CONF_SRIOV; + /* enable SRIOV */ + if (hv->nvs_ver >= NVS_VERSION_5) + conf.caps |= NVS_NDIS_CONF_SRIOV; /* NOTE: No response. */ error = hn_nvs_req_send(hv, &conf, sizeof(conf)); From patchwork Wed Dec 5 22:11:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 48554 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1DC211B0F9; Wed, 5 Dec 2018 23:12:26 +0100 (CET) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by dpdk.org (Postfix) with ESMTP id 62BBA7CE2 for ; Wed, 5 Dec 2018 23:12:23 +0100 (CET) Received: by mail-pf1-f196.google.com with SMTP id g62so10677430pfd.12 for ; Wed, 05 Dec 2018 14:12:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S0B7W+x0jli1s1zMsNuo368VA70GpQf1xlqDrFsT7ts=; b=uMC1XHMDbvdMyhFy8bCCmvAmT6SGGjZElNapAm3vLIqcLHJHGg0cwa60tLlaRbxm3L YWSc9Z1shqFf1iUwGstHZ9Lom944PiwrJqdBu+JG9h+AQrt5dgmeqOjqqnTarswAb3iH KJLEXg6zoShL/uD1KgpiMxr7EWo8WUVxVCDdkdLuuI1QA47xcPCsrUSS3Fp6ClcXaC7w j68uyd3I+wJ82nI+JJ3AA3orTQNplNjHfm8IpJjUECJsuPx/cVLWQMUMff3YXnFP6oB0 GdiuKOsHAPpUoEkGt8EqazFzpjX9A0v/xSuQPmWEBwOtVBOHEaRZgDKZho2CyAEuzYcE hXGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S0B7W+x0jli1s1zMsNuo368VA70GpQf1xlqDrFsT7ts=; b=ctYwjUAt1OqZ1cgG8hAYH/LWzAtbADdFsRGbbopnCIh0map08Ile7jibf3Y7Wmyaoa jNWKgbpbrc5whkVsRM/jOA4lXlw0vZUmlgoDeRzCEA2S80ItpxEUTFbDLL7IoOH40p/c CAKpaMTXFIjWBvjInQADtveJzylLRcKvT9IMF5EZZFyxiypH1w3iZBuDTUp9bXvdT1gh TIhGAH7iCZGZAZbbBXJkrMt/HJYRWeW91uESJdJi/fSxmIGpJNvrbiO7Ls+LO8ooLDJ6 l59m4tqH+O2tjddWRnN1I/iDV8AVgd2e9JrA5kVRoXG0JoUAOSokK+Hz5E8deoEoE1KO SMww== X-Gm-Message-State: AA+aEWaIDg4X0y4763/02xFEzWdIo1rDp37hRTdRPTgpq6q8PLZMvAD+ etkp0yNfP12GiquY/ht5TDHgmQYZVo8= X-Google-Smtp-Source: AFSGD/UwNfdyDx99d7f4Gct5wIZyh5XbZsFuHQ7pevF2kasnvxcREyXv9ZGjqk8or6zEYxfx+iBiiw== X-Received: by 2002:a62:61c3:: with SMTP id v186mr14828392pfb.55.1544047942102; Wed, 05 Dec 2018 14:12:22 -0800 (PST) Received: from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id j14sm27704578pfn.175.2018.12.05.14.12.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 14:12:20 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: mgamal@redhat.com, Stephen Hemminger , Stephen Hemminger Date: Wed, 5 Dec 2018 14:11:58 -0800 Message-Id: <20181205221159.6336-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181205221159.6336-1-stephen@networkplumber.org> References: <1543575881.5400.33.camel@redhat.com> <20181205221159.6336-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 3/4] net/netvsc: disable multi-queue on older servers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" NDIS multi-queue support is only in WS2012 or later. Check the NDIS version to limit to single queue on older versions. Similar code exists in Linux driver. Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device") Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_ethdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index b330bf3d7255..1256fa399b16 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -732,6 +732,7 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev) hv->chim_res = &vmbus->resource[HV_SEND_BUF_MAP]; hv->port_id = eth_dev->data->port_id; hv->latency = HN_CHAN_LATENCY_NS; + hv->max_queues = 1; err = hn_parse_args(eth_dev); if (err) @@ -770,6 +771,10 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev) if (err) goto failed; + /* Multi queue requires later versions of windows server */ + if (hv->nvs_ver < NVS_VERSION_5) + return 0; + max_chan = rte_vmbus_max_channels(vmbus); PMD_INIT_LOG(DEBUG, "VMBus max channels %d", max_chan); if (max_chan <= 0) From patchwork Wed Dec 5 22:11:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 48555 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3B4011B105; Wed, 5 Dec 2018 23:12:28 +0100 (CET) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by dpdk.org (Postfix) with ESMTP id 9D4618E76 for ; Wed, 5 Dec 2018 23:12:24 +0100 (CET) Received: by mail-pg1-f196.google.com with SMTP id z11so9661194pgu.0 for ; Wed, 05 Dec 2018 14:12:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sGUsUpZQbTZMdq0bum8xdHpUcyo0JaJV2c1as7pxrd8=; b=GuL0YhwR7fzW86ro6zkmlzQCbtnYCtAyufH99QMnjCx4mZ0Wu1td+2HIbjEDPQv5B8 vpokuxTHMFBmrd3MqN1tcgbwVBKmfG+iPpkhHXamNi3rPS/6D2++T8q6UWzuyT2HU6AU DB++BF/VYHwTqs4m9WcSoIrtCIMsdUInxMqF5ltNRKm441Lr3/fq7urHJILzbZbKLCSC SEFIhAweOBNrvAvZEbckNCEH8hyJ8syCYKGT0i+861K0yO2PCCwHEZEe5QwjuTq9AJH3 NNWwwtTGnG9efc64gudLjsH7YlnYy2nclV6hD8nYK/bfCZLwK2VBEZ5Oje8b1ePjLMmc uq5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sGUsUpZQbTZMdq0bum8xdHpUcyo0JaJV2c1as7pxrd8=; b=GVTE2b7a26zd0yqeuXaCtQEDG6mJVZi9mPle90WJC/MwkzO40/525kVN8A00W8kdfF 2c90iOwTSJWkUvqiS1FkWcd2ml2ZWXvELejlFSvikpKY9nhD8zZvWczdDPZy1jvPND4u /fwAHcwcn2JV1Sygi2tFIL9qh+TXTJkx5SnWcGFSJPNtueTE/+cyhMRa8zEzsEMcXKnq /AU8NnC6bggG519G7uzmBiiuIxpNpTAPzkZTJ0BUw1ogHEu4GYmuBB3B4wH8VkA9tvVV iluzIIu2hj6NQKG5V0xmczYvKdjqs780Qq6arPhUhkNKxEGBAuGkR1MGDdAfhTcY3dU3 dW0A== X-Gm-Message-State: AA+aEWZUmtA49OeZlWUn0LtYXhYtv4Iht4j40jfdfpB872k3pySgxatZ 4NuQfYLeTIZG85dF+pVqi+PvF8r9ZGI= X-Google-Smtp-Source: AFSGD/WJWFED4L4+QVSULqdGQM3OXPZ9lVql6X9CmGIyJAhpwbPcXxSJCO3lVeE0pxwPMaFyxn+7HQ== X-Received: by 2002:a62:5dd1:: with SMTP id n78mr25630379pfj.58.1544047943496; Wed, 05 Dec 2018 14:12:23 -0800 (PST) Received: from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id j14sm27704578pfn.175.2018.12.05.14.12.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 14:12:22 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: mgamal@redhat.com, Stephen Hemminger , Stephen Hemminger Date: Wed, 5 Dec 2018 14:11:59 -0800 Message-Id: <20181205221159.6336-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181205221159.6336-1-stephen@networkplumber.org> References: <1543575881.5400.33.camel@redhat.com> <20181205221159.6336-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 4/4] bus/vmbus: debug subchannel setup X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add more instrumentation to subchannel setup to help diagnose startup issues. Signed-off-by: Stephen Hemminger --- drivers/bus/vmbus/linux/vmbus_uio.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c index 38df4d724ed5..09f7efdca286 100644 --- a/drivers/bus/vmbus/linux/vmbus_uio.c +++ b/drivers/bus/vmbus/linux/vmbus_uio.c @@ -357,19 +357,25 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary, continue; } - if (!vmbus_isnew_subchannel(primary, relid)) - continue; /* Already know about you */ + if (!vmbus_isnew_subchannel(primary, relid)) { + VMBUS_LOG(DEBUG, "skip already found channel: %lu", + relid); + continue; + } - if (!vmbus_uio_ring_present(dev, relid)) - continue; /* Ring may not be ready yet */ + if (!vmbus_uio_ring_present(dev, relid)) { + VMBUS_LOG(DEBUG, "ring mmap not found (yet) for: %lu", + relid); + continue; + } snprintf(subchan_path, sizeof(subchan_path), "%s/%lu", chan_path, relid); err = vmbus_uio_sysfs_read(subchan_path, "subchannel_id", &subid, UINT16_MAX); if (err) { - VMBUS_LOG(NOTICE, "invalid subchannel id %lu", - subid); + VMBUS_LOG(NOTICE, "no subchannel_id in %s:%s", + subchan_path, strerror(-err)); goto fail; } @@ -379,14 +385,14 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary, err = vmbus_uio_sysfs_read(subchan_path, "monitor_id", &monid, UINT8_MAX); if (err) { - VMBUS_LOG(NOTICE, "invalid monitor id %lu", - monid); + VMBUS_LOG(NOTICE, "no monitor_id in %s:%s", + subchan_path, strerror(-err)); goto fail; } err = vmbus_chan_create(dev, relid, subid, monid, subchan); if (err) { - VMBUS_LOG(NOTICE, "subchannel setup failed"); + VMBUS_LOG(ERR, "subchannel setup failed"); goto fail; } break;