From patchwork Thu Jan 28 08:40:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Helin" X-Patchwork-Id: 10167 X-Patchwork-Delegate: bruce.richardson@intel.com 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 DF78CC3B2; Thu, 28 Jan 2016 09:40:33 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 9899AC3A6 for ; Thu, 28 Jan 2016 09:40:32 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 28 Jan 2016 00:40:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,357,1449561600"; d="scan'208";a="642672952" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by FMSMGA003.fm.intel.com with ESMTP; 28 Jan 2016 00:40:33 -0800 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id u0S8eSWZ003550; Thu, 28 Jan 2016 16:40:28 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id u0S8eQf3015390; Thu, 28 Jan 2016 16:40:28 +0800 Received: (from hzhan75@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id u0S8eQ6N015386; Thu, 28 Jan 2016 16:40:26 +0800 From: Helin Zhang To: dev@dpdk.org Date: Thu, 28 Jan 2016 16:40:21 +0800 Message-Id: <1453970423-15234-2-git-send-email-helin.zhang@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1453970423-15234-1-git-send-email-helin.zhang@intel.com> References: <1453970423-15234-1-git-send-email-helin.zhang@intel.com> Subject: [dpdk-dev] [PATCH 1/3] i40e: add setting VF MAC address in DPDK PF host 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" It adds pre-setting the VF MAC addresses from DPDK PF host side before any VF being initialized, by introducing a new element of 'struct rte_vf_conf' in 'struct rte_eth_conf'. It supports up to 128 VFs per physical port of setting VF MAC addresses. Signed-off-by: Helin Zhang --- doc/guides/rel_notes/release_2_3.rst | 9 +++++++++ drivers/net/i40e/i40e_ethdev.c | 21 +++++++++++++++++++++ drivers/net/i40e/i40e_ethdev.h | 1 + drivers/net/i40e/i40e_pf.c | 2 ++ lib/librte_ether/rte_ethdev.h | 10 ++++++++++ 5 files changed, 43 insertions(+) diff --git a/doc/guides/rel_notes/release_2_3.rst b/doc/guides/rel_notes/release_2_3.rst index 99de186..8ba3594 100644 --- a/doc/guides/rel_notes/release_2_3.rst +++ b/doc/guides/rel_notes/release_2_3.rst @@ -4,6 +4,11 @@ DPDK Release 2.3 New Features ------------ +* **Added setting default MAC address for i40e VF.** + + Added setting default MAC address for i40e VF before in PF host + driver, by providing those MAC addresses in PF port configuration. + Resolved Issues --------------- @@ -39,6 +44,10 @@ API Changes ABI Changes ----------- +* The ethdev structure of ``rte_eth_dev``, ``rte_eth_dev_data`` and + ``rte_eth_conf`` were changed to support setting default MAC address + for i40e VF, by DPDK PF host. + Shared Library Versions ----------------------- diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index bf6220d..f7cec39 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -1020,6 +1020,7 @@ i40e_dev_configure(struct rte_eth_dev *dev) I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); enum rte_eth_rx_mq_mode mq_mode = dev->data->dev_conf.rxmode.mq_mode; + struct ether_addr *p_mac_addr; int i, ret; /* Initialize to TRUE. If any of Rx queues doesn't meet the @@ -1074,6 +1075,26 @@ i40e_dev_configure(struct rte_eth_dev *dev) } } + /* Store the configured VF MAC address */ + for (i = 0; i < RTE_MIN(pf->vf_num, ETH_VF_NUM_MAX); i++) { + p_mac_addr = &(dev->data->dev_conf.vf_conf[i].mac_addr); + if (is_valid_assigned_ether_addr(p_mac_addr)) { + ether_addr_copy(p_mac_addr, &(pf->vfs[i].mac_addr)); + PMD_DRV_LOG(INFO, "MAC address " + "%02x:%02x:%02x:%02x:%02x:%02x will be " + "used as default address of VF[%d]", + p_mac_addr->addr_bytes[0], + p_mac_addr->addr_bytes[1], + p_mac_addr->addr_bytes[2], + p_mac_addr->addr_bytes[3], + p_mac_addr->addr_bytes[4], + p_mac_addr->addr_bytes[5], i); + } else { + PMD_DRV_LOG(WARNING, "Invalid MAC address configured " + "for VF[%d], use zero instead", i); + } + } + return 0; err_dcb: diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h index 1f9792b..66aad4d 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h @@ -312,6 +312,7 @@ struct i40e_pf_vf { uint16_t vf_idx; /* VF index in pf->vfs */ uint16_t lan_nb_qps; /* Actual queues allocated */ uint16_t reset_cnt; /* Total vf reset times */ + struct ether_addr mac_addr; /* Default MAC address */ }; /* diff --git a/drivers/net/i40e/i40e_pf.c b/drivers/net/i40e/i40e_pf.c index cbf4e5b..be7cbf7 100644 --- a/drivers/net/i40e/i40e_pf.c +++ b/drivers/net/i40e/i40e_pf.c @@ -315,6 +315,8 @@ i40e_pf_host_process_cmd_get_vf_resource(struct i40e_pf_vf *vf) /* As assume Vf only has single VSI now, always return 0 */ vf_res->vsi_res[0].vsi_id = 0; vf_res->vsi_res[0].num_queue_pairs = vf->vsi->nb_qps; + ether_addr_copy(&vf->mac_addr, + (struct ether_addr *)vf_res->vsi_res[0].default_mac_addr); send_msg: i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_GET_VF_RESOURCES, diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index bada8ad..88f1d9b 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -754,6 +754,15 @@ struct rte_intr_conf { uint16_t rxq; }; +#define ETH_VF_NUM_MAX 128 /* Maximum number of Virtual Functions supported */ + +/** + * A structure to define VF configurations to be used in PF host driver. + */ +struct rte_vf_conf { + struct ether_addr mac_addr; /* Pre-configured VF MAC address. */ +}; + /** * A structure used to configure an Ethernet port. * Depending upon the RX multi-queue mode, extra advanced @@ -793,6 +802,7 @@ struct rte_eth_conf { uint32_t dcb_capability_en; struct rte_fdir_conf fdir_conf; /**< FDIR configuration. */ struct rte_intr_conf intr_conf; /**< Interrupt mode configuration. */ + struct rte_vf_conf vf_conf[ETH_VF_NUM_MAX]; /**< VF configuration. */ }; /**