Add new API functions to configure and manage VF's on a NIC. add rte_eth_dev_set_vf_vlan_anti_spoof function. add rte_eth_dev_set_vf_mac_anti_spoof function. add rte_eth_dev_set_vf_vlan_stripq function.
Signed-off-by: azelezniak <alexz at att.com> add rte_eth_dev_set_vf_vlan_insert function. add rte_eth_dev_set_loopback function. add rte_eth_dev_set_all_queues_drop function. add rte_eth_dev_set_vf_split_drop_en function add rte_eth_dev_set_vf_mac_addr function. Signed-off-by: Bernard Iremonger <bernard.iremonger at intel.com> --- lib/librte_ether/rte_ethdev.c | 169 ++++++++++++++++++++++++++++ lib/librte_ether/rte_ethdev.h | 195 ++++++++++++++++++++++++++++++++- lib/librte_ether/rte_ether_version.map | 13 +++ 3 files changed, 376 insertions(+), 1 deletion(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 382c959..41d25c7 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -2305,6 +2305,30 @@ rte_eth_dev_default_mac_addr_set(uint8_t port_id, struct ether_addr *addr) } int +rte_eth_dev_set_vf_mac_addr(uint8_t port_id, uint16_t vf, struct ether_addr *addr) +{ + struct rte_eth_dev *dev; + struct rte_eth_dev_info dev_info; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + + if (!is_valid_assigned_ether_addr(addr)) + return -EINVAL; + + dev = &rte_eth_devices[port_id]; + rte_eth_dev_info_get(port_id, &dev_info); + + if (vf >= dev_info.max_vfs) { + RTE_PMD_DEBUG_TRACE("set VF mac addr: invalid VF %d\n", vf); + return -EINVAL; + } + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_mac_addr, -ENOTSUP); + + return (*dev->dev_ops->set_vf_mac_addr)(dev, vf, addr); +} + +int rte_eth_dev_set_vf_rxmode(uint8_t port_id, uint16_t vf, uint16_t rx_mode, uint8_t on) { @@ -2489,6 +2513,151 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id, vf_mask, vlan_on); } +int +rte_eth_dev_set_vf_vlan_anti_spoof(uint8_t port_id, + uint16_t vf, uint8_t on) +{ + struct rte_eth_dev *dev; + struct rte_eth_dev_info dev_info; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + + dev = &rte_eth_devices[port_id]; + rte_eth_dev_info_get(port_id, &dev_info); + + if (vf >= dev_info.max_vfs) { + RTE_PMD_DEBUG_TRACE("set VF VLAN anti spoof: invalid VF %d\n", vf); + return -EINVAL; + } + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_vlan_anti_spoof, -ENOTSUP); + (*dev->dev_ops->set_vf_vlan_anti_spoof)(dev, vf, on); + return 0; +} + +int +rte_eth_dev_set_vf_mac_anti_spoof(uint8_t port_id, + uint16_t vf, uint8_t on) +{ + struct rte_eth_dev *dev; + struct rte_eth_dev_info dev_info; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + + dev = &rte_eth_devices[port_id]; + rte_eth_dev_info_get(port_id, &dev_info); + + if (vf >= dev_info.max_vfs) { + RTE_PMD_DEBUG_TRACE("set VF MAC anti spoof:invalid VF %d\n", vf); + return -EINVAL; + } + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_mac_anti_spoof, -ENOTSUP); + (*dev->dev_ops->set_vf_mac_anti_spoof)(dev, vf, on); + return 0; +} + +int +rte_eth_dev_set_vf_vlan_stripq(uint8_t port_id, uint16_t vf, int on) +{ + struct rte_eth_dev *dev; + struct rte_eth_dev_info dev_info; + uint16_t queues_per_pool; + uint32_t q; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + + dev = &rte_eth_devices[port_id]; + rte_eth_dev_info_get(port_id, &dev_info); + + if (vf >= dev_info.max_vfs) { + RTE_PMD_DEBUG_TRACE("set VF vlan stripq: invalid VF %d\n", vf); + return -EINVAL; + } + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_strip_queue_set, -ENOTSUP); + + queues_per_pool = dev_info.vmdq_queue_num/dev_info.max_vmdq_pools; + + for (q = 0; q < queues_per_pool; q++) + (*dev->dev_ops->vlan_strip_queue_set)(dev, q + vf * queues_per_pool, on); + return 0; +} + +int +rte_eth_dev_set_vf_vlan_insert(uint8_t port_id, uint16_t vf, int on) +{ + struct rte_eth_dev *dev; + struct rte_eth_dev_info dev_info; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + + dev = &rte_eth_devices[port_id]; + rte_eth_dev_info_get(port_id, &dev_info); + + if (vf >= dev_info.max_vfs) { + RTE_PMD_DEBUG_TRACE("set VF vlan insert: invalid VF %d\n", vf); + return -EINVAL; + } + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_vlan_insert, -ENOTSUP); + + (*dev->dev_ops->set_vf_vlan_insert)(dev, vf, on); + return 0; +} + +int +rte_eth_dev_set_tx_loopback(uint8_t port_id, int on) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + + dev = &rte_eth_devices[port_id]; + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_tx_loopback, -ENOTSUP); + + (*dev->dev_ops->set_tx_loopback)(dev, on); + return 0; +} + +int +rte_eth_dev_set_all_queues_drop_en(uint8_t port_id, int state) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + + dev = &rte_eth_devices[port_id]; + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_all_queues_drop_en, -ENOTSUP); + + (*dev->dev_ops->set_all_queues_drop_en)(dev, state); + return 0; +} + +int +rte_eth_dev_set_vf_split_drop_en(uint8_t port_id, uint16_t vf, int state) +{ + struct rte_eth_dev *dev; + struct rte_eth_dev_info dev_info; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + + dev = &rte_eth_devices[port_id]; + rte_eth_dev_info_get(port_id, &dev_info); + + if (vf >= dev_info.max_vfs) { + RTE_PMD_DEBUG_TRACE("set VF split drop enable: invalid VF %d\n", vf); + return -EINVAL; + } + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_split_drop_en, -ENOTSUP); + + (*dev->dev_ops->set_vf_split_drop_en)(dev, vf, state); + return 0; +} + int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx, uint16_t tx_rate) { diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 96575e8..4be4bc7 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1233,6 +1233,11 @@ typedef void (*eth_mac_addr_set_t)(struct rte_eth_dev *dev, struct ether_addr *mac_addr); /**< @internal Set a MAC address into Receive Address Address Register */ +typedef int (*eth_set_vf_mac_addr_t)(struct rte_eth_dev *dev, + uint16_t vf, + struct ether_addr *mac_addr); +/**< @internal Set VF address into Receive Address Address Register */ + typedef int (*eth_uc_hash_table_set_t)(struct rte_eth_dev *dev, struct ether_addr *mac_addr, uint8_t on); @@ -1264,6 +1269,34 @@ typedef int (*eth_set_vf_vlan_filter_t)(struct rte_eth_dev *dev, uint8_t vlan_on); /**< @internal Set VF VLAN pool filter */ +typedef void (*eth_set_vf_vlan_anti_spoof_t)(struct rte_eth_dev *dev, + uint16_t vf, + uint8_t on); +/**< @internal Set VF VLAN anti spoof */ + +typedef void (*eth_set_vf_mac_anti_spoof_t)(struct rte_eth_dev *dev, + uint16_t vf, + uint8_t on); +/**< @internal Set VF MAC anti spoof */ + +typedef void (*eth_set_vf_vlan_insert_t)(struct rte_eth_dev *dev, + uint16_t vf, + int vlan); +/**< @internal Set VF vlan insert */ + +typedef void (*eth_set_tx_loopback_t)(struct rte_eth_dev *dev, + int on); +/**< @internal Set tx loopback */ + +typedef void (*eth_set_all_queues_drop_en_t)(struct rte_eth_dev *dev, + int state); +/**< @internal Set all queues drop */ + +typedef void (*eth_set_vf_split_drop_en_t)(struct rte_eth_dev *dev, + uint16_t vf, + int state); +/**< @internal Set the enable drop bit in the VF split rx control register */ + typedef int (*eth_set_queue_rate_limit_t)(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t tx_rate); @@ -1468,6 +1501,7 @@ struct eth_dev_ops { eth_mac_addr_remove_t mac_addr_remove; /**< Remove MAC address */ eth_mac_addr_add_t mac_addr_add; /**< Add a MAC address */ eth_mac_addr_set_t mac_addr_set; /**< Set a MAC address */ + eth_set_vf_mac_addr_t set_vf_mac_addr; /**< Set a VF MAC address */ eth_uc_hash_table_set_t uc_hash_table_set; /**< Set Unicast Table Array */ eth_uc_all_hash_table_set_t uc_all_hash_table_set; /**< Set Unicast hash bitmap */ eth_mirror_rule_set_t mirror_rule_set; /**< Add a traffic mirror rule.*/ @@ -1476,6 +1510,12 @@ struct eth_dev_ops { eth_set_vf_rx_t set_vf_rx; /**< enable/disable a VF receive */ eth_set_vf_tx_t set_vf_tx; /**< enable/disable a VF transmit */ eth_set_vf_vlan_filter_t set_vf_vlan_filter; /**< Set VF VLAN filter */ + eth_set_vf_vlan_anti_spoof_t set_vf_vlan_anti_spoof; /**< Set VF VLAN anti spoof */ + eth_set_vf_mac_anti_spoof_t set_vf_mac_anti_spoof; /**< Set VF MAC anti spoof */ + eth_set_vf_vlan_insert_t set_vf_vlan_insert; /** <Set VF VLAN insert */ + eth_set_tx_loopback_t set_tx_loopback; /** <Set tx loopback */ + eth_set_all_queues_drop_en_t set_all_queues_drop_en; /** <Set queue drop enable bit */ + eth_set_vf_split_drop_en_t set_vf_split_drop_en; /** <Set split drop enable bit.*/ /** Add UDP tunnel port. */ eth_udp_tunnel_port_add_t udp_tunnel_port_add; /** Del UDP tunnel port. */ @@ -3332,7 +3372,23 @@ int rte_eth_dev_mac_addr_remove(uint8_t port, struct ether_addr *mac_addr); */ int rte_eth_dev_default_mac_addr_set(uint8_t port, struct ether_addr *mac_addr); - +/** + * Set the VF MAC address. + * + * @param port + * The port identifier of the Ethernet device. + * @param vf + * VF id. + * @param mac_addr + * VF MAC address. + * @return + * - (0) if successful, or *mac_addr* didn't exist. + * - (-ENOTSUP) if hardware doesn't support. + * - (-ENODEV) if *port* invalid. + * - (-EINVAL) if MAC address is invalid. + */ +int rte_eth_dev_set_vf_mac_addr(uint8_t port, uint16_t vf, + struct ether_addr *mac_addr); /** * Update Redirection Table(RETA) of Receive Side Scaling of Ethernet device. * @@ -3499,6 +3555,143 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id, uint8_t vlan_on); /** + * Enable/Disable VF VLAN anti spoofing. + * + * @param port + * The port identifier of the Ethernet device. + * @param vf + * VF on which to set VLAN anti spoofing. + * @param vlan_on + * 1 - Enable VFs VLAN anti spoofing. + * 0 - Disable VFs VLAN anti spoofing. + * @return + * - (0) if successful. + * - (-ENOTSUP) if hardware doesn't support. + * - (-ENODEV) if *port* invalid. + * - (-EINVAL) if bad parameter. + */ +int +rte_eth_dev_set_vf_vlan_anti_spoof(uint8_t port, + uint16_t vf, + uint8_t on); + +/** + * Enable/Disable VF MAC anti spoofing. + * + * @param port + * The port identifier of the Ethernet device. + * @param vf + * VF on which to set MAC anti spoofing. + * @param vlan_on + * 1 - Enable VFs MAC anti spoofing. + * 0 - Disable VFs MAC anti spoofing. + * @return + * - (0) if successful. + * - (-ENOTSUP) if hardware doesn't support. + * - (-ENODEV) if *port* invalid. + * - (-EINVAL) if bad parameter. + */ +int +rte_eth_dev_set_vf_mac_anti_spoof(uint8_t port, + uint16_t vf, + uint8_t on); + +/** + * Enable/Disable vf vlan strip for all queues in a pool + * + * @param port + * The port identifier of the Ethernet device. + * @param vf + * ID specifying VF. + * @param on + * 1 - Enable VF's vlan strip on RX queues. + * 0 - Disable VF's vlan strip on RX queues. + * @param queues_per_pool + * The number of queues per pool. + * + * @return + * - (0) if successful. + * - (-ENOTSUP) if hardware doesn't support this feature. + * - (-ENODEV) if *port* invalid. + * - (-EINVAL) if bad parameter. + */ +int +rte_eth_dev_set_vf_vlan_stripq(uint8_t port, uint16_t vf, int on); + +/** + * Enable/Disable vf vlan insert + * + * @param port + * The port identifier of the Ethernet device. + * @param vf + * ID specifying VF. + * @param on + * 1 - Enable VF's vlan insert. + * 0 - Disable VF's vlan insert + * + * @return + * - (0) if successful. + * - (-ENOTSUP) if hardware doesn't support this feature. + * - (-ENODEV) if *port* invalid. + * - (-EINVAL) if bad parameter. + */ +int +rte_eth_dev_set_vf_vlan_insert(uint8_t port, uint16_t vf, int on); + +/** + * Enable/Disable tx loopback + * + * @param port + * The port identifier of the Ethernet device. + * @param on + * 1 - Enable tx loopback. + * 0 - Disable tx loopback. + * + * @return + * - (0) if successful. + * - (-ENOTSUP) if hardware doesn't support this feature. + * - (-ENODEV) if *port* invalid. + * - (-EINVAL) if bad parameter. + */ +int +rte_eth_dev_set_tx_loopback(uint8_t port, int on); +/** + * set all queues drop enable bit + * + * @param port + * The port identifier of the Ethernet device. + * @param state + * 1 - set the queue drop enable bit for all pools. + * 0 - reset the queue drop enable bit for all pools. + * + * @return + * - (0) if successful. + * - (-ENOTSUP) if hardware doesn't support this feature. + * - (-ENODEV) if *port* invalid. + * - (-EINVAL) if bad parameter. + */ +int +rte_eth_dev_set_all_queues_drop_en(uint8_t port, int state); +/** + * set drop enable bit in the VF split rx control register + * + * @param port + * The port identifier of the Ethernet device. + * @param vf + * ID specifying VF. + * @param state + * 1 - set the drop enable bit in the split rx control register. + * 0 - reset the drop enable bit in the split rx control register. + * + * @return + * - (0) if successful. + * - (-ENOTSUP) if hardware doesn't support this feature. + * - (-ENODEV) if *port* invalid. + * - (-EINVAL) if bad parameter. + */ +int +rte_eth_dev_set_vf_split_drop_en(uint8_t port, uint16_t vf, int state); +/** * Set a traffic mirroring rule on an Ethernet device * * @param port_id diff --git a/lib/librte_ether/rte_ether_version.map b/lib/librte_ether/rte_ether_version.map index 45ddf44..4a1c1c7 100644 --- a/lib/librte_ether/rte_ether_version.map +++ b/lib/librte_ether/rte_ether_version.map @@ -139,3 +139,16 @@ DPDK_16.07 { rte_eth_dev_get_port_by_name; rte_eth_xstats_get_names; } DPDK_16.04; + +DPDK_16.11 { + global: + + rte_eth_dev_set_all_queues_drop_en; + rte_eth_dev_set_tx_loopback; + rte_eth_dev_set_vf_mac_addr; + rte_eth_dev_set_vf_mac_anti_spoof; + rte_eth_dev_set_vf_split_drop_en; + rte_eth_dev_set_vf_vlan_anti_spoof; + rte_eth_dev_set_vf_vlan_insert; + rte_eth_dev_set_vf_vlan_stripq; +} DPDK_16.07; -- 2.9.0