From patchwork Thu Mar 30 09:34:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao1, Wei" X-Patchwork-Id: 22888 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id C528610F59; Thu, 30 Mar 2017 12:31:01 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 05ACAFB6A for ; Thu, 30 Mar 2017 11:40:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1490866844; x=1522402844; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=gruLhPCr08yEjAgNzwDKgZBSejZQmoyQb//FUCwn7Zw=; b=lqCcw8hl5QGWSw7zC5xUnHsFpX4xKCc0xtHncteJWV+4ccyiRbsp34mL x0BzaKyR9zbFwWrkw6rf2MXKNcJRxQ==; Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Mar 2017 02:40:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.36,246,1486454400"; d="scan'208"; a="1128842259" Received: from dpdk1.bj.intel.com ([172.16.182.84]) by fmsmga001.fm.intel.com with ESMTP; 30 Mar 2017 02:40:41 -0700 From: Wei Zhao To: dev@dpdk.org Cc: Wei Zhao , Wenzhuo Lu Date: Thu, 30 Mar 2017 17:34:15 +0800 Message-Id: <1490866456-52241-3-git-send-email-wei.zhao1@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1490866456-52241-1-git-send-email-wei.zhao1@intel.com> References: <1490866456-52241-1-git-send-email-wei.zhao1@intel.com> Subject: [dpdk-dev] [PATCH v4 2/3] net/i40e: implement device reset on port 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" This patch implement the device reset function on vf port. This restart function will detach device then attach device, reconfigure dev, re-setup the Rx/Tx queues. Signed-off-by: Wei Zhao Signed-off-by: Wenzhuo Lu --- drivers/net/i40e/i40e_ethdev.c | 2 +- drivers/net/i40e/i40e_ethdev.h | 16 ++++ drivers/net/i40e/i40e_ethdev_vf.c | 185 ++++++++++++++++++++++++++++++++++++++ drivers/net/i40e/i40e_rxtx.c | 10 +++ drivers/net/i40e/i40e_rxtx.h | 4 + 5 files changed, 216 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 3702214..f2fdb2f 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -6020,7 +6020,7 @@ i40e_find_vlan_filter(struct i40e_vsi *vsi, return 0; } -static void +void i40e_store_vlan_filter(struct i40e_vsi *vsi, uint16_t vlan_id, bool on) { diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h index aebb097..515a288 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h @@ -652,6 +652,16 @@ struct i40e_vf_tx_queues { uint32_t tx_ring_len; }; +struct i40e_vf_reset_store { + struct ether_addr *mac_addrs; /* Device Ethernet Link address. */ + bool promisc_unicast_enabled; + bool promisc_multicast_enabled; + uint16_t vlan_num; /* Total VLAN number */ + uint32_t vfta[I40E_VFTA_SIZE]; /* VLAN bitmap */ + uint16_t mac_num; /* Total mac number */ +}; + + /* * Structure to store private data specific for VF instance. */ @@ -709,6 +719,10 @@ struct i40e_adapter { struct rte_timecounter systime_tc; struct rte_timecounter rx_tstamp_tc; struct rte_timecounter tx_tstamp_tc; + + /* For port reset */ + volatile uint8_t reset_flag; + void *reset_store_data; }; extern const struct rte_flow_ops i40e_flow_ops; @@ -749,6 +763,8 @@ int i40e_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete); void i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi); void i40e_vsi_queues_unbind_intr(struct i40e_vsi *vsi); +void i40e_store_vlan_filter(struct i40e_vsi *vsi, + uint16_t vlan_id, bool on); int i40e_vsi_vlan_pvid_set(struct i40e_vsi *vsi, struct i40e_vsi_vlan_pvid_info *info); int i40e_vsi_config_vlan_stripping(struct i40e_vsi *vsi, bool on); diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 55fd344..9ab035c 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -161,6 +161,9 @@ i40evf_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id); static void i40evf_handle_pf_event(__rte_unused struct rte_eth_dev *dev, uint8_t *msg, uint16_t msglen); +static int i40evf_dev_uninit(struct rte_eth_dev *eth_dev); +static int i40evf_dev_init(struct rte_eth_dev *eth_dev); +static int i40evf_reset_dev(struct rte_eth_dev *dev); /* Default hash key buffer for RSS */ static uint32_t rss_key_default[I40E_VFQF_HKEY_MAX_INDEX + 1]; @@ -230,6 +233,7 @@ static const struct eth_dev_ops i40evf_eth_dev_ops = { .rss_hash_conf_get = i40evf_dev_rss_hash_conf_get, .mtu_set = i40evf_dev_mtu_set, .mac_addr_set = i40evf_set_default_mac_addr, + .dev_reset = i40evf_reset_dev, }; /* @@ -889,6 +893,7 @@ i40evf_add_mac_addr(struct rte_eth_dev *dev, PMD_DRV_LOG(ERR, "fail to execute command " "OP_ADD_ETHER_ADDRESS"); + vf->vsi.mac_num++; return; } @@ -926,6 +931,7 @@ i40evf_del_mac_addr_by_addr(struct rte_eth_dev *dev, if (err) PMD_DRV_LOG(ERR, "fail to execute command " "OP_DEL_ETHER_ADDRESS"); + vf->vsi.mac_num--; return; } @@ -1047,6 +1053,7 @@ static int i40evf_add_vlan(struct rte_eth_dev *dev, uint16_t vlanid) { struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); + struct i40e_vsi *vsi = &vf->vsi; struct i40e_virtchnl_vlan_filter_list *vlan_list; uint8_t cmd_buffer[sizeof(struct i40e_virtchnl_vlan_filter_list) + sizeof(uint16_t)]; @@ -1066,6 +1073,8 @@ i40evf_add_vlan(struct rte_eth_dev *dev, uint16_t vlanid) err = i40evf_execute_vf_cmd(dev, &args); if (err) PMD_DRV_LOG(ERR, "fail to execute command OP_ADD_VLAN"); + i40e_store_vlan_filter(vsi, vlanid, 1); + vsi->vlan_num++; return err; } @@ -1074,6 +1083,7 @@ static int i40evf_del_vlan(struct rte_eth_dev *dev, uint16_t vlanid) { struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); + struct i40e_vsi *vsi = &vf->vsi; struct i40e_virtchnl_vlan_filter_list *vlan_list; uint8_t cmd_buffer[sizeof(struct i40e_virtchnl_vlan_filter_list) + sizeof(uint16_t)]; @@ -1093,6 +1103,8 @@ i40evf_del_vlan(struct rte_eth_dev *dev, uint16_t vlanid) err = i40evf_execute_vf_cmd(dev, &args); if (err) PMD_DRV_LOG(ERR, "fail to execute command OP_DEL_VLAN"); + i40e_store_vlan_filter(vsi, vlanid, 0); + vsi->vlan_num--; return err; } @@ -2716,3 +2728,176 @@ i40evf_set_default_mac_addr(struct rte_eth_dev *dev, i40evf_add_mac_addr(dev, mac_addr, 0, 0); } + +static void +i40evf_restore_vlan_filter(struct rte_eth_dev *dev, + uint32_t *vfta) +{ + uint32_t vid_idx, vid_bit; + uint16_t vlan_id; + + for (vid_idx = 0; vid_idx < I40E_VFTA_SIZE; vid_idx++) { + for (vid_bit = 0; vid_bit < I40E_UINT32_BIT_SIZE; vid_bit++) { + if (vfta[vid_idx] & (1 << vid_bit)) { + vlan_id = (vid_idx << 5) + vid_bit; + i40evf_add_vlan(dev, vlan_id); + } + } + } +} + +static void +i40evf_restore_macaddr(struct rte_eth_dev *dev, + struct ether_addr *mac_addrs) +{ + struct ether_addr *addr; + uint16_t i; + + /* replay MAC address configuration including default MAC */ + addr = &mac_addrs[0]; + + i40evf_set_default_mac_addr(dev, addr); + memcpy(dev->data->mac_addrs, mac_addrs, + ETHER_ADDR_LEN * I40E_NUM_MACADDR_MAX); + + for (i = 1; i < I40E_NUM_MACADDR_MAX; i++) { + addr = &mac_addrs[i]; + + /* skip zero address */ + if (is_zero_ether_addr(addr)) + continue; + + i40evf_add_mac_addr(dev, addr, 0, 0); + } +} + + +static void +i40e_vf_queue_reset(struct rte_eth_dev *dev) +{ + uint16_t i; + + for (i = 0; i < dev->data->nb_rx_queues; i++) { + struct i40e_rx_queue *rxq = dev->data->rx_queues[i]; + + if (rxq->q_set) { + i40e_dev_rx_queue_setup(dev, + rxq->queue_id, + rxq->nb_rx_desc, + rxq->socket_id, + &rxq->rxconf, + rxq->mp); + } + } + for (i = 0; i < dev->data->nb_tx_queues; i++) { + struct i40e_tx_queue *txq = dev->data->tx_queues[i]; + + if (txq->q_set) { + i40e_dev_tx_queue_setup(dev, + txq->queue_id, + txq->nb_tx_desc, + txq->socket_id, + &txq->txconf); + } + } +} + +static int +i40evf_store_before_reset(struct rte_eth_dev *dev) +{ + struct i40e_adapter *adapter = + I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + struct i40e_vf_reset_store *store_data; + struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); + + adapter->reset_store_data = rte_zmalloc("i40evf_store_reset", + sizeof(struct i40e_vf_reset_store), 0); + if (adapter->reset_store_data == NULL) { + PMD_INIT_LOG(ERR, "Failed to allocate %ld bytes needed to" + " to store data when reset vf", + sizeof(struct i40e_vf_reset_store)); + return -ENOMEM; + } + store_data = + (struct i40e_vf_reset_store *)adapter->reset_store_data; + store_data->mac_addrs = rte_zmalloc("i40evf_mac_store_reset", + ETHER_ADDR_LEN * I40E_NUM_MACADDR_MAX, 0); + if (store_data->mac_addrs == NULL) { + PMD_INIT_LOG(ERR, "Failed to allocate %d bytes needed to" + " to store MAC addresses when reset vf", + ETHER_ADDR_LEN * I40E_NUM_MACADDR_MAX); + } + + memcpy(store_data->mac_addrs, dev->data->mac_addrs, + ETHER_ADDR_LEN * I40E_NUM_MACADDR_MAX); + + store_data->promisc_unicast_enabled = vf->promisc_unicast_enabled; + store_data->promisc_multicast_enabled = vf->promisc_multicast_enabled; + + store_data->vlan_num = vf->vsi.vlan_num; + memcpy(store_data->vfta, vf->vsi.vfta, + sizeof(uint32_t) * I40E_VFTA_SIZE); + + store_data->mac_num = vf->vsi.mac_num; + + return 0; +} + +static void +i40evf_restore_after_reset(struct rte_eth_dev *dev) +{ + struct i40e_adapter *adapter = + I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + struct i40e_vf_reset_store *store_data = + (struct i40e_vf_reset_store *)adapter->reset_store_data; + + if (store_data->promisc_unicast_enabled) + i40evf_dev_promiscuous_enable(dev); + if (store_data->promisc_multicast_enabled) + i40evf_dev_allmulticast_enable(dev); + + if (store_data->vlan_num) + i40evf_restore_vlan_filter(dev, store_data->vfta); + + if (store_data->mac_num) + i40evf_restore_macaddr(dev, store_data->mac_addrs); + + rte_free(store_data->mac_addrs); + rte_free(adapter->reset_store_data); +} + +static int +i40evf_reset_dev(struct rte_eth_dev *dev) +{ + struct i40e_adapter *adapter = + I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + + adapter->reset_flag = 1; + i40evf_store_before_reset(dev); + + i40evf_dev_close(dev); + PMD_DRV_LOG(DEBUG, "i40evf dev close complete"); + + i40evf_dev_uninit(dev); + PMD_DRV_LOG(DEBUG, "i40evf dev detached"); + + memset(dev->data->dev_private, 0, + (uint64_t)&adapter->reset_flag - (uint64_t)adapter); + + i40evf_dev_init(dev); + PMD_DRV_LOG(DEBUG, "i40evf dev attached"); + + i40evf_dev_configure(dev); + + i40e_vf_queue_reset(dev); + PMD_DRV_LOG(DEBUG, "i40evf queue reset"); + + i40evf_restore_after_reset(dev); + + i40evf_dev_start(dev); + PMD_DRV_LOG(DEBUG, "i40evf dev restart"); + + adapter->reset_flag = 0; + + return 0; +} diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 02367b7..d891a54 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -1709,6 +1709,7 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t len, i; uint16_t base, bsf, tc_mapping; int use_def_burst_func = 1; + struct rte_eth_rxconf conf = *rx_conf; if (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF) { struct i40e_vf *vf = @@ -1748,6 +1749,8 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev, } rxq->mp = mp; rxq->nb_rx_desc = nb_desc; + rxq->socket_id = socket_id; + rxq->rxconf = conf; rxq->rx_free_thresh = rx_conf->rx_free_thresh; rxq->queue_id = queue_idx; if (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF) @@ -1932,6 +1935,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev, uint32_t ring_size; uint16_t tx_rs_thresh, tx_free_thresh; uint16_t i, base, bsf, tc_mapping; + struct rte_eth_txconf conf = *tx_conf; if (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF) { struct i40e_vf *vf = @@ -2054,6 +2058,8 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev, } txq->nb_tx_desc = nb_desc; + txq->socket_id = socket_id; + txq->txconf = conf; txq->tx_rs_thresh = tx_rs_thresh; txq->tx_free_thresh = tx_free_thresh; txq->pthresh = tx_conf->tx_thresh.pthresh; @@ -2520,8 +2526,12 @@ void i40e_dev_free_queues(struct rte_eth_dev *dev) { uint16_t i; + struct i40e_adapter *adapter = + I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); PMD_INIT_FUNC_TRACE(); + if (adapter->reset_flag) + return; for (i = 0; i < dev->data->nb_rx_queues; i++) { if (!dev->data->rx_queues[i]) diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h index a87bdb0..0e3cc19 100644 --- a/drivers/net/i40e/i40e_rxtx.h +++ b/drivers/net/i40e/i40e_rxtx.h @@ -136,6 +136,8 @@ struct i40e_rx_queue { bool rx_deferred_start; /**< don't start this queue in dev start */ uint16_t rx_using_sse; /**