From patchwork Thu Jun 6 00:35:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 54457 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 870191B9E0; Thu, 6 Jun 2019 02:35:27 +0200 (CEST) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by dpdk.org (Postfix) with ESMTP id 8FAE91B9DE for ; Thu, 6 Jun 2019 02:35:26 +0200 (CEST) Received: by mail-pg1-f193.google.com with SMTP id e6so268426pgd.9 for ; Wed, 05 Jun 2019 17:35:26 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=50J7/V+gjxUl39iaY7J8iSQ55VcLnP4byqzs+H2Y7Go=; b=iZAHkd31LdaddgdyS82ZZUau/FUxzt6uOGFTx8KdhZ8oCns/PZZUMaq3vFUNQLUgin 61cEQzmOFTxlb6s3NFiVLfzxj2b0t+cidrmqQDfzEEI6QW01btt/eKS5uF4Z7w6PBRgQ Cl79BIYRBILq65A5lx3mOQ4qAXi+rtL+jU+C3pvh67UFs5RiauM13o1FgzChPVP5Ytmt +6CsA/ih5+2/EaO7yX+k0K4zOl8Jfl+X5DAc3Eg/u4V8R9p3xkzoKKXLiIj5Ouwzx6bM v4asjVgTxGwC20vKJdeBH++vH8UWdDKoyDFkYp3/X1BJY7cMa4oFNZ/V+D/Zbs42spiX R5cA== 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:mime-version :content-transfer-encoding; bh=50J7/V+gjxUl39iaY7J8iSQ55VcLnP4byqzs+H2Y7Go=; b=rDTehLgdXc9Zgp8t+Zu0283K8ubk3W2cybMs6PxuX0Mrz6OdMMicjsucP8jL+nCd2z Tag5hd1LT2vpahDXqbPL9mqhMLef9bwzIJdDqUGSOeoP0DM3KrpRUmV5/lCxhjmtMuiv 8wMxxeaAofTImQgsiD/lQuqORLSvo8MexmTIji2cw39kVCVGKnC1A9sD7rxeHk6Pn2qq hrH8v24cu6IDkGYkTxIhspiT8k0vH3Ak11Jga2esK5KIuNVE+hm0AHY/vV3TfxtSxNRn Y0RwpaiQYCAryw2d2Ww+KyBJXU7JeZy5TmmwgU6MJPBJZ3T6tikoBNFsV99nU+uAY4Y4 7UVA== X-Gm-Message-State: APjAAAXwCh3XSqk+zVPX34AngE1gfy8ifZw/p2KIiXKO5ZjT+HMG/6mp 6yRLkvKrMTEcOkgsoKJhtKlJ6LZh3k8= X-Google-Smtp-Source: APXvYqxEHI+JLcLoQTdNHn44gS46IhNwwh/Xln4pVrHaeNql+mmXPKEd6t6k9CitP/3am79skyY7jg== X-Received: by 2002:a17:90a:af8a:: with SMTP id w10mr48859646pjq.132.1559781325177; Wed, 05 Jun 2019 17:35:25 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 22sm149241pje.15.2019.06.05.17.35.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jun 2019 17:35:24 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 5 Jun 2019 17:35:20 -0700 Message-Id: <20190606003520.29260-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] bus/vmbus: skip non-network devices 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" From: Stephen Hemminger The vmbus scan code can just skip non-network devices. More importantly, this fixes the bug where some vmbus devices don't have all the attributes (like monitor_id) and a single failure would cause the scan to break the loop. Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support") Signed-off-by: Stephen Hemminger --- drivers/bus/vmbus/linux/vmbus_bus.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/drivers/bus/vmbus/linux/vmbus_bus.c b/drivers/bus/vmbus/linux/vmbus_bus.c index a4755a3878df..ca0b433a0824 100644 --- a/drivers/bus/vmbus/linux/vmbus_bus.c +++ b/drivers/bus/vmbus/linux/vmbus_bus.c @@ -25,6 +25,18 @@ /** Pathname of VMBUS devices directory. */ #define SYSFS_VMBUS_DEVICES "/sys/bus/vmbus/devices" +/* + * GUID associated with network devices + * {f8615163-df3e-46c5-913f-f2d2f965ed0e} + */ +static const rte_uuid_t vmbus_nic_uuid = { + 0xf8, 0x61, 0x51, 0x63, + 0xdf, 0x3e, + 0x46, 0xc5, + 0x91, 0x3f, + 0xf2, 0xd2, 0xf9, 0x65, 0xed, 0xe +}; + extern struct rte_vmbus_bus rte_vmbus_bus; /* Read sysfs file to get UUID */ @@ -242,16 +254,20 @@ vmbus_scan_one(const char *name) snprintf(dirname, sizeof(dirname), "%s/%s", SYSFS_VMBUS_DEVICES, name); - /* get device id */ - snprintf(filename, sizeof(filename), "%s/device_id", dirname); - if (parse_sysfs_uuid(filename, dev->device_id) < 0) - goto error; - /* get device class */ snprintf(filename, sizeof(filename), "%s/class_id", dirname); if (parse_sysfs_uuid(filename, dev->class_id) < 0) goto error; + /* skip non-network devices */ + if (rte_uuid_compare(dev->class_id, vmbus_nic_uuid) != 0) + return 0; + + /* get device id */ + snprintf(filename, sizeof(filename), "%s/device_id", dirname); + if (parse_sysfs_uuid(filename, dev->device_id) < 0) + goto error; + /* get relid */ snprintf(filename, sizeof(filename), "%s/id", dirname); if (eal_parse_sysfs_value(filename, &tmp) < 0)