From patchwork Fri Aug 25 16:02:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hunt, David" X-Patchwork-Id: 27993 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 3E2417D5E; Fri, 25 Aug 2017 18:02:35 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 206877D0B for ; Fri, 25 Aug 2017 18:02:31 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Aug 2017 09:02:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.41,426,1498546800"; d="scan'208"; a="1188144474" Received: from silpixa00397898.ir.intel.com (HELO silpixa00397898.ger.corp.intel.com) ([10.237.223.116]) by fmsmga001.fm.intel.com with ESMTP; 25 Aug 2017 09:02:24 -0700 From: David Hunt To: dev@dpdk.org Cc: David Hunt , Nemanja Marjanovic , Rory Sexton Date: Fri, 25 Aug 2017 17:02:12 +0100 Message-Id: <1503676941-80981-2-git-send-email-david.hunt@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503676941-80981-1-git-send-email-david.hunt@intel.com> References: <1503676941-80981-1-git-send-email-david.hunt@intel.com> Subject: [dpdk-dev] [PATCH v1 01/10] net/i40e: add API to convert VF Id to PF Id 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" Need a way to convert a vf id to a pf id on the host so as to query the pf for relevant statistics which are used for the frequency changes in the vm_power_manager app. Used when profiles are passed down from the guest to the host, allowing the host to map the vfs to pfs. Signed-off-by: Nemanja Marjanovic Signed-off-by: Rory Sexton Signed-off-by: David Hunt --- drivers/net/i40e/i40e_ethdev.c | 1 + drivers/net/i40e/i40e_rxtx.c | 27 +++++++++++++++++++++++++++ drivers/net/i40e/i40e_rxtx.h | 1 + lib/librte_ether/rte_ethdev.h | 11 +++++++++++ 4 files changed, 40 insertions(+) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 5f26e24..8fb67d8 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -445,6 +445,7 @@ static const struct rte_pci_id pci_id_i40e_map[] = { }; static const struct eth_dev_ops i40e_eth_dev_ops = { + .vfid_to_pfid = i40e_vf_mac_to_vsi, .dev_configure = i40e_dev_configure, .dev_start = i40e_dev_start, .dev_stop = i40e_dev_stop, diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index d42c23c..1379d5e 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -806,6 +806,33 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) return nb_rx; } +uint64_t +i40e_vf_mac_to_vsi(struct rte_eth_dev *dev, uint64_t vfid) { + struct ether_addr *vf_mac_addr = (struct ether_addr *)&vfid; + struct ether_addr *mac; + struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); + int vsi_id = 0, i, x; + struct i40e_pf_vf *vf; + uint16_t vf_num = pf->vf_num; + + for (x = 0; x < vf_num; x++) { + int mac_addr_matches = 1; + vf = &pf->vfs[x]; + mac = &vf->mac_addr; + + for (i = 0; i < ETHER_ADDR_LEN; i++) { + if (mac->addr_bytes[i] != vf_mac_addr->addr_bytes[i]) + mac_addr_matches = 0; + } + if (mac_addr_matches) { + vsi_id = vf->vsi->vsi_id; + return vsi_id; + } + } + + return -1; +} + uint16_t i40e_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h index 20084d6..bc6d355 100644 --- a/drivers/net/i40e/i40e_rxtx.h +++ b/drivers/net/i40e/i40e_rxtx.h @@ -192,6 +192,7 @@ union i40e_tx_offload { }; }; +uint64_t i40e_vf_mac_to_vsi(struct rte_eth_dev *dev, uint64_t vfid); int i40e_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id); int i40e_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id); int i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id); diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 0adf327..fec7e92 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1411,6 +1411,8 @@ typedef int (*eth_l2_tunnel_offload_set_t) uint8_t en); /**< @internal enable/disable the l2 tunnel offload functions */ +typedef uint64_t (*vfid_to_pfid)(struct rte_eth_dev *dev, + uint64_t vfid); typedef int (*eth_filter_ctrl_t)(struct rte_eth_dev *dev, enum rte_filter_type filter_type, @@ -1429,6 +1431,7 @@ typedef int (*eth_get_dcb_info)(struct rte_eth_dev *dev, * @internal A structure containing the functions exported by an Ethernet driver. */ struct eth_dev_ops { + vfid_to_pfid vfid_to_pfid; /**< Convert vfid to pfid */ eth_dev_configure_t dev_configure; /**< Configure device. */ eth_dev_start_t dev_start; /**< Start device. */ eth_dev_stop_t dev_stop; /**< Stop device. */ @@ -2928,6 +2931,14 @@ static inline int rte_eth_tx_descriptor_status(uint8_t port_id, return (*dev->dev_ops->tx_descriptor_status)(txq, offset); } +static inline uint64_t +vfid_to_pfid_direct(uint8_t port_id, uint64_t vfid) +{ + struct rte_eth_dev *dev = &rte_eth_devices[port_id]; + uint64_t pfid = (*dev->dev_ops->vfid_to_pfid)(dev, vfid); + return pfid; +} + /** * Send a burst of output packets on a transmit queue of an Ethernet device. *