From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f41.google.com (mail-pa0-f41.google.com [209.85.220.41]) by dpdk.org (Postfix) with ESMTP id 159249A9D for ; Tue, 3 Feb 2015 05:07:38 +0100 (CET) Received: by mail-pa0-f41.google.com with SMTP id kq14so90912117pab.0 for ; Mon, 02 Feb 2015 20:07:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=hSUcr3Ay3Am/YpEinD4As7LSlTCjCTl9erRMM6rcrgg=; b=OIYDCqU9TJWHPIT/4dSfhV7Q/uAv3Av3PXsPs+bEUrV85HPqo2WFkWrS7EyxPkAUvM eP9q6oWeWoWwo8WFMshQbN3O5eirIrSsHA/+NS8TNpApSU5PNVvZy4Ps3dQpAz+hsSWg JTKExHKfHIwX++mfJktzuyrXoBgfdC7AOkz0hpnCBrp0jYsgUB+O5biz5pkJKrUsqMee 5xhe3pBD5oFk1W3xXGWaEqxjd6Q5V7k3kIfHgwgiwZ7SERtXgzsU2OyR5438seHsZt+4 8NeVCcUPhh6kJqZuZYy95ze8kZWY9K6XLWohd7abQCDH2W+13jgDNNnw2uCkeKqh3lTU Ichg== X-Gm-Message-State: ALoCoQlmTsIrGaMqYQAR8ea6Kwviypou8Hz787DLWLpj303TXWCPoZU4b3DrnADQignsJte4TjhA X-Received: by 10.70.100.202 with SMTP id fa10mr34729125pdb.131.1422936457460; Mon, 02 Feb 2015 20:07:37 -0800 (PST) Received: from [10.16.129.101] (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id th8sm546087pbc.38.2015.02.02.20.07.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Feb 2015 20:07:36 -0800 (PST) Message-ID: <54D04985.50908@igel.co.jp> Date: Tue, 03 Feb 2015 13:07:33 +0900 From: Tetsuya Mukawa User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: "Qiu, Michael" , "dev@dpdk.org" References: <1421664027-17971-9-git-send-email-mukawa@igel.co.jp> <1422763322-13742-1-git-send-email-mukawa@igel.co.jp> <1422763322-13742-8-git-send-email-mukawa@igel.co.jp> <533710CFB86FA344BFBF2D6802E60286CD3AFD@SHSMSX101.ccr.corp.intel.com> In-Reply-To: <533710CFB86FA344BFBF2D6802E60286CD3AFD@SHSMSX101.ccr.corp.intel.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v6 07/13] ethdev: Add functions that will be used by port hotplug functions 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: Tue, 03 Feb 2015 04:07:38 -0000 On 2015/02/03 11:37, Qiu, Michael wrote: > On 2/1/2015 12:02 PM, Tetsuya Mukawa wrote: >> The patch adds following functions. >> >> - rte_eth_dev_save() >> The function is used for saving current rte_eth_dev structures. >> - rte_eth_dev_get_changed_port() >> The function receives the rte_eth_dev structures, then compare >> these with current values to know which port is actually >> attached or detached. >> - rte_eth_dev_get_addr_by_port() >> The function returns a pci address of a ethdev specified by port >> identifier. >> - rte_eth_dev_get_port_by_addr() >> The function returns a port identifier of a ethdev specified by >> pci address. >> - rte_eth_dev_get_name_by_port() >> The function returns a unique identifier name of a ethdev >> specified by port identifier. >> - Add rte_eth_dev_check_detachable() >> The function returns whether a PMD supports detach function. >> >> Also the patch changes scope of rte_eth_dev_allocated() to global. >> This function will be called by virtual PMDs to support port hotplug. >> So change scope of the function to global. >> >> v5: >> - Fix return value of below functions. >> rte_eth_dev_get_changed_port(). >> rte_eth_dev_get_port_by_addr(). >> v4: >> - Add paramerter checking. >> v3: >> - Fix if-condition bug while comparing pci addresses. >> - Add error checking codes. >> Reported-by: Mark Enright >> >> Signed-off-by: Tetsuya Mukawa >> --- >> lib/librte_ether/rte_ethdev.c | 98 ++++++++++++++++++++++++++++++++++++++++++- >> lib/librte_ether/rte_ethdev.h | 80 +++++++++++++++++++++++++++++++++++ >> 2 files changed, 177 insertions(+), 1 deletion(-) >> >> diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c >> index 7bed901..5aded10 100644 >> --- a/lib/librte_ether/rte_ethdev.c >> +++ b/lib/librte_ether/rte_ethdev.c >> @@ -206,7 +206,7 @@ rte_eth_dev_data_alloc(void) >> RTE_MAX_ETHPORTS * sizeof(*rte_eth_dev_data)); >> } >> >> -static struct rte_eth_dev * >> +struct rte_eth_dev * >> rte_eth_dev_allocated(const char *name) >> { >> unsigned i; >> @@ -426,6 +426,102 @@ rte_eth_dev_count(void) >> return (nb_ports); >> } >> >> +void >> +rte_eth_dev_save(struct rte_eth_dev *devs) >> +{ >> + if (devs == NULL) >> + return; >> + >> + /* save current rte_eth_devices */ >> + memcpy(devs, rte_eth_devices, >> + sizeof(struct rte_eth_dev) * RTE_MAX_ETHPORTS); >> +} >> + >> +int >> +rte_eth_dev_get_changed_port(struct rte_eth_dev *devs, uint8_t *port_id) >> +{ >> + if ((devs == NULL) || (port_id == NULL)) >> + return -EINVAL; >> + >> + /* check which port was attached or detached */ >> + for (*port_id = 0; *port_id < RTE_MAX_ETHPORTS; (*port_id)++, devs++) { >> + if (rte_eth_devices[*port_id].attached ^ devs->attached) >> + return 0; >> + } >> + return -ENODEV; >> +} >> + >> +int >> +rte_eth_dev_get_addr_by_port(uint8_t port_id, struct rte_pci_addr *addr) >> +{ >> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID) >> + return -EINVAL; >> + >> + if (addr == NULL) { >> + PMD_DEBUG_TRACE("Null pointer is specified\n"); >> + return -EINVAL; >> + } >> + >> + *addr = rte_eth_devices[port_id].pci_dev->addr; >> + return 0; >> +} >> + >> +int >> +rte_eth_dev_get_port_by_addr(struct rte_pci_addr *addr, uint8_t *port_id) >> +{ >> + struct rte_pci_addr *tmp; >> + >> + if ((addr == NULL) || (port_id == NULL)) { >> + PMD_DEBUG_TRACE("Null pointer is specified\n"); >> + return -EINVAL; >> + } >> + >> + for (*port_id = 0; *port_id < RTE_MAX_ETHPORTS; (*port_id)++) { >> + if (!rte_eth_devices[*port_id].attached) >> + continue; >> + if (!rte_eth_devices[*port_id].pci_dev) >> + continue; >> + tmp = &rte_eth_devices[*port_id].pci_dev->addr; >> + if (eal_compare_pci_addr(tmp, addr) == 0) >> + return 0; >> + } >> + return -ENODEV; >> +} >> + >> +int >> +rte_eth_dev_get_name_by_port(uint8_t port_id, char *name) >> +{ >> + char *tmp; >> + >> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID) >> + return -EINVAL; >> + >> + if (name == NULL) { >> + PMD_DEBUG_TRACE("Null pointer is specified\n"); >> + return -EINVAL; >> + } >> + >> + /* shouldn't check 'rte_eth_devices[i].data', >> + * because it might be overwritten by VDEV PMD */ >> + tmp = rte_eth_dev_data[port_id].name; >> + strncpy(name, tmp, strlen(tmp) + 1); >> + return 0; >> +} >> + >> +int >> +rte_eth_dev_check_detachable(uint8_t port_id) >> +{ >> + uint32_t drv_flags; >> + >> + if (port_id >= RTE_MAX_ETHPORTS) { >> + PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); >> + return -EINVAL; >> + } >> + >> + drv_flags = rte_eth_devices[port_id].driver->pci_drv.drv_flags; > Here should be better to add pt_driver for pci_dev type port. Sure, I will add it. Tetsuya > Thanks, > Michael >> + return !(drv_flags & RTE_PCI_DRV_DETACHABLE); >> +} >> + >> static int >> rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) >> { >> diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h >> index 91d9e86..9919968 100644 >> --- a/lib/librte_ether/rte_ethdev.h >> +++ b/lib/librte_ether/rte_ethdev.h >> @@ -1616,6 +1616,86 @@ extern struct rte_eth_dev rte_eth_devices[]; >> extern uint8_t rte_eth_dev_count(void); >> >> /** >> + * Function for internal use by port hotplug functions. >> + * Copies current ethdev structures to the specified pointer. >> + * >> + * @param devs The pointer to the ethdev structures >> + */ >> +extern void rte_eth_dev_save(struct rte_eth_dev *devs); >> + >> +/** >> + * Function for internal use by port hotplug functions. >> + * Compare the specified ethdev structures with currents. Then >> + * if there is a port which status is changed, fill the specified pointer >> + * with the port id of that port. >> + * @param devs The pointer to the ethdev structures >> + * @param port_id The pointer to the port id >> + * @return >> + * - 0 on success, negative on error >> + */ >> +extern int rte_eth_dev_get_changed_port( >> + struct rte_eth_dev *devs, uint8_t *port_id); >> + >> +/** >> + * Function for internal use by port hotplug functions. >> + * Returns a pci address of a ethdev specified by port identifier. >> + * @param port_id >> + * The port identifier of the Ethernet device >> + * @param addr >> + * The pointer to the pci address >> + * @return >> + * - 0 on success, negative on error >> + */ >> +extern int rte_eth_dev_get_addr_by_port( >> + uint8_t port_id, struct rte_pci_addr *addr); >> + >> +/** >> + * Function for internal use by port hotplug functions. >> + * Returns a port identifier of a ethdev specified by pci address. >> + * @param addr >> + * The pointer to the pci address of the Ethernet device. >> + * @param port_id >> + * The pointer to the port identifier >> + * @return >> + * - 0 on success, negative on error >> + */ >> +extern int rte_eth_dev_get_port_by_addr( >> + struct rte_pci_addr *addr, uint8_t *port_id); >> + >> +/** >> + * Function for internal use by port hotplug functions. >> + * Returns a unique identifier name of a ethdev specified by port identifier. >> + * @param port_id >> + * The port identifier. >> + * @param name >> + * The pointer to the Unique identifier name for each Ethernet device >> + * @return >> + * - 0 on success, negative on error >> + */ >> +extern int rte_eth_dev_get_name_by_port(uint8_t port_id, char *name); >> + >> +/** >> + * Function for internal use by port hotplug functions. >> + * Check whether or not, a PMD that is handling the ethdev specified by port >> + * identifier can support detach function. >> + * @param port_id >> + * The port identifier >> + * @return >> + * - 0 on supporting detach function, negative on not supporting >> + */ >> +extern int rte_eth_dev_check_detachable(uint8_t port_id); >> + >> +/** >> + * Function for internal use by port hotplug functions. >> + * Returns a ethdev slot specified by the unique identifier name. >> + * @param name >> + * The pointer to the Unique identifier name for each Ethernet device >> + * @return >> + * - The pointer to the ethdev slot, on success. NULL on error >> + */ >> +extern struct rte_eth_dev *rte_eth_dev_allocated(const char *name); >> + >> +/** >> * Function for internal use by dummy drivers primarily, e.g. ring-based >> * driver. >> * Allocates a new ethdev slot for an ethernet device and returns the pointer