From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by dpdk.org (Postfix) with ESMTP id 539886AA8 for ; Fri, 28 Feb 2014 18:24:58 +0100 (CET) Received: by mail-wi0-f179.google.com with SMTP id bs8so887850wib.6 for ; Fri, 28 Feb 2014 09:26:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=d4OS3wEWfbqLg3KqlKzPu/4qDj+RiHuAbW4zJ4KG8YA=; b=TX0ckoH25jCL5/8n82P2YgjbS+vt6DrVNwXzBEtM21F9p2t2ciYBhF7Y0jO73xkuhw HIGgX1BEK5sSsbWhKfEig4Aeuk3n5oCrL2fULS9KZhMmTkx73IiynmFBU4K9p7I6VLxz aGve60MpZe1Kd/0XLvKIuRoWJuNQsbtNHF/0tp+xO7IN47yLocNbkt03wbgSEUjCQGMu W84nni2QfO60982kCuKF22QWHutu+ZHJRIno5OIf+WJtn8X//y0QlcLY9YnErvM5t6H3 n1ocvwh1eUKuBIBzWajJmp9Cu/dxm4Z3HYjA8kKe2zBq/jT6Nb42YgmLvVnmbxmTwLD5 UPzQ== X-Gm-Message-State: ALoCoQkRJENCCXg5UqWkKrfJurH6m+m/wiUJpWT4Dx+I+7BdX+mFe9pny20LC4m8pKasw8iCthfF X-Received: by 10.194.216.68 with SMTP id oo4mr2977954wjc.79.1393608385301; Fri, 28 Feb 2014 09:26:25 -0800 (PST) Received: from glumotte.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id hy8sm5908439wjb.2.2014.02.28.09.26.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Feb 2014 09:26:24 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Date: Fri, 28 Feb 2014 18:25:49 +0100 Message-Id: <1393608350-4431-11-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393608350-4431-1-git-send-email-olivier.matz@6wind.com> References: <1393608350-4431-1-git-send-email-olivier.matz@6wind.com> Subject: [dpdk-dev] [PATCH 10/11] device-args: allow to provide per pci device command line arguments X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2014 17:24:59 -0000 Some PCI drivers may require some specific initialization arguments at start-up. Even if unused today, adding this feature seems coherent with virtual devices in order to provide a full-featured rte_devargs framework. In the future, it could be added in pmd_ixgbe or pmd_igb for instance to enable debug of drivers or setting a specific operating mode at start-up. Signed-off-by: Olivier Matz --- lib/librte_eal/common/eal_common_pci.c | 44 ++++++++++++++------------------- lib/librte_eal/common/include/rte_pci.h | 6 +++-- lib/librte_eal/linuxapp/eal/eal_pci.c | 4 ++- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 03e1378..9eb9d5c 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -32,7 +32,7 @@ */ /* BSD LICENSE * - * Copyright(c) 2013 6WIND. + * Copyright(c) 2013-2014 6WIND. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -85,17 +85,18 @@ struct pci_driver_list pci_driver_list; struct pci_device_list pci_device_list; -static int is_blacklisted(struct rte_pci_device *dev) +static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev) { struct rte_devargs *devargs; TAILQ_FOREACH(devargs, &devargs_list, next) { - if (devargs->type != RTE_DEVTYPE_BLACKLISTED_PCI) + if (devargs->type != RTE_DEVTYPE_BLACKLISTED_PCI && + devargs->type != RTE_DEVTYPE_WHITELISTED_PCI) continue; if (!memcmp(&dev->addr, &devargs->pci.addr, sizeof(dev->addr))) - return 1; + return devargs; } - return 0; /* not in blacklist */ + return NULL; } /* @@ -113,7 +114,6 @@ pci_probe_all_drivers(struct rte_pci_device *dev) struct rte_pci_driver *dr = NULL; int rc; - dev->blacklisted = !!is_blacklisted(dev); TAILQ_FOREACH(dr, &pci_driver_list, next) { rc = rte_eal_pci_probe_one_driver(dr, dev); if (rc < 0) @@ -124,7 +124,8 @@ pci_probe_all_drivers(struct rte_pci_device *dev) continue; /* initialize subsequent driver instances for this device */ if ((dr->drv_flags & RTE_PCI_DRV_MULTIPLE) && - (!dev->blacklisted)) + (dev->devargs == NULL || + dev->devargs->type != RTE_DEVTYPE_BLACKLISTED_PCI)) while (rte_eal_pci_probe_one_driver(dr, dev) == 0) ; return 0; @@ -133,23 +134,6 @@ pci_probe_all_drivers(struct rte_pci_device *dev) } /* - * Check if a device is ok to use according to whitelist rules. - */ -static int -pcidev_is_whitelisted(struct rte_pci_device *dev) -{ - struct rte_devargs *devargs; - - TAILQ_FOREACH(devargs, &devargs_list, next) { - if (devargs->type != RTE_DEVTYPE_WHITELISTED_PCI) - continue; - if (!memcmp(&dev->addr, &devargs->pci.addr, sizeof(dev->addr))) - return 1; - } - return 0; -} - -/* * Scan the content of the PCI bus, and call the devinit() function for * all registered drivers that have a matching entry in its id_table * for discovered devices. @@ -158,15 +142,25 @@ int rte_eal_pci_probe(void) { struct rte_pci_device *dev = NULL; + struct rte_devargs *devargs; int probe_all = 0; if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) == 0) probe_all = 1; TAILQ_FOREACH(dev, &pci_device_list, next) { + + /* set devargs in PCI structure */ + devargs = pci_devargs_lookup(dev); + if (devargs != NULL) + dev->devargs = devargs; + + /* probe all or only whitelisted devices */ if (probe_all) pci_probe_all_drivers(dev); - else if (pcidev_is_whitelisted(dev) && pci_probe_all_drivers(dev) < 0) + else if (devargs != NULL && + devargs->type == RTE_DEVTYPE_WHITELISTED_PCI && + pci_probe_all_drivers(dev) < 0) rte_exit(EXIT_FAILURE, "Requested device " PCI_PRI_FMT " cannot be used\n", dev->addr.domain,dev->addr.bus, dev->addr.devid, dev->addr.function); diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index 6dd962a..3aa7d56 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -32,7 +32,7 @@ */ /* BSD LICENSE * - * Copyright(c) 2013 6WIND. + * Copyright(c) 2013-2014 6WIND. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -136,6 +136,8 @@ struct rte_pci_addr { uint8_t function; /**< Device function. */ }; +struct rte_devargs; + /** * A structure describing a PCI device. */ @@ -148,7 +150,7 @@ struct rte_pci_device { const struct rte_pci_driver *driver; /**< Associated driver */ uint16_t max_vfs; /**< sriov enable if not zero */ int numa_node; /**< NUMA node connection */ - unsigned int blacklisted:1; /**< Device is blacklisted */ + struct rte_devargs *devargs; /**< Device user arguments */ }; /** Any PCI device identifier (vendor, device, ...) */ diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index f4ac8f4..9538efe 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -64,6 +64,7 @@ #include #include #include +#include #include "rte_pci_dev_ids.h" #include "eal_filesystem.h" @@ -1031,7 +1032,8 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d dev->id.device_id, dr->name); /* no initialization when blacklisted, return without error */ - if (dev->blacklisted) { + if (dev->devargs != NULL && + dev->devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) { RTE_LOG(DEBUG, EAL, " Device is blacklisted, not initializing\n"); return 0; } -- 1.8.5.3