[ovs-dev] [PATCH ovs v2 1/2] netdev-dpdk-vdpa: Introduce dpdkvdpa netdev
Noa Ezra
noae at mellanox.com
Wed Oct 2 18:15:55 UTC 2019
vDPA netdev is designed to support both SW and HW use cases.
HW mode will be used to configure vDPA capable devices.
SW acceleration is used to leverage SRIOV offloads to virtio guests
by relaying packets between VF and virtio devices.
Add the SW relay forwarding logic as a pre-step for adding dpdkvdpa
port with no functional change.
Signed-off-by: Noa Ezra <noae at mellanox.com>
Reviewed-by: Oz Shlomo <ozsh at mellanox.com>
---
lib/automake.mk | 4 +-
lib/netdev-dpdk-vdpa.c | 750 +++++++++++++++++++++++++++++++++++++++++++++++++
lib/netdev-dpdk-vdpa.h | 54 ++++
3 files changed, 807 insertions(+), 1 deletion(-)
create mode 100755 lib/netdev-dpdk-vdpa.c
create mode 100644 lib/netdev-dpdk-vdpa.h
diff --git a/lib/automake.mk b/lib/automake.mk
index 17b36b4..38e027f 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -144,6 +144,7 @@ lib_libopenvswitch_la_SOURCES = \
lib/netdev-offload.h \
lib/netdev-offload-provider.h \
lib/netdev-provider.h \
+ lib/netdev-dpdk-vdpa.h \
lib/netdev-vport.c \
lib/netdev-vport.h \
lib/netdev-vport-private.h \
@@ -426,7 +427,8 @@ if DPDK_NETDEV
lib_libopenvswitch_la_SOURCES += \
lib/dpdk.c \
lib/netdev-dpdk.c \
- lib/netdev-offload-dpdk.c
+ lib/netdev-offload-dpdk.c \
+ lib/netdev-dpdk-vdpa.c
else
lib_libopenvswitch_la_SOURCES += \
lib/dpdk-stub.c
diff --git a/lib/netdev-dpdk-vdpa.c b/lib/netdev-dpdk-vdpa.c
new file mode 100755
index 0000000..d8f8fb0
--- /dev/null
+++ b/lib/netdev-dpdk-vdpa.c
@@ -0,0 +1,750 @@
+/*
+ * Copyright (c) 2019 Mellanox Technologies, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <config.h>
+#include "netdev-dpdk-vdpa.h"
+
+#include <netinet/ip6.h>
+#include <rte_flow.h>
+#include <rte_eth_vhost.h>
+#include <rte_ethdev.h>
+#include <rte_errno.h>
+#include <rte_mbuf.h>
+#include <rte_atomic.h>
+#include <rte_byteorder.h>
+#include <rte_malloc.h>
+
+#include "netdev-provider.h"
+#include "openvswitch/vlog.h"
+#include "dp-packet.h"
+#include "util.h"
+
+VLOG_DEFINE_THIS_MODULE(netdev_dpdk_vdpa);
+
+#define NETDEV_DPDK_VDPA_SIZEOF_MBUF (sizeof(struct rte_mbuf *))
+#define NETDEV_DPDK_VDPA_MAX_QPAIRS 128
+#define NETDEV_DPDK_VDPA_INVALID_QUEUE_ID 0xFFFF
+#define NETDEV_DPDK_VDPA_STATS_MAX_STR_SIZE 64
+#define NETDEV_DPDK_VDPA_RX_DESC_DEFAULT 512
+
+enum netdev_dpdk_vdpa_port_type {
+ NETDEV_DPDK_VDPA_PORT_TYPE_VM,
+ NETDEV_DPDK_VDPA_PORT_TYPE_VF
+};
+
+struct netdev_dpdk_vdpa_relay_flow {
+ struct rte_flow *flow;
+ bool queues_en[RTE_MAX_QUEUES_PER_PORT];
+ uint32_t priority;
+};
+
+struct netdev_dpdk_vdpa_qpair {
+ uint16_t port_id_rx;
+ uint16_t port_id_tx;
+ uint16_t pr_queue;
+ uint8_t mb_head;
+ uint8_t mb_tail;
+ struct rte_mbuf *pkts[NETDEV_MAX_BURST * 2];
+};
+
+struct netdev_dpdk_vdpa_relay {
+ PADDED_MEMBERS(CACHE_LINE_SIZE,
+ struct netdev_dpdk_vdpa_qpair qpair[NETDEV_DPDK_VDPA_MAX_QPAIRS * 2];
+ uint16_t num_queues;
+ struct netdev_dpdk_vdpa_relay_flow flow_params;
+ int port_id_vm;
+ int port_id_vf;
+ uint16_t vf_mtu;
+ int n_rxq;
+ char *vf_pci;
+ char *vm_socket;
+ char *vhost_name;
+ );
+};
+
+static int
+netdev_dpdk_vdpa_port_from_name(const char *name)
+{
+ int port_id;
+ size_t len;
+
+ len = strlen(name);
+ for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++) {
+ if (rte_eth_dev_is_valid_port(port_id) &&
+ !strncmp(name, rte_eth_devices[port_id].device->name, len)) {
+ return port_id;
+ }
+ }
+ VLOG_ERR("No port was found for %s", name);
+ return -1;
+}
+
+static void
+netdev_dpdk_vdpa_free(void *ptr)
+{
+ if (ptr == NULL) {
+ return;
+ }
+ free(ptr);
+ ptr = NULL;
+}
+static void
+netdev_dpdk_vdpa_clear_relay(struct netdev_dpdk_vdpa_relay *relay)
+{
+ uint16_t q;
+ uint8_t i;
+
+ for (q = 0; q < relay->num_queues; q++) {
+ for (i = relay->qpair[q].mb_head; i < relay->qpair[q].mb_tail; i++) {
+ rte_pktmbuf_free(relay->qpair[q].pkts[i]);
+ }
+ relay->qpair[q].mb_head = 0;
+ relay->qpair[q].mb_tail = 0;
+ relay->qpair[q].port_id_rx = 0;
+ relay->qpair[q].port_id_tx = 0;
+ relay->qpair[q].pr_queue = NETDEV_DPDK_VDPA_INVALID_QUEUE_ID;
+ }
+
+ relay->port_id_vm = 0;
+ relay->port_id_vf = 0;
+ relay->num_queues = 0;
+ relay->flow_params.flow = NULL;
+ memset(&relay->flow_params, 0, sizeof relay->flow_params);
+ netdev_dpdk_vdpa_free(relay->vm_socket);
+ netdev_dpdk_vdpa_free(relay->vf_pci);
+ netdev_dpdk_vdpa_free(relay->vhost_name);
+}
+
+static int
+netdev_dpdk_vdpa_generate_rss_flow(struct netdev_dpdk_vdpa_relay *relay)
+{
+ struct rte_flow_attr attr;
+ struct rte_flow_item pattern[2];
+ struct rte_flow_action action[2];
+ struct rte_flow *flow = NULL;
+ struct rte_flow_error error;
+ static struct rte_flow_action_rss action_rss = {
+ .func = RTE_ETH_HASH_FUNCTION_DEFAULT,
+ .level = 0,
+ .types = ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP,
+ .key_len = 0,
+ .key = NULL,
+ };
+ uint16_t queue[RTE_MAX_QUEUES_PER_PORT];
+ uint32_t i;
+ uint32_t j;
+ int err = 0;
+
+ memset(pattern, 0, sizeof pattern);
+ memset(action, 0, sizeof action);
+ memset(&attr, 0, sizeof(struct rte_flow_attr));
+ attr.ingress = 1;
+ attr.priority = !relay->flow_params.priority;
+
+ for (i = 0, j = 0; i < RTE_MAX_QUEUES_PER_PORT; i++) {
+ if (relay->flow_params.queues_en[i]) {
+ queue[j++] = i;
+ }
+ }
+
+ action_rss.queue = queue;
+ action_rss.queue_num = j;
+
+ action[0].type = RTE_FLOW_ACTION_TYPE_RSS;
+ action[0].conf = &action_rss;
+ action[1].type = RTE_FLOW_ACTION_TYPE_END;
+
+ pattern[0].type = RTE_FLOW_ITEM_TYPE_ETH;
+ pattern[0].spec = NULL;
+ pattern[0].mask = NULL;
+ pattern[1].type = RTE_FLOW_ITEM_TYPE_END;
+
+ flow = rte_flow_create(relay->port_id_vf, &attr, pattern, action, &error);
+ if (flow == NULL) {
+ VLOG_ERR("Failed to create flow. msg: %s",
+ error.message ? error.message : "(no stated reason)");
+ err = -1;
+ goto out;
+ }
+
+ if (relay->flow_params.flow != NULL) {
+ err = rte_flow_destroy(relay->port_id_vf, relay->flow_params.flow,
+ &error);
+ if (err < 0) {
+ VLOG_ERR("Failed to destroy flow. msg: %s",
+ error.message ? error.message : "(no stated reason)");
+ goto out;
+ }
+ }
+
+ relay->flow_params.flow = flow;
+ relay->flow_params.priority = attr.priority;
+out:
+ return err;
+}
+
+static int
+netdev_dpdk_vdpa_queue_state(struct netdev_dpdk_vdpa_relay *relay,
+ uint16_t port)
+{
+ struct rte_eth_vhost_queue_event event;
+ uint32_t q_id;
+ int err = 0;
+
+ while (!rte_eth_vhost_get_queue_event(port, &event)) {
+ q_id = (event.rx ? event.queue_id * 2 : event.queue_id * 2 + 1);
+
+ relay->flow_params.queues_en[event.queue_id] = event.enable;
+ /* Load balance the relay's queues on the pr's queues in round robin */
+ relay->qpair[q_id].pr_queue = (event.enable ? q_id % relay->n_rxq :
+ NETDEV_DPDK_VDPA_INVALID_QUEUE_ID);
+ if (!event.rx) {
+ relay->flow_params.queues_en[event.queue_id] = event.enable;
+ err = netdev_dpdk_vdpa_generate_rss_flow(relay);
+ if (err < 0) {
+ VLOG_ERR("netdev_dpdk_vdpa_generate_rss_flow failed");
+ return err;
+ }
+ }
+ }
+
+ return 0;
+}
+
+static int
+netdev_dpdk_vdpa_queue_state_cb_fn(uint16_t port_id,
+ enum rte_eth_event_type type OVS_UNUSED,
+ void *param,
+ void *ret_param OVS_UNUSED)
+{
+ struct netdev_dpdk_vdpa_relay *relay = param;
+ int ret = 0;
+
+ ret = netdev_dpdk_vdpa_queue_state(relay, port_id);
+ if (ret < 0) {
+ VLOG_ERR("netdev_dpdk_vdpa_queue_state failed for port %u", port_id);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int
+netdev_dpdk_vdpa_link_status_cb_fn(uint16_t port_id,
+ enum rte_eth_event_type type OVS_UNUSED,
+ void *param,
+ void *ret_param OVS_UNUSED)
+{
+ struct netdev_dpdk_vdpa_relay *relay = param;
+ struct rte_eth_link link;
+ int q;
+
+ rte_eth_link_get_nowait(port_id, &link);
+ if (!link.link_status) {
+ for (q = 0; q < NETDEV_DPDK_VDPA_MAX_QPAIRS; q++) {
+ relay->qpair[q].pr_queue = NETDEV_DPDK_VDPA_INVALID_QUEUE_ID;
+ }
+ for (q = 0; q < RTE_MAX_QUEUES_PER_PORT; q++) {
+ relay->flow_params.queues_en[q] = false;
+ }
+ }
+
+ return 0;
+}
+
+static void
+netdev_dpdk_vdpa_close_dev(struct netdev_dpdk_vdpa_relay *relay,
+ int port_id)
+{
+ rte_eth_dev_stop(port_id);
+ if (rte_eth_dev_callback_unregister(port_id, RTE_ETH_EVENT_QUEUE_STATE,
+ netdev_dpdk_vdpa_queue_state_cb_fn,
+ relay)) {
+ VLOG_ERR("rte_eth_dev_callback_unregister failed for port id %u"
+ "event type RTE_ETH_EVENT_QUEUE_STATE", port_id);
+ }
+ if (rte_eth_dev_callback_unregister(port_id, RTE_ETH_EVENT_INTR_LSC,
+ netdev_dpdk_vdpa_link_status_cb_fn,
+ relay)) {
+ VLOG_ERR("rte_eth_dev_callback_unregister failed for port id %u"
+ "event type RTE_ETH_EVENT_INTR_LSC", port_id);
+ }
+
+ if (port_id == relay->port_id_vf) {
+ if (relay->flow_params.flow != NULL) {
+ struct rte_flow_error error;
+ if (rte_flow_destroy(port_id, relay->flow_params.flow, &error)) {
+ VLOG_ERR("rte_flow_destroy failed, Port id %u."
+ "rte flow destroy error: %u : message : %s",
+ port_id, error.type, error.message);
+ }
+ }
+ }
+ rte_eth_dev_close(port_id);
+}
+
+static int
+netdev_dpdk_vdpa_port_init(struct netdev_dpdk_vdpa_relay *relay,
+ struct rte_mempool *mp,
+ enum netdev_dpdk_vdpa_port_type port_type)
+{
+ struct rte_eth_dev_info dev_info;
+ struct rte_eth_txconf txconf;
+ struct rte_eth_conf conf = {
+ .rxmode = {
+ .mq_mode = ETH_MQ_RX_RSS,
+ },
+ .txmode = {
+ .mq_mode = ETH_MQ_TX_NONE,
+ },
+ };
+ uint16_t port = (port_type == NETDEV_DPDK_VDPA_PORT_TYPE_VM) ?
+ relay->port_id_vm : relay->port_id_vf;
+ uint16_t q;
+ int err = 0;
+
+ if (!rte_eth_dev_is_valid_port(port)) {
+ VLOG_ERR("rte_eth_dev_is_valid_port failed, invalid port %d", port);
+ err = -1;
+ goto out;
+ }
+ rte_eth_dev_info_get(port, &dev_info);
+ conf.rxmode.offloads = 0;
+
+ /* enable tso for vf */
+ conf.txmode.offloads = 0;
+ if (port_type == NETDEV_DPDK_VDPA_PORT_TYPE_VF) {
+ conf.txmode.offloads = (DEV_TX_OFFLOAD_TCP_TSO |
+ DEV_TX_OFFLOAD_MULTI_SEGS);
+ }
+
+ err = rte_eth_dev_configure(port, relay->num_queues, relay->num_queues,
+ &conf);
+ if (err < 0) {
+ VLOG_ERR("rte_eth_dev_configure failed for port %d", port);
+ goto out;
+ }
+ for (q = 0; q < relay->num_queues; q++) {
+ err = rte_eth_rx_queue_setup(port, q,
+ NETDEV_DPDK_VDPA_RX_DESC_DEFAULT,
+ rte_eth_dev_socket_id(port),
+ NULL, mp);
+ if (err < 0) {
+ VLOG_ERR("rte_eth_rx_queue_setup failed for port %d, error %d",
+ port, err);
+ goto dev_close;
+ }
+ }
+ txconf = dev_info.default_txconf;
+ txconf.offloads = conf.txmode.offloads;
+ for (q = 0; q < relay->num_queues; q++) {
+ err = rte_eth_tx_queue_setup(port, q,
+ NETDEV_DPDK_VDPA_RX_DESC_DEFAULT,
+ rte_eth_dev_socket_id(port),
+ &txconf);
+ if (err < 0) {
+ VLOG_ERR("rte_eth_tx_queue_setup failed for port %d, error %d",
+ port, err);
+ goto dev_close;
+ }
+ }
+
+ if (port_type == NETDEV_DPDK_VDPA_PORT_TYPE_VM) {
+ netdev_dpdk_vdpa_queue_state(relay, port);
+ }
+
+ err = rte_eth_dev_callback_register(port, RTE_ETH_EVENT_QUEUE_STATE,
+ netdev_dpdk_vdpa_queue_state_cb_fn,
+ relay);
+ if (err < 0) {
+ VLOG_ERR("rte_eth_dev_callback_register failed,"
+ "event QUEUE_STATE error %d", err);
+ goto dev_close;
+ }
+
+ err = rte_eth_dev_callback_register(port, RTE_ETH_EVENT_INTR_LSC,
+ netdev_dpdk_vdpa_link_status_cb_fn,
+ relay);
+ if (err < 0) {
+ VLOG_ERR("rte_eth_dev_callback_register failed,"
+ "event INTR_LSC error %d", err);
+ goto dev_close;
+ }
+
+ err = rte_eth_dev_start(port);
+ if (err < 0) {
+ VLOG_ERR("rte_eth_dev_start failed for port %d", port);
+ goto dev_close;
+ }
+ goto out;
+
+dev_close:
+ rte_eth_dev_close(port);
+out:
+ return err;
+}
+
+static void
+netdev_dpdk_vdpa_parse_pkt(struct rte_mbuf *m, uint16_t mtu)
+{
+ struct ipv4_hdr *ipv4_hdr;
+ struct ipv6_hdr *ipv6_hdr;
+ struct ether_hdr *eth_hdr;
+ struct vlan_hdr *vlan_hdr;
+ struct tcp_hdr *tcp_hdr;
+ struct ip6_ext *ip6_ext;
+ uint8_t l4_proto_id;
+ uint64_t ol_flags;
+ uint32_t l2_len;
+ uint32_t l3_len;
+ uint32_t l4_len;
+ uint16_t proto;
+ int hdr_len;
+ char *hdr;
+
+ eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
+ l2_len = sizeof(struct ether_hdr);
+ hdr = (char *)(eth_hdr + 1);
+ proto = rte_be_to_cpu_16(eth_hdr->ether_type);
+ while (proto == ETHER_TYPE_VLAN || proto == ETHER_TYPE_QINQ) {
+ hdr += sizeof(struct vlan_hdr);
+ vlan_hdr = (struct vlan_hdr *)hdr;
+ proto = rte_be_to_cpu_16(vlan_hdr->eth_proto);
+ l2_len += sizeof(struct vlan_hdr);
+ eth_hdr->ether_type = vlan_hdr->eth_proto;
+ }
+
+ if ((m->pkt_len - l2_len) <= mtu) {
+ return;
+ }
+
+ switch (rte_be_to_cpu_16(eth_hdr->ether_type)) {
+ case ETHER_TYPE_IPv4:
+ ipv4_hdr = (struct ipv4_hdr *) ((char *)eth_hdr + l2_len);
+ l3_len = (ipv4_hdr->version_ihl & 0x0f) << 2;
+ l4_proto_id = ipv4_hdr->next_proto_id;
+ if (l4_proto_id == IPPROTO_TCP) {
+ tcp_hdr = (struct tcp_hdr *)((char *)ipv4_hdr + l3_len);
+ l4_len = (tcp_hdr->data_off & 0xf0) >> 2;
+ ol_flags = (PKT_TX_IPV4 | PKT_TX_IP_CKSUM);
+ }
+ break;
+ case ETHER_TYPE_IPv6:
+ l3_len = sizeof(struct ipv6_hdr);
+ ipv6_hdr = (struct ipv6_hdr *) ((char *)eth_hdr + l2_len);
+ hdr = (char *)ipv6_hdr;
+ hdr_len = l3_len;
+ l4_proto_id = ipv6_hdr->proto;
+ while ((l4_proto_id != IPPROTO_TCP) && (l4_proto_id != IPPROTO_UDP) &&
+ (l4_proto_id != IPPROTO_ICMPV6)) {
+ hdr += hdr_len;
+ ip6_ext = (struct ip6_ext *)hdr;
+ l4_proto_id = ip6_ext->ip6e_nxt;
+ hdr_len = ip6_ext->ip6e_len;
+ l3_len += hdr_len;
+ }
+ if (l4_proto_id == IPPROTO_TCP) {
+ tcp_hdr = (struct tcp_hdr *)((char *)ipv6_hdr + l3_len);
+ l4_len = (tcp_hdr->data_off & 0xf0) >> 2;
+ ol_flags = PKT_TX_IPV6;
+ }
+ break;
+ default:
+ return;
+ }
+
+ if (l4_proto_id == IPPROTO_TCP) {
+ ol_flags |= (PKT_TX_TCP_SEG | PKT_TX_TCP_CKSUM);
+ m->l2_len = l2_len;
+ m->l3_len = l3_len;
+ m->l4_len = l4_len;
+ m->ol_flags = ol_flags;
+ m->tso_segsz = mtu - l3_len - l4_len;
+ }
+}
+
+static int
+netdev_dpdk_vdpa_forward_traffic(struct netdev_dpdk_vdpa_qpair *qpair,
+ uint16_t queue_id, uint16_t mtu)
+{
+ bool tx_vf = (queue_id & 1) ? true : false;
+ uint16_t num_rx_packets = 0;
+ uint8_t buffered_packets;
+ uint16_t num_tx_packets;
+ uint8_t num_packets;
+ uint32_t fwd_rx = 0;
+ int i;
+
+ queue_id = queue_id >> 1;
+ buffered_packets = qpair->mb_tail - qpair->mb_head;
+ num_packets = buffered_packets;
+ if (buffered_packets >= NETDEV_MAX_BURST) {
+ goto send;
+ }
+
+ /* Allocate 2 * NETDEV_MAX_BURST packets entries to always allow a full
+ * RX burst while not dropping any pending packets.
+ * Move pending packets to the head of the array when there are not enough
+ * consecutive entries for a full RX burst.
+ */
+ if (unlikely(qpair->mb_tail > NETDEV_MAX_BURST)) {
+ rte_memcpy(&qpair->pkts[0], &qpair->pkts[qpair->mb_head],
+ num_packets * NETDEV_DPDK_VDPA_SIZEOF_MBUF);
+ qpair->mb_head = 0;
+ qpair->mb_tail = num_packets;
+ }
+
+ num_rx_packets = rte_eth_rx_burst(qpair->port_id_rx, queue_id,
+ qpair->pkts + qpair->mb_tail,
+ NETDEV_MAX_BURST);
+ qpair->mb_tail += num_rx_packets;
+ num_packets += num_rx_packets;
+ fwd_rx += num_rx_packets;
+
+send:
+ if (tx_vf) {
+ for (i = buffered_packets; i < num_packets; i++) {
+ netdev_dpdk_vdpa_parse_pkt(qpair->pkts[qpair->mb_head + i], mtu);
+ }
+ }
+ /* It is preferred to send a full burst of packets.
+ * Send a partial burst only if no new packets were received during the
+ * current poll iteration */
+ if (((num_rx_packets == 0) && (num_packets > 0)) ||
+ (num_packets > NETDEV_MAX_BURST)) {
+ num_packets = MIN(num_packets,NETDEV_MAX_BURST);
+ } else if (num_packets < NETDEV_MAX_BURST) {
+ goto out;
+ }
+
+ num_tx_packets = rte_eth_tx_burst(qpair->port_id_tx, queue_id,
+ qpair->pkts + qpair->mb_head,
+ num_packets);
+ qpair->mb_head += num_tx_packets;
+ if (likely(qpair->mb_head == qpair->mb_tail)) {
+ qpair->mb_head = 0;
+ qpair->mb_tail = 0;
+ }
+out:
+ return fwd_rx;
+}
+
+void *
+netdev_dpdk_vdpa_alloc_relay(void)
+{
+ return rte_zmalloc("ovs_dpdk",
+ sizeof(struct netdev_dpdk_vdpa_relay),
+ CACHE_LINE_SIZE);
+}
+
+int
+netdev_dpdk_vdpa_rxq_recv_impl(struct netdev_dpdk_vdpa_relay *relay,
+ int pr_queue)
+{
+ uint32_t fwd_rx = 0;
+ uint16_t q;
+
+ /* Apply the multi core distribution policy by receiving only from queues
+ * that are associated with the current port representor's queue. */
+ for (q = 0; q < (relay->num_queues * 2); q++) {
+ if (relay->qpair[q].pr_queue == pr_queue) {
+ fwd_rx += netdev_dpdk_vdpa_forward_traffic(&relay->qpair[q], q,
+ relay->vf_mtu);
+ } else if (relay->qpair[q].pr_queue ==
+ NETDEV_DPDK_VDPA_INVALID_QUEUE_ID) {
+ break;
+ }
+ }
+ return fwd_rx;
+}
+
+int
+netdev_dpdk_vdpa_config_impl(struct netdev_dpdk_vdpa_relay *relay,
+ uint16_t port_id,
+ const char *vm_socket,
+ const char *vf_pci)
+{
+ char *vhost_args;
+ uint16_t q;
+ int err = 0;
+
+ /* if fwd_config already been done, don't run it again */
+ if (relay->vf_pci) {
+ goto out;
+ }
+
+ relay->vf_pci = xstrdup(vf_pci);
+ relay->vm_socket = xstrdup(vm_socket);
+ relay->vhost_name = xasprintf("net_vhost%d",port_id);
+ vhost_args = xasprintf("iface=%s,queues=%d,client=1",
+ relay->vm_socket, NETDEV_DPDK_VDPA_MAX_QPAIRS);
+
+ /* create virtio vdev:*/
+ err = rte_eal_hotplug_add("vdev", relay->vhost_name, vhost_args);
+ if (err) {
+ VLOG_ERR("rte_eal_hotplug_add failed for vdev, socket %s",
+ relay->vm_socket);
+ goto err_clear_relay;
+ }
+ relay->port_id_vm = netdev_dpdk_vdpa_port_from_name(relay->vhost_name);
+ if (relay->port_id_vm < 0) {
+ VLOG_ERR("No port id was found for vm %s", relay->vhost_name);
+ err = -1;
+ goto err_clear_vdev;
+ }
+
+ /* create vf:*/
+ err = rte_eal_hotplug_add("pci", relay->vf_pci, NULL);
+ if (err) {
+ VLOG_ERR("rte_eal_hotplug_add failed for pci %s", relay->vf_pci);
+ goto err_clear_vdev;
+ }
+ relay->port_id_vf = netdev_dpdk_vdpa_port_from_name(relay->vf_pci);
+ if (relay->port_id_vf < 0) {
+ VLOG_ERR("No port id was found for vf %s", relay->vf_pci);
+ err = -1;
+ goto err_clear_vf;
+ }
+
+ relay->num_queues = NETDEV_DPDK_VDPA_MAX_QPAIRS;
+ relay->flow_params.priority = 0;
+ relay->flow_params.flow = NULL;
+ memset(relay->flow_params.queues_en, false,
+ sizeof(bool) * RTE_MAX_QUEUES_PER_PORT);
+
+ for (q = 0; q < (relay->num_queues * 2); q++) {
+ relay->qpair[q].pr_queue = NETDEV_DPDK_VDPA_INVALID_QUEUE_ID;
+ if (q & 1) {
+ relay->qpair[q].port_id_rx = relay->port_id_vm;
+ relay->qpair[q].port_id_tx = relay->port_id_vf;
+ } else {
+ relay->qpair[q].port_id_rx = relay->port_id_vf;
+ relay->qpair[q].port_id_tx = relay->port_id_vm;
+ }
+ relay->qpair[q].mb_head = 0;
+ relay->qpair[q].mb_tail = 0;
+ }
+
+ goto out_clear;
+
+err_clear_vf:
+ rte_eal_hotplug_remove("pci", relay->vf_pci);
+err_clear_vdev:
+ rte_eal_hotplug_remove("vdev", relay->vhost_name);
+err_clear_relay:
+ netdev_dpdk_vdpa_clear_relay(relay);
+out_clear:
+ netdev_dpdk_vdpa_free(vhost_args);
+out:
+ return err;
+}
+
+int
+netdev_dpdk_vdpa_update_relay(struct netdev_dpdk_vdpa_relay *relay,
+ struct rte_mempool *mp,
+ int n_rxq)
+{
+ uint16_t mtu;
+ int err = 0;
+
+ err = rte_eth_dev_get_mtu(relay->port_id_vf, &mtu);
+ if (err < 0) {
+ mtu = ETHER_MTU;
+ err = 0;
+ }
+ relay->vf_mtu = mtu;
+ relay->n_rxq = n_rxq;
+
+ /* port init vf */
+ err = netdev_dpdk_vdpa_port_init(relay, mp,
+ NETDEV_DPDK_VDPA_PORT_TYPE_VF);
+ if (err) {
+ VLOG_ERR("port_init failed for port_id %u", relay->port_id_vf);
+ goto clear_relay;
+ }
+
+ /* port init vm */
+ err = netdev_dpdk_vdpa_port_init(relay, mp,
+ NETDEV_DPDK_VDPA_PORT_TYPE_VM);
+ if (err) {
+ VLOG_ERR("port_init failed for port_id %u", relay->port_id_vm);
+ goto vf_close;
+ }
+
+ goto out;
+
+vf_close:
+ rte_eth_dev_stop(relay->port_id_vf);
+ rte_eth_dev_close(relay->port_id_vf);
+clear_relay:
+ rte_eal_hotplug_remove("pci", relay->vf_pci);
+ rte_eal_hotplug_remove("vdev", relay->vhost_name);
+ netdev_dpdk_vdpa_clear_relay(relay);
+out:
+ return err;
+}
+
+void
+netdev_dpdk_vdpa_destruct_impl(struct netdev_dpdk_vdpa_relay *relay)
+{
+ netdev_dpdk_vdpa_close_dev(relay, relay->port_id_vm);
+ netdev_dpdk_vdpa_close_dev(relay, relay->port_id_vf);
+
+ rte_eal_hotplug_remove("vdev", relay->vhost_name);
+ rte_eal_hotplug_remove("pci", relay->vf_pci);
+
+ netdev_dpdk_vdpa_clear_relay(relay);
+}
+
+int
+netdev_dpdk_vdpa_get_custom_stats_impl(struct netdev_dpdk_vdpa_relay *relay,
+ struct netdev_custom_stats *cstm_stats)
+{
+ struct rte_eth_stats rte_stats;
+ uint16_t i;
+ char stats_names[][NETDEV_DPDK_VDPA_STATS_MAX_STR_SIZE] =
+ { "VM packets",
+ "VM bytes",
+ "VF packets",
+ "VF bytes"
+ };
+
+ for (i = 0; i < cstm_stats->size; i++) {
+ ovs_strlcpy(cstm_stats->counters[i].name, stats_names[i],
+ NETDEV_CUSTOM_STATS_NAME_SIZE);
+ }
+
+ if (rte_eth_stats_get(relay->port_id_vm, &rte_stats)) {
+ VLOG_ERR("rte_eth_stats_get failed."
+ "Can't get ETH statistics for port id %u",
+ relay->port_id_vm);
+ return EPROTO;
+ }
+ cstm_stats->counters[0].value = rte_stats.opackets;
+ cstm_stats->counters[1].value = rte_stats.obytes;
+
+ if (rte_eth_stats_get(relay->port_id_vf, &rte_stats)) {
+ VLOG_ERR("rte_eth_stats_get failed."
+ "Can't get ETH statistics for port id %u",
+ relay->port_id_vf);
+ return EPROTO;
+ }
+ cstm_stats->counters[2].value = rte_stats.opackets;
+ cstm_stats->counters[3].value = rte_stats.obytes;
+
+ return 0;
+}
+
diff --git a/lib/netdev-dpdk-vdpa.h b/lib/netdev-dpdk-vdpa.h
new file mode 100644
index 0000000..14f120e
--- /dev/null
+++ b/lib/netdev-dpdk-vdpa.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2019 Mellanox Technologies, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef NETDEV_DPDK_VDPA_H
+#define NETDEV_DPDK_VDPA_H 1
+
+#include "netdev.h"
+
+struct netdev_dpdk_vdpa_relay;
+struct rte_mempool;
+
+/*
+ * Functions that implement the relay forwarding for the netdev dpdkvdpa
+ * which is defined and implemented in netdev-dpdk.
+ * Each relay is associated with a port representor, which is a regular
+ * dpdk netdev. The port representor is the calling context to the relay's
+ * rx_recv function. The idle cycles of the port represntor's rx_recv are
+ * used to forward packets between vf to vm and vice versa.
+ */
+
+void *
+netdev_dpdk_vdpa_alloc_relay(void);
+int
+netdev_dpdk_vdpa_update_relay(struct netdev_dpdk_vdpa_relay *relay,
+ struct rte_mempool *mp,
+ int n_rxq);
+int
+netdev_dpdk_vdpa_rxq_recv_impl(struct netdev_dpdk_vdpa_relay *relay,
+ int pr_queue);
+int
+netdev_dpdk_vdpa_config_impl(struct netdev_dpdk_vdpa_relay *relay,
+ uint16_t port_id,
+ const char *vm_socket,
+ const char *vf_pci);
+void
+netdev_dpdk_vdpa_destruct_impl(struct netdev_dpdk_vdpa_relay *relay);
+int
+netdev_dpdk_vdpa_get_custom_stats_impl(struct netdev_dpdk_vdpa_relay *relay,
+ struct netdev_custom_stats *cstm_stats);
+
+#endif /* netdev-dpdk-vdpa.h */
--
1.8.3.1
More information about the dev
mailing list