#include <rte_memzone.h>
#include <rte_memcpy.h>
#include <rte_string_fns.h>
+#include <rte_ether.h>
#include "vnic_dev.h"
#include "vnic_resource.h"
#include "vnic_devcmd.h"
#include "vnic_nic.h"
#include "vnic_stats.h"
+#include "vnic_flowman.h"
enum vnic_proxy_type {
dma_addr_t stats_pa;
struct vnic_devcmd_fw_info *fw_info;
dma_addr_t fw_info_pa;
+ struct fm_info *flowman_info;
+ dma_addr_t flowman_info_pa;
enum vnic_proxy_type proxy;
u32 proxy_index;
u64 args[VNIC_DEVCMD_NARGS];
void (*free_consistent)(void *priv,
size_t size, void *vaddr,
dma_addr_t dma_handle);
- struct vnic_counter_counts *flow_counters;
- dma_addr_t flow_counters_pa;
- u8 flow_counters_dma_active;
};
#define VNIC_MAX_RES_HDR_SIZE \
sizeof(struct vnic_resource) * RES_TYPE_MAX)
#define VNIC_RES_STRIDE 128
-#define VNIC_MAX_FLOW_COUNTERS 2048
-
void *vnic_dev_priv(struct vnic_dev *vdev)
{
return vdev->priv;
if (!(status & STAT_BUSY)) {
if (status & STAT_ERROR) {
err = -(int)readq(&devcmd->args[0]);
- if (cmd != CMD_CAPABILITY)
+ if (cmd != CMD_CAPABILITY &&
+ cmd != CMD_OVERLAY_OFFLOAD_CTRL &&
+ cmd != CMD_GET_SUPP_FEATURE_VER)
pr_err("Devcmd %d failed " \
"with error code %d\n",
_CMD_N(cmd), err);
int vnic_dev_fw_info(struct vnic_dev *vdev,
struct vnic_devcmd_fw_info **fw_info)
{
- char name[NAME_MAX];
+ char name[RTE_MEMZONE_NAMESIZE];
u64 a0, a1 = 0;
int wait = 1000;
int err = 0;
return (a1 >= (u32)FILTER_DPDK_1);
}
-/* Determine the "best" filtering mode VIC is capaible of. Returns one of 3
+int vnic_dev_flowman_cmd(struct vnic_dev *vdev, u64 *args, int nargs)
+{
+ int wait = 1000;
+
+ return vnic_dev_cmd_args(vdev, CMD_FLOW_MANAGER_OP, args, nargs, wait);
+}
+
+static int vnic_dev_flowman_enable(struct vnic_dev *vdev, u32 *mode,
+ u8 *filter_actions)
+{
+ char name[RTE_MEMZONE_NAMESIZE];
+ u64 args[3];
+ u64 ops;
+ static u32 instance;
+
+ /* flowman devcmd available? */
+ if (!vnic_dev_capable(vdev, CMD_FLOW_MANAGER_OP))
+ return 0;
+ /* Have the version we are using? */
+ args[0] = FM_API_VERSION_QUERY;
+ if (vnic_dev_flowman_cmd(vdev, args, 1))
+ return 0;
+ if ((args[0] & (1ULL << FM_VERSION)) == 0)
+ return 0;
+ /* Select the version */
+ args[0] = FM_API_VERSION_SELECT;
+ args[1] = FM_VERSION;
+ if (vnic_dev_flowman_cmd(vdev, args, 2))
+ return 0;
+ /* Can we get fm_info? */
+ if (!vdev->flowman_info) {
+ snprintf((char *)name, sizeof(name), "vnic_fm_info-%u",
+ instance++);
+ vdev->flowman_info = vdev->alloc_consistent(vdev->priv,
+ sizeof(struct fm_info),
+ &vdev->flowman_info_pa, (u8 *)name);
+ if (!vdev->flowman_info)
+ return 0;
+ }
+ args[0] = FM_INFO_QUERY;
+ args[1] = vdev->flowman_info_pa;
+ args[2] = sizeof(struct fm_info);
+ if (vnic_dev_flowman_cmd(vdev, args, 3))
+ return 0;
+ /* Have required operations? */
+ ops = (1ULL << FMOP_END) |
+ (1ULL << FMOP_DROP) |
+ (1ULL << FMOP_RQ_STEER) |
+ (1ULL << FMOP_EXACT_MATCH) |
+ (1ULL << FMOP_MARK) |
+ (1ULL << FMOP_TAG) |
+ (1ULL << FMOP_EG_HAIRPIN) |
+ (1ULL << FMOP_ENCAP) |
+ (1ULL << FMOP_DECAP_NOSTRIP);
+ if ((vdev->flowman_info->fm_op_mask & ops) != ops)
+ return 0;
+ /* Good to use flowman now */
+ *mode = FILTER_FLOWMAN;
+ *filter_actions = FILTER_ACTION_RQ_STEERING_FLAG |
+ FILTER_ACTION_FILTER_ID_FLAG |
+ FILTER_ACTION_COUNTER_FLAG |
+ FILTER_ACTION_DROP_FLAG;
+ return 1;
+}
+
+/* Determine the "best" filtering mode VIC is capaible of. Returns one of 4
* value or 0 on error:
+ * FILTER_FLOWMAN- flowman api capable
* FILTER_DPDK_1- advanced filters availabile
* FILTER_USNIC_IP_FLAG - advanced filters but with the restriction that
* the IP layer must explicitly specified. I.e. cannot have a UDP
int err;
u32 max_level = 0;
+ /* If flowman is available, use it as it is the most capable API */
+ if (vnic_dev_flowman_enable(vdev, mode, filter_actions))
+ return 0;
+
err = vnic_dev_advanced_filters_cap(vdev, args, 4);
/* determine supported filter actions */
return vnic_dev_cmd(vdev, CMD_STATS_DUMP, &a0, &a1, wait);
}
-/*
- * Configure counter DMA
- */
-int vnic_dev_counter_dma_cfg(struct vnic_dev *vdev, u32 period,
- u32 num_counters)
-{
- u64 args[3];
- int wait = 1000;
- int err;
-
- if (num_counters > VNIC_MAX_FLOW_COUNTERS)
- return -ENOMEM;
- if (period > 0 && (period < VNIC_COUNTER_DMA_MIN_PERIOD ||
- num_counters == 0))
- return -EINVAL;
-
- args[0] = num_counters;
- args[1] = vdev->flow_counters_pa;
- args[2] = period;
- err = vnic_dev_cmd_args(vdev, CMD_COUNTER_DMA_CONFIG, args, 3, wait);
-
- /* record if DMAs need to be stopped on close */
- if (!err)
- vdev->flow_counters_dma_active = (num_counters != 0 &&
- period != 0);
-
- return err;
-}
-
int vnic_dev_close(struct vnic_dev *vdev)
{
u64 a0 = 0, a1 = 0;
int wait = 1000;
int err, i;
- for (i = 0; i < ETH_ALEN; i++)
+ for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
mac_addr[i] = 0;
err = vnic_dev_cmd(vdev, CMD_GET_MAC_ADDR, &a0, &a1, wait);
if (err)
return err;
- for (i = 0; i < ETH_ALEN; i++)
+ for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
mac_addr[i] = ((u8 *)&a0)[i];
return 0;
int err;
int i;
- for (i = 0; i < ETH_ALEN; i++)
+ for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
((u8 *)&a0)[i] = addr[i];
err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
int err;
int i;
- for (i = 0; i < ETH_ALEN; i++)
+ for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
((u8 *)&a0)[i] = addr[i];
err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait);
{
void *notify_addr = NULL;
dma_addr_t notify_pa = 0;
- char name[NAME_MAX];
+ char name[RTE_MEMZONE_NAMESIZE];
static u32 instance;
if (vdev->notify || vdev->notify_pa) {
int vnic_dev_alloc_stats_mem(struct vnic_dev *vdev)
{
- char name[NAME_MAX];
+ char name[RTE_MEMZONE_NAMESIZE];
static u32 instance;
snprintf((char *)name, sizeof(name), "vnic_stats-%u", instance++);
return vdev->stats == NULL ? -ENOMEM : 0;
}
-/*
- * Initialize for up to VNIC_MAX_FLOW_COUNTERS
- */
-int vnic_dev_alloc_counter_mem(struct vnic_dev *vdev)
-{
- char name[NAME_MAX];
- static u32 instance;
-
- snprintf((char *)name, sizeof(name), "vnic_flow_ctrs-%u", instance++);
- vdev->flow_counters = vdev->alloc_consistent(vdev->priv,
- sizeof(struct vnic_counter_counts)
- * VNIC_MAX_FLOW_COUNTERS,
- &vdev->flow_counters_pa,
- (u8 *)name);
- vdev->flow_counters_dma_active = 0;
- return vdev->flow_counters == NULL ? -ENOMEM : 0;
-}
-
void vnic_dev_unregister(struct vnic_dev *vdev)
{
if (vdev) {
vdev->free_consistent(vdev->priv,
sizeof(struct vnic_stats),
vdev->stats, vdev->stats_pa);
- if (vdev->flow_counters) {
- /* turn off counter DMAs before freeing memory */
- if (vdev->flow_counters_dma_active)
- vnic_dev_counter_dma_cfg(vdev, 0, 0);
-
+ if (vdev->flowman_info)
vdev->free_consistent(vdev->priv,
- sizeof(struct vnic_counter_counts)
- * VNIC_MAX_FLOW_COUNTERS,
- vdev->flow_counters, vdev->flow_counters_pa);
- }
+ sizeof(struct fm_info),
+ vdev->flowman_info, vdev->flowman_info_pa);
if (vdev->fw_info)
vdev->free_consistent(vdev->priv,
sizeof(struct vnic_devcmd_fw_info),
unsigned int num_bars)
{
if (!vdev) {
- char name[NAME_MAX];
+ char name[RTE_MEMZONE_NAMESIZE];
snprintf((char *)name, sizeof(name), "%s-vnic",
pdev->device.name);
vdev = (struct vnic_dev *)rte_zmalloc_socket(name,
(FEATURE_VXLAN_IPV6 | FEATURE_VXLAN_MULTI_WQ);
}
-bool vnic_dev_counter_alloc(struct vnic_dev *vdev, uint32_t *idx)
-{
- u64 a0 = 0;
- u64 a1 = 0;
- int wait = 1000;
-
- if (vnic_dev_cmd(vdev, CMD_COUNTER_ALLOC, &a0, &a1, wait))
- return false;
- *idx = (uint32_t)a0;
- return true;
-}
-
-bool vnic_dev_counter_free(struct vnic_dev *vdev, uint32_t idx)
+int vnic_dev_capable_geneve(struct vnic_dev *vdev)
{
- u64 a0 = idx;
+ u64 a0 = VIC_FEATURE_GENEVE;
u64 a1 = 0;
int wait = 1000;
+ int ret;
- return vnic_dev_cmd(vdev, CMD_COUNTER_FREE, &a0, &a1,
- wait) == 0;
-}
-
-bool vnic_dev_counter_query(struct vnic_dev *vdev, uint32_t idx,
- bool reset, uint64_t *packets, uint64_t *bytes)
-{
- u64 a0 = idx;
- u64 a1 = reset ? 1 : 0;
- int wait = 1000;
-
- if (reset) {
- /* query/reset returns updated counters */
- if (vnic_dev_cmd(vdev, CMD_COUNTER_QUERY, &a0, &a1, wait))
- return false;
- *packets = a0;
- *bytes = a1;
- } else {
- /* Get values DMA'd from the adapter */
- *packets = vdev->flow_counters[idx].vcc_packets;
- *bytes = vdev->flow_counters[idx].vcc_bytes;
- }
- return true;
+ ret = vnic_dev_cmd(vdev, CMD_GET_SUPP_FEATURE_VER, &a0, &a1, wait);
+ return ret == 0 && (a1 & FEATURE_GENEVE_OPTIONS);
}