From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9512E46364 for ; Fri, 7 Mar 2025 13:48:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B786402C3; Fri, 7 Mar 2025 13:48:32 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9860C402C3 for ; Fri, 7 Mar 2025 13:48:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741351711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=heA46CLN3QgMRtgLW6bZUV1yWwF4jn0sqxcjk14ItcY=; b=V5tjssIf+XP1/lB4VbyCei3m8PfwJhsTtn8tq1uTm68vu81Ox+Sle4UDDw8vmoWETtFZUS QVAXeMCNzEJPmqCZiD3ikiTljDxIwHr2fjsI4N3capJ8s83J4C4s7U5XknVENkyOCb31TA PqiSmgQRSDZ6JZSJBO0rx1PsYxBlo8s= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-443-PiVnoSzMMJmrCzjFh5uLAg-1; Fri, 07 Mar 2025 07:48:27 -0500 X-MC-Unique: PiVnoSzMMJmrCzjFh5uLAg-1 X-Mimecast-MFC-AGG-ID: PiVnoSzMMJmrCzjFh5uLAg_1741351707 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F20621955D81; Fri, 7 Mar 2025 12:48:26 +0000 (UTC) Received: from rh.Home (unknown [10.45.226.25]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 65A531956095; Fri, 7 Mar 2025 12:48:25 +0000 (UTC) From: Kevin Traynor To: Anatoly Burakov Cc: Bruce Richardson , dpdk stable Subject: patch 'net/ixgbe: fix crashes in secondary processes' has been queued to stable release 24.11.2 Date: Fri, 7 Mar 2025 12:46:57 +0000 Message-ID: <20250307124726.475001-24-ktraynor@redhat.com> In-Reply-To: <20250307124726.475001-1-ktraynor@redhat.com> References: <20250307124726.475001-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 8iDooUT7hfzYGfEyCyZFWXST24MUrDs2tqM0xKik-qc_1741351707 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 24.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/12/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/92c5c5fc42d90ebacf563bef66261dea54bc9528 Thanks. Kevin --- >From 92c5c5fc42d90ebacf563bef66261dea54bc9528 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Mon, 17 Feb 2025 13:54:08 +0000 Subject: [PATCH] net/ixgbe: fix crashes in secondary processes [ upstream commit c092ecb6d1d4cc27eebbcaf43c2ad35c4cfed4e1 ] Currently, the architecture of IXGBE base driver is such that it uses function pointers internally. These are not guaranteed to be valid in secondary processes, which can lead to crashes. This patch prevents IXGBE ethdev driver from calling into these functions. Bugzilla ID: 1575 Fixes: af75078fece3 ("first public release") Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- doc/guides/nics/ixgbe.rst | 14 ++ drivers/net/ixgbe/ixgbe_ethdev.c | 242 +++++++++++++++++++++++++++++++ 2 files changed, 256 insertions(+) diff --git a/doc/guides/nics/ixgbe.rst b/doc/guides/nics/ixgbe.rst index c5c6a6c34b..8dcde7ae1c 100644 --- a/doc/guides/nics/ixgbe.rst +++ b/doc/guides/nics/ixgbe.rst @@ -460,2 +460,16 @@ Show the bypass configuration for a bypass enabled NIC using the lowest port on testpmd> show bypass config (port_id) + + +Secondary Process Support +------------------------- + +IXGBE Physical Function Driver +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Control plane operations are currently not supported in secondary processes. + +IXGBE Virtual Function Driver +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Control plane operations are currently not supported in secondary processes. diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 8bee97d191..509b102eaa 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2631,4 +2631,12 @@ ixgbe_dev_start(struct rte_eth_dev *dev) IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private); + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + PMD_INIT_FUNC_TRACE(); @@ -2919,4 +2927,12 @@ ixgbe_dev_stop(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + ixgbe_dev_wait_setup_link_complete(dev, 0); @@ -2981,4 +2997,13 @@ ixgbe_dev_set_link_up(struct rte_eth_dev *dev) struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + if (hw->mac.type == ixgbe_mac_82599EB) { #ifdef RTE_LIBRTE_IXGBE_BYPASS @@ -3012,4 +3037,13 @@ ixgbe_dev_set_link_down(struct rte_eth_dev *dev) struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + if (hw->mac.type == ixgbe_mac_82599EB) { #ifdef RTE_LIBRTE_IXGBE_BYPASS @@ -3875,4 +3909,12 @@ ixgbe_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size) int ret; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + ixgbe_get_oem_prod_version(hw, &nvm_ver); if (nvm_ver.oem_valid) { @@ -4785,4 +4827,12 @@ ixgbe_dev_led_on(struct rte_eth_dev *dev) struct ixgbe_hw *hw; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); return ixgbe_led_on(hw, 0) == IXGBE_SUCCESS ? 0 : -ENOTSUP; @@ -4794,4 +4844,12 @@ ixgbe_dev_led_off(struct rte_eth_dev *dev) struct ixgbe_hw *hw; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); return ixgbe_led_off(hw, 0) == IXGBE_SUCCESS ? 0 : -ENOTSUP; @@ -4867,4 +4925,12 @@ ixgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) }; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + PMD_INIT_FUNC_TRACE(); @@ -5072,4 +5138,12 @@ ixgbe_priority_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *p }; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + PMD_INIT_FUNC_TRACE(); @@ -5220,4 +5294,12 @@ ixgbe_add_rar(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, uint32_t enable_addr = 1; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + return ixgbe_set_rar(hw, index, mac_addr->addr_bytes, pool, enable_addr); @@ -5229,4 +5311,12 @@ ixgbe_remove_rar(struct rte_eth_dev *dev, uint32_t index) struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return; + ixgbe_clear_rar(hw, index); } @@ -5237,4 +5327,12 @@ ixgbe_set_default_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *addr) struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + ixgbe_remove_rar(dev, 0); ixgbe_add_rar(dev, addr, 0, pci_dev->max_vfs); @@ -5396,4 +5494,12 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) int err, mask = 0; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + PMD_INIT_FUNC_TRACE(); @@ -5499,4 +5605,12 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev) struct rte_intr_handle *intr_handle = pci_dev->intr_handle; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + if (hw->adapter_stopped) return 0; @@ -5614,4 +5728,12 @@ ixgbevf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) int ret = 0; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + PMD_INIT_FUNC_TRACE(); @@ -5842,4 +5964,8 @@ ixgbevf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) uint32_t vec = IXGBE_MISC_VEC_ID; + /* device interrupts are only subscribed to in primary processes */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + if (rte_intr_allow_others(intr_handle)) vec = IXGBE_RX_VEC_START; @@ -5864,4 +5990,8 @@ ixgbevf_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) uint32_t vec = IXGBE_MISC_VEC_ID; + /* device interrupts are only subscribed to in primary processes */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + if (rte_intr_allow_others(intr_handle)) vec = IXGBE_RX_VEC_START; @@ -5884,4 +6014,8 @@ ixgbe_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private); + /* device interrupts are only subscribed to in primary processes */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + if (queue_id < 16) { ixgbe_disable_intr(hw); @@ -5911,4 +6045,8 @@ ixgbe_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private); + /* device interrupts are only subscribed to in primary processes */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + if (queue_id < 16) { ixgbe_disable_intr(hw); @@ -6190,4 +6328,12 @@ ixgbevf_add_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, int diag; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + /* * On a 82599 VF, adding again the same MAC addr is not an idempotent @@ -6216,4 +6362,12 @@ ixgbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index) int diag; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return; + /* * The IXGBE_VF_SET_MACVLAN command of the ixgbe-pf driver does @@ -6256,4 +6410,12 @@ ixgbevf_set_default_mac_addr(struct rte_eth_dev *dev, struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + hw->mac.ops.set_rar(hw, 0, (void *)addr, 0, 0); @@ -6442,4 +6604,12 @@ ixgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) struct rte_eth_dev_data *dev_data = dev->data; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); @@ -6733,4 +6903,12 @@ ixgbe_dev_set_mc_addr_list(struct rte_eth_dev *dev, u8 *mc_addr_list; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); mc_addr_list = (u8 *)mc_addr_set; @@ -7153,4 +7331,12 @@ ixgbe_get_eeprom(struct rte_eth_dev *dev, int first, length; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + first = in_eeprom->offset >> 1; length = in_eeprom->length >> 1; @@ -7173,4 +7359,12 @@ ixgbe_set_eeprom(struct rte_eth_dev *dev, int first, length; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + first = in_eeprom->offset >> 1; length = in_eeprom->length >> 1; @@ -7193,4 +7387,12 @@ ixgbe_get_module_info(struct rte_eth_dev *dev, bool page_swap = false; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + /* Check whether we support SFF-8472 or not */ status = hw->phy.ops.read_i2c_eeprom(hw, @@ -7238,4 +7440,12 @@ ixgbe_get_module_eeprom(struct rte_eth_dev *dev, uint32_t i = 0; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + for (i = info->offset; i < info->offset + info->length; i++) { if (i < RTE_ETH_MODULE_SFF_8079_LEN) @@ -7833,4 +8043,12 @@ ixgbevf_dev_promiscuous_enable(struct rte_eth_dev *dev) int ret; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + switch (hw->mac.ops.update_xcast_mode(hw, IXGBEVF_XCAST_MODE_PROMISC)) { case IXGBE_SUCCESS: @@ -7855,4 +8073,12 @@ ixgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev) int ret; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + if (dev->data->all_multicast) mode = IXGBEVF_XCAST_MODE_ALLMULTI; @@ -7880,4 +8106,12 @@ ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev) int mode = IXGBEVF_XCAST_MODE_ALLMULTI; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + if (dev->data->promiscuous) return 0; @@ -7904,4 +8138,12 @@ ixgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev) int ret; + /* + * This function calls into the base driver, which in turn will use + * function pointers, which are not guaranteed to be valid in secondary + * processes, so avoid using this function in secondary processes. + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -E_RTE_SECONDARY; + if (dev->data->promiscuous) return 0; -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-07 11:02:57.790550014 +0000 +++ 0024-net-ixgbe-fix-crashes-in-secondary-processes.patch 2025-03-07 11:02:56.875335721 +0000 @@ -1 +1 @@ -From c092ecb6d1d4cc27eebbcaf43c2ad35c4cfed4e1 Mon Sep 17 00:00:00 2001 +From 92c5c5fc42d90ebacf563bef66261dea54bc9528 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c092ecb6d1d4cc27eebbcaf43c2ad35c4cfed4e1 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18,2 +19,2 @@ - doc/guides/nics/ixgbe.rst | 14 ++ - drivers/net/intel/ixgbe/ixgbe_ethdev.c | 242 +++++++++++++++++++++++++ + doc/guides/nics/ixgbe.rst | 14 ++ + drivers/net/ixgbe/ixgbe_ethdev.c | 242 +++++++++++++++++++++++++++++++ @@ -43,4 +44,4 @@ -diff --git a/drivers/net/intel/ixgbe/ixgbe_ethdev.c b/drivers/net/intel/ixgbe/ixgbe_ethdev.c -index 6cb25778cc..b80d5894f8 100644 ---- a/drivers/net/intel/ixgbe/ixgbe_ethdev.c -+++ b/drivers/net/intel/ixgbe/ixgbe_ethdev.c +diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c +index 8bee97d191..509b102eaa 100644 +--- a/drivers/net/ixgbe/ixgbe_ethdev.c ++++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -101 +102 @@ -@@ -3880,4 +3914,12 @@ ixgbe_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size) +@@ -3875,4 +3909,12 @@ ixgbe_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size) @@ -114 +115 @@ -@@ -4790,4 +4832,12 @@ ixgbe_dev_led_on(struct rte_eth_dev *dev) +@@ -4785,4 +4827,12 @@ ixgbe_dev_led_on(struct rte_eth_dev *dev) @@ -127 +128 @@ -@@ -4799,4 +4849,12 @@ ixgbe_dev_led_off(struct rte_eth_dev *dev) +@@ -4794,4 +4844,12 @@ ixgbe_dev_led_off(struct rte_eth_dev *dev) @@ -140 +141 @@ -@@ -4872,4 +4930,12 @@ ixgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) +@@ -4867,4 +4925,12 @@ ixgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) @@ -153 +154 @@ -@@ -5077,4 +5143,12 @@ ixgbe_priority_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *p +@@ -5072,4 +5138,12 @@ ixgbe_priority_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *p @@ -166 +167 @@ -@@ -5225,4 +5299,12 @@ ixgbe_add_rar(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, +@@ -5220,4 +5294,12 @@ ixgbe_add_rar(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, @@ -179 +180 @@ -@@ -5234,4 +5316,12 @@ ixgbe_remove_rar(struct rte_eth_dev *dev, uint32_t index) +@@ -5229,4 +5311,12 @@ ixgbe_remove_rar(struct rte_eth_dev *dev, uint32_t index) @@ -192 +193 @@ -@@ -5242,4 +5332,12 @@ ixgbe_set_default_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *addr) +@@ -5237,4 +5327,12 @@ ixgbe_set_default_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *addr) @@ -205 +206 @@ -@@ -5401,4 +5499,12 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) +@@ -5396,4 +5494,12 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) @@ -218 +219 @@ -@@ -5504,4 +5610,12 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev) +@@ -5499,4 +5605,12 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev) @@ -231 +232 @@ -@@ -5619,4 +5733,12 @@ ixgbevf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) +@@ -5614,4 +5728,12 @@ ixgbevf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) @@ -244 +245 @@ -@@ -5847,4 +5969,8 @@ ixgbevf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) +@@ -5842,4 +5964,8 @@ ixgbevf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) @@ -253 +254 @@ -@@ -5869,4 +5995,8 @@ ixgbevf_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) +@@ -5864,4 +5990,8 @@ ixgbevf_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) @@ -262 +263 @@ -@@ -5889,4 +6019,8 @@ ixgbe_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) +@@ -5884,4 +6014,8 @@ ixgbe_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) @@ -271 +272 @@ -@@ -5916,4 +6050,8 @@ ixgbe_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) +@@ -5911,4 +6045,8 @@ ixgbe_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) @@ -280 +281 @@ -@@ -6195,4 +6333,12 @@ ixgbevf_add_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, +@@ -6190,4 +6328,12 @@ ixgbevf_add_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, @@ -293 +294 @@ -@@ -6221,4 +6367,12 @@ ixgbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index) +@@ -6216,4 +6362,12 @@ ixgbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index) @@ -306 +307 @@ -@@ -6261,4 +6415,12 @@ ixgbevf_set_default_mac_addr(struct rte_eth_dev *dev, +@@ -6256,4 +6410,12 @@ ixgbevf_set_default_mac_addr(struct rte_eth_dev *dev, @@ -319 +320 @@ -@@ -6447,4 +6609,12 @@ ixgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) +@@ -6442,4 +6604,12 @@ ixgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) @@ -332 +333 @@ -@@ -6738,4 +6908,12 @@ ixgbe_dev_set_mc_addr_list(struct rte_eth_dev *dev, +@@ -6733,4 +6903,12 @@ ixgbe_dev_set_mc_addr_list(struct rte_eth_dev *dev, @@ -345 +346 @@ -@@ -7158,4 +7336,12 @@ ixgbe_get_eeprom(struct rte_eth_dev *dev, +@@ -7153,4 +7331,12 @@ ixgbe_get_eeprom(struct rte_eth_dev *dev, @@ -358 +359 @@ -@@ -7178,4 +7364,12 @@ ixgbe_set_eeprom(struct rte_eth_dev *dev, +@@ -7173,4 +7359,12 @@ ixgbe_set_eeprom(struct rte_eth_dev *dev, @@ -371 +372 @@ -@@ -7198,4 +7392,12 @@ ixgbe_get_module_info(struct rte_eth_dev *dev, +@@ -7193,4 +7387,12 @@ ixgbe_get_module_info(struct rte_eth_dev *dev, @@ -384 +385 @@ -@@ -7243,4 +7445,12 @@ ixgbe_get_module_eeprom(struct rte_eth_dev *dev, +@@ -7238,4 +7440,12 @@ ixgbe_get_module_eeprom(struct rte_eth_dev *dev, @@ -397 +398 @@ -@@ -7838,4 +8048,12 @@ ixgbevf_dev_promiscuous_enable(struct rte_eth_dev *dev) +@@ -7833,4 +8043,12 @@ ixgbevf_dev_promiscuous_enable(struct rte_eth_dev *dev) @@ -410 +411 @@ -@@ -7860,4 +8078,12 @@ ixgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev) +@@ -7855,4 +8073,12 @@ ixgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev) @@ -423 +424 @@ -@@ -7885,4 +8111,12 @@ ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev) +@@ -7880,4 +8106,12 @@ ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev) @@ -436 +437 @@ -@@ -7909,4 +8143,12 @@ ixgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev) +@@ -7904,4 +8138,12 @@ ixgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)