/******************************************************************************
*
-* Copyright (c) 2019 Intel.
+* Copyright (c) 2020 Intel.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
*******************************************************************************/
-
/**
* @brief This file has all definitions for the Ethernet Data Interface Layer
* @file ethdi.h
extern "C" {
#endif
+#include <unistd.h>
+
#include <rte_config.h>
#include <rte_mbuf.h>
+#include <rte_flow.h>
#include <rte_timer.h>
-#include "ethernet.h"
+/* comment this to enable PDUMP
+ * DPDK has to be compiled with
+ * CONFIG_RTE_LIBRTE_PMD_PCAP=y
+ * CONFIG_RTE_LIBRTE_PDUMP=y
+ */
+#undef RTE_LIBRTE_PDUMP
-#define XRAN_THREAD_DEFAULT_PRIO (98)
+#ifdef RTE_LIBRTE_PDUMP
+#include <rte_pdump.h>
+#endif
-/* How often to ping? */
-#define PING_INTERVAL 300 /* (us) */
-#define PING_BUSY_POLL 50 /* (us) how long to actively wait for response */
+#include "ethernet.h"
+#include "xran_transport.h"
+#include "xran_fh_o_du.h"
-/* If we're not receiving packets for more then this threshold... */
-//#define SLEEP_THRESHOLD (rte_get_tsc_hz() / 30) /* = 33.3(3)ms */
-/* we go to sleep for this long (usleep). Undef SLEEP_TRESHOLD to disable. */
-#define SLEEP_TIME 200 /* (us) */
-#define BCAST {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
+#define XRAN_THREAD_DEFAULT_PRIO (98)
+#define XRAN_MAX_WORKERS 6 /**< max number of worker cores */
#define TX_TIMER_INTERVAL ((rte_get_timer_hz() / 1000000000L)*interval_us*1000) /* nanosec */
-#define TX_RX_LOOP_TIME rte_get_timer_hz() / 1
-
-extern enum xran_if_state xran_if_current_state;
-
-enum xran_if_state
-{
- XRAN_RUNNING,
- XRAN_STOPPED
-};
-
-enum xran_ping_states
-{
- PING_IDLE,
- PING_NEEDED,
- AWAITING_PONG
-};
-
-enum xran_ethdi_vf_ports
-{
- ETHDI_UP_VF = 0,
- ETHDI_CP_VF,
- ETHDI_VF_MAX
-};
+#define TX_RX_LOOP_TIME (rte_get_timer_hz() / 1)
-struct xran_io_loop_cfg
-{
- uint8_t id;
- char *dpdk_dev[ETHDI_VF_MAX];
- int core;
- int system_core; /* Needed as DPDK will change your starting core. */
- int pkt_proc_core; /* Needed for packet processing thread. */
- int pkt_aux_core; /* Needed for packet dumping for debug purposes. */
- int timing_core; /* Needed for getting precise time */
- int port[ETHDI_VF_MAX]; /* This is auto-detected, no need to set. */
-};
+typedef uint8_t lcoreid_t;
+typedef uint16_t portid_t;
+typedef uint16_t queueid_t;
+typedef uint16_t streamid_t;
/* CAUTION: Keep in sync with the string table below. */
enum xran_entities_id
{
- ID_LLS_CU,
- ID_RU,
- ID_BROADCAST,
+ ID_O_DU,
+ ID_O_RU,
ID_MAX
};
static char *const entity_names[] = {
- "xRAN lls-CU sim app",
- "xRAN RU sim app",
+ "ORAN O-DU sim app",
+ "ORAN O-RU sim app"
};
typedef int (*PROCESS_CB)(void * arg);
-struct xran_ethdi_ctx
-{
- struct xran_io_loop_cfg io_cfg;
- struct ether_addr entities[ID_BROADCAST + 1];
- uint8_t ping_state;
- int ping_times;
- int known_peers;
-
- struct rte_ring *tx_ring[ETHDI_VF_MAX];
- struct rte_ring *rx_ring[ETHDI_VF_MAX];
- struct rte_ring *pkt_dump_ring[ETHDI_VF_MAX];
- struct rte_timer timer_autodetect;
- struct rte_timer timer_ping;
- struct rte_timer timer_sync;
- struct rte_timer timer_tx;
-
- uint64_t busy_poll_till;
-
- unsigned pkt_stats[PKT_LAST + 1];
-
- uint16_t cp_vtag;
- uint16_t up_vtag;
+extern queueid_t nb_rxq; /**< Number of RX queues per port. */
+extern queueid_t nb_txq; /**< Number of TX queues per port. */
+
+/**
+ * Structure storing internal configuration of workers
+ */
+struct xran_worker_config {
+ lcore_function_t *f;
+ void *arg;
+ int32_t state;
};
-enum {
+struct xran_ethdi_ctx {
+ struct xran_io_cfg io_cfg;
+ struct rte_ether_addr entities[XRAN_VF_MAX][ID_MAX];
+ uint16_t vf2xran_port[XRAN_VF_MAX];
+ uint16_t vf_and_q2pc_id[XRAN_VF_MAX][XRAN_VF_QUEUE_MAX];
+ struct xran_eaxc_info vf_and_q2cid[XRAN_VF_MAX][XRAN_VF_QUEUE_MAX];
+ uint16_t rxq_per_port[XRAN_VF_MAX];
+
+ struct rte_ring *tx_ring[XRAN_VF_MAX];
+ struct rte_ring *rx_ring[XRAN_VF_MAX][XRAN_VF_QUEUE_MAX];
+
+ struct rte_ring *up_dl_pkt_gen_ring[XRAN_PORTS_NUM];
+
+ struct xran_worker_config time_wrk_cfg; /**< core doing polling of time */
+ struct xran_worker_config pkt_wrk_cfg[RTE_MAX_LCORE]; /**< worker cores */
+
+ phy_encoder_poll_fn bbdev_enc; /**< call back to poll BBDev encoder */
+ phy_decoder_poll_fn bbdev_dec; /**< call back to poll BBDev decoder */
+
+ uint32_t pkt_proc_core_id; /**< core used for processing DPDK timer cb */
+ uint32_t num_workers; /**< number of workers */
+ uint32_t worker_core[XRAN_MAX_WORKERS]; /**< id of core used as worker */
+
+ uint64_t rx_vf_queue_cnt[XRAN_VF_MAX][XRAN_VF_QUEUE_MAX];
+};
+
+enum xran_mbuf_mem_op_id {
MBUF_KEEP,
MBUF_FREE
};
-extern uint8_t ping_dst_id;
-extern struct ether_addr entities_addrs[];
+extern enum xran_if_state xran_if_current_state;
static inline struct xran_ethdi_ctx *xran_ethdi_get_ctx(void)
{
extern struct xran_ethdi_ctx g_ethdi_ctx;
-
return &g_ethdi_ctx;
}
-typedef int (*xran_ethdi_handler)(struct rte_mbuf *, int sender, uint64_t rx_time);
-
-typedef int (*ethertype_handler)(struct rte_mbuf *, uint64_t rx_time);
-typedef int (*xran_ethdi_handler)(struct rte_mbuf *, int sender, uint64_t rx_time);
-typedef void (xran_ethdi_tx_callback)(struct rte_timer *tim, void *arg);
+typedef int (*xran_ethdi_handler)(struct rte_mbuf *, int sender, uint16_t vf_id);
+typedef int (*ethertype_handler)(struct rte_mbuf* pkt_q[], uint16_t xport_id, struct xran_eaxc_info *p_cid, uint16_t num);
-int xran_register_ethertype_handler(uint16_t ethertype, ethertype_handler callback);
+int32_t xran_register_ethertype_handler(uint16_t ethertype, ethertype_handler callback);
+int32_t xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+ int32_t *lcore_id, struct rte_ether_addr *p_o_du_addr,
+ struct rte_ether_addr *p_ru_addr, uint32_t mtu);
-int xran_ethdi_init_dpdk_io(char *name, const struct xran_io_loop_cfg *io_cfg,
- int *lcore_id, struct ether_addr *p_lls_cu_addr, struct ether_addr *p_ru_addr,
- uint16_t cp_vlan, uint16_t up_vlan);
-int xran_ethdi_dpdk_io_loop(void *);
struct rte_mbuf *xran_ethdi_mbuf_alloc(void);
-int xran_ethdi_mbuf_send(struct rte_mbuf *mb, uint16_t ethertype);
-int xran_ethdi_mbuf_send_cp(struct rte_mbuf *mb, uint16_t ethertype);
-void xran_ethdi_stop_tx(void);
-int xran_ethdi_filter_packet(struct rte_mbuf *pkt, uint64_t rx_time);
+struct rte_mbuf *xran_ethdi_mbuf_indir_alloc(void);
+int32_t xran_ethdi_mbuf_send(struct rte_mbuf *mb, uint16_t ethertype, uint16_t vf_id);
+int32_t xran_ethdi_mbuf_send_cp(struct rte_mbuf *mb, uint16_t ethertype, uint16_t vf_id);
+int32_t xran_ethdi_filter_packet(struct rte_mbuf *pkt[], uint16_t vf_id, uint16_t q_id, uint16_t num);
+int32_t process_dpdk_io(void* args);
+int32_t process_dpdk_io_tx(void* args);
+int32_t process_dpdk_io_rx(void* args);
+
+struct rte_flow * generate_ecpri_flow(uint16_t port_id, uint16_t rx_q, uint16_t pc_id_be, struct rte_flow_error *error);
#ifdef __cplusplus
Code Review / o-du / phy.git / blobdiff