From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com [209.85.128.174]) by dpdk.org (Postfix) with ESMTP id B1DF3F94 for ; Tue, 18 Apr 2017 14:17:56 +0200 (CEST) Received: by mail-wr0-f174.google.com with SMTP id o21so101207171wrb.2 for ; Tue, 18 Apr 2017 05:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=TWK8FHnJrU3PDGhQMSJ0Yc5dtF239VQ/4A6fdiNKuTI=; b=YGKGAY3uI+AQK3F6GLvJ4hKvN406NAF3ohG2QTR3WTpi6sWIc4Hop+g1yS1IyHK8tw GOdkYGEZiPAWmqRqYFZYzBAs9zstoXUJK4BsKsNWvuO3y+UcQo8N2YV84qyofZMLmenL //uMvQO1lNdO9zGYkbmS3hOVo6J/z7wEXyKRSTZ6tFEpPloRyycMlQr3t4HzGcTBPVld ENnk4R9/metOSRHpw3lmhlAyYWCfo8UZhQ6LbUkpwt5rN5Iedb5GUKIGqaPZ2xoF3eoj R2pNi2EWNK/DoF5QkdjiAT6v8dBNEHUcnRd5kWxDRIY3aBrgtZ+ECC9ZoR5fEDwjWG9q LUmw== 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:in-reply-to:references; bh=TWK8FHnJrU3PDGhQMSJ0Yc5dtF239VQ/4A6fdiNKuTI=; b=PlFHESup773GAo04L9wyAkaeotC6jju63gp8Gv0ojp1hU1H2YrC11nOKNW9Ieo3bBi Kij6r9RULwF9xdr2s6DsCPIVg/wEAEGI86PCaJJ7p0hS4wiOT3vxmh1az8WmVbj31Bxz iY0U2YiQt9wjyctXUqz5+phhhJY6Kv2Yw2Ft8q4X2hidEUKZw/teDILwOmDLA7AHLZ+l oUfqXNG/RJBgfFMm4QaQnxrXzAXiCGkKgvNnYwZz9nTDt2RjL4Ovr/dPfySx+zDBOBCV V76dw3tfpHvurGe2Sh617GaGTVLFCcFfn8ElZyz6SocCNOrCCQRT/FY9AAFn347aHZTs fM3g== X-Gm-Message-State: AN3rC/6kmYwwnUvPlouhH6DOaz/rwzHTis5e7dtbtkHjjli3CiyKuJXX BqRUdZTGd/lZ2RJD X-Received: by 10.223.139.215 with SMTP id w23mr23039768wra.169.1492517876351; Tue, 18 Apr 2017 05:17:56 -0700 (PDT) Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id u23sm4266024wmu.16.2017.04.18.05.17.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Apr 2017 05:17:55 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Elad Persiko Date: Tue, 18 Apr 2017 14:17:38 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 1/5] ethdev: introduce device removal event 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: , X-List-Received-Date: Tue, 18 Apr 2017 12:17:56 -0000 This new API allows reacting to a device removal. A device removal is the sudden disappearance of a device from its bus. PMDs implementing support for this notification guarantee that the removal of the underlying device does not incur a risk to the application. In particular, Rx/Tx bursts and all other functions can still be called (albeit likely returning errors) without triggering a crash, irrespective of an application handling this event. Signed-off-by: Gaetan Rivet Signed-off-by: Elad Persiko --- doc/guides/nics/features/default.ini | 1 + doc/guides/prog_guide/env_abstraction_layer.rst | 21 +++++++++++++++++++-- lib/librte_eal/common/include/rte_pci.h | 2 ++ lib/librte_ether/rte_ethdev.c | 11 +++++++---- lib/librte_ether/rte_ethdev.h | 9 +++++++-- lib/librte_ether/rte_ethdev_pci.h | 2 ++ 6 files changed, 38 insertions(+), 8 deletions(-) diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini index b1b9114..cafc6c7 100644 --- a/doc/guides/nics/features/default.ini +++ b/doc/guides/nics/features/default.ini @@ -10,6 +10,7 @@ Speed capabilities = Link status = Link status event = +Removal event = Queue status event = Rx interrupt = Free Tx mbuf on demand = diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst index 7c39cd2..fff1c06 100644 --- a/doc/guides/prog_guide/env_abstraction_layer.rst +++ b/doc/guides/prog_guide/env_abstraction_layer.rst @@ -178,8 +178,8 @@ The EAL also allows timed callbacks to be used in the same way as for NIC interr .. note:: - In DPDK PMD, the only interrupts handled by the dedicated host thread are those for link status change, - i.e. link up and link down notification. + In DPDK PMD, the only interrupts handled by the dedicated host thread are those for link status change + (link up and link down notification) and for sudden device removal. + RX Interrupt Event @@ -207,6 +207,23 @@ The eth_dev driver takes responsibility to program the latter mapping. The RX interrupt are controlled/enabled/disabled by ethdev APIs - 'rte_eth_dev_rx_intr_*'. They return failure if the PMD hasn't support them yet. The intr_conf.rxq flag is used to turn on the capability of RX interrupt per device. ++ Device Removal Event + +This event is triggered by a device being removed at a bus level. Its +underlying resources may have been made unavailable (i.e. PCI mappings +unmapped). The PMD must make sure that on such occurrence, the application can +still safely use its callbacks. + +This event can be subscribed to in the same way one would subscribe to a link +status change event. The execution context is thus the same, i.e. it is the +dedicated interrupt host thread. + +Considering this, it is likely that an application would want to close a +device having emitted a Device Removal Event. In such case, calling +``rte_eth_dev_close()`` can trigger it to unregister its own Device Removal Event +callback. Care must be taken not to close the device from the interrupt handler +context. It is necessary to reschedule such closing operation. + Blacklisting ~~~~~~~~~~~~ diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index fedb197..6effb7a 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -239,6 +239,8 @@ struct rte_pci_bus { #define RTE_PCI_DRV_NEED_MAPPING 0x0001 /** Device driver supports link state interrupt */ #define RTE_PCI_DRV_INTR_LSC 0x0008 +/** Device driver supports device removal interrupt */ +#define RTE_PCI_DRV_INTR_RMV 0x0010 /** * A structure describing a PCI mapping. diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 474188c..ed261c2 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -749,16 +749,19 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, return -EINVAL; } - /* - * If link state interrupt is enabled, check that the - * device supports it. - */ + /* Check that the device supports requested interrupts */ if ((dev_conf->intr_conf.lsc == 1) && (!(dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC))) { RTE_PMD_DEBUG_TRACE("driver %s does not support lsc\n", dev->data->drv_name); return -EINVAL; } + if ((dev_conf->intr_conf.rmv == 1) && + (!(dev->data->dev_flags & RTE_ETH_DEV_INTR_RMV))) { + RTE_PMD_DEBUG_TRACE("driver %s does not support rmv\n", + dev->data->drv_name); + return -EINVAL; + } /* * If jumbo frames are enabled, check that the maximum RX packet diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 68a91e2..b8381d6 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -815,9 +815,11 @@ struct rte_eth_udp_tunnel { */ struct rte_intr_conf { /** enable/disable lsc interrupt. 0 (default) - disable, 1 enable */ - uint16_t lsc; + uint32_t lsc:1; /** enable/disable rxq interrupt. 0 (default) - disable, 1 enable */ - uint16_t rxq; + uint32_t rxq:1; + /** enable/disable rmv interrupt. 0 (default) - disable, 1 enable */ + uint32_t rmv:1; }; /** @@ -1737,6 +1739,8 @@ struct rte_eth_dev_data { #define RTE_ETH_DEV_INTR_LSC 0x0002 /** Device is a bonded slave */ #define RTE_ETH_DEV_BONDED_SLAVE 0x0004 +/** Device supports device removal interrupt */ +#define RTE_ETH_DEV_INTR_RMV 0x0008 /** * @internal @@ -3313,6 +3317,7 @@ enum rte_eth_event_type { /**< reset interrupt event, sent to VF on PF reset */ RTE_ETH_EVENT_VF_MBOX, /**< message from the VF received by PF */ RTE_ETH_EVENT_MACSEC, /**< MACsec offload related event */ + RTE_ETH_EVENT_INTR_RMV, /**< device removal event */ RTE_ETH_EVENT_MAX /**< max value of this enum */ }; diff --git a/lib/librte_ether/rte_ethdev_pci.h b/lib/librte_ether/rte_ethdev_pci.h index 2953579..d3bc03c 100644 --- a/lib/librte_ether/rte_ethdev_pci.h +++ b/lib/librte_ether/rte_ethdev_pci.h @@ -64,6 +64,8 @@ rte_eth_copy_pci_info(struct rte_eth_dev *eth_dev, eth_dev->data->dev_flags = 0; if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC) eth_dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC; + if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_RMV) + eth_dev->data->dev_flags |= RTE_ETH_DEV_INTR_RMV; eth_dev->data->kdrv = pci_dev->kdrv; eth_dev->data->numa_node = pci_dev->device.numa_node; -- 2.1.4