net: add rte prefix to IP structure

[dpdk.git] / drivers / net / softnic / rte_eth_softnic_pipeline.c

diff --git a/drivers/net/softnic/rte_eth_softnic_pipeline.c b/drivers/net/softnic/rte_eth_softnic_pipeline.c
index 17830d3..e0e5856 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_pipeline.c
+++ b/drivers/net/softnic/rte_eth_softnic_pipeline.c
@@ -15,6 +15,7 @@
 #include <rte_port_source_sink.h>
 #include <rte_port_fd.h>
 #include <rte_port_sched.h>
+#include <rte_port_sym_crypto.h>
 
 #include <rte_table_acl.h>
 #include <rte_table_array.h>
@@ -107,6 +108,19 @@ softnic_pipeline_disable_all(struct pmd_internals *p)
                                pipeline->name);
 }
 
+uint32_t
+softnic_pipeline_thread_count(struct pmd_internals *p, uint32_t thread_id)
+{
+       struct pipeline *pipeline;
+       uint32_t count = 0;
+
+       TAILQ_FOREACH(pipeline, &p->pipeline_list, node)
+               if ((pipeline->enabled) && (pipeline->thread_id == thread_id))
+                       count++;
+
+       return count;
+}
+
 struct pipeline *
 softnic_pipeline_find(struct pmd_internals *p,
        const char *name)
@@ -224,6 +238,7 @@ softnic_pipeline_port_in_create(struct pmd_internals *softnic,
                struct rte_port_sched_reader_params sched;
                struct rte_port_fd_reader_params fd;
                struct rte_port_source_params source;
+               struct rte_port_sym_crypto_reader_params cryptodev;
        } pp;
 
        struct pipeline *pipeline;
@@ -341,6 +356,23 @@ softnic_pipeline_port_in_create(struct pmd_internals *softnic,
                break;
        }
 
+       case PORT_IN_CRYPTODEV:
+       {
+               struct softnic_cryptodev *cryptodev;
+
+               cryptodev = softnic_cryptodev_find(softnic, params->dev_name);
+               if (cryptodev == NULL)
+                       return -1;
+
+               pp.cryptodev.cryptodev_id = cryptodev->dev_id;
+               pp.cryptodev.queue_id = params->cryptodev.queue_id;
+               pp.cryptodev.f_callback = params->cryptodev.f_callback;
+               pp.cryptodev.arg_callback = params->cryptodev.arg_callback;
+               p.ops = &rte_port_sym_crypto_reader_ops;
+               p.arg_create = &pp.cryptodev;
+               break;
+       }
+
        default:
                return -1;
        }
@@ -427,12 +459,14 @@ softnic_pipeline_port_out_create(struct pmd_internals *softnic,
                struct rte_port_sched_writer_params sched;
                struct rte_port_fd_writer_params fd;
                struct rte_port_sink_params sink;
+               struct rte_port_sym_crypto_writer_params cryptodev;
        } pp;
 
        union {
                struct rte_port_ethdev_writer_nodrop_params ethdev;
                struct rte_port_ring_writer_nodrop_params ring;
                struct rte_port_fd_writer_nodrop_params fd;
+               struct rte_port_sym_crypto_writer_nodrop_params cryptodev;
        } pp_nodrop;
 
        struct pipeline *pipeline;
@@ -562,6 +596,40 @@ softnic_pipeline_port_out_create(struct pmd_internals *softnic,
                break;
        }
 
+       case PORT_OUT_CRYPTODEV:
+       {
+               struct softnic_cryptodev *cryptodev;
+
+               cryptodev = softnic_cryptodev_find(softnic, params->dev_name);
+               if (cryptodev == NULL)
+                       return -1;
+
+               if (params->cryptodev.queue_id >= cryptodev->n_queues)
+                       return -1;
+
+               pp.cryptodev.cryptodev_id = cryptodev->dev_id;
+               pp.cryptodev.queue_id = params->cryptodev.queue_id;
+               pp.cryptodev.tx_burst_sz = params->burst_size;
+               pp.cryptodev.crypto_op_offset = params->cryptodev.op_offset;
+
+               pp_nodrop.cryptodev.cryptodev_id = cryptodev->dev_id;
+               pp_nodrop.cryptodev.queue_id = params->cryptodev.queue_id;
+               pp_nodrop.cryptodev.tx_burst_sz = params->burst_size;
+               pp_nodrop.cryptodev.n_retries = params->retry;
+               pp_nodrop.cryptodev.crypto_op_offset =
+                               params->cryptodev.op_offset;
+
+               if (params->retry == 0) {
+                       p.ops = &rte_port_sym_crypto_writer_ops;
+                       p.arg_create = &pp.cryptodev;
+               } else {
+                       p.ops = &rte_port_sym_crypto_writer_nodrop_ops;
+                       p.arg_create = &pp_nodrop.cryptodev;
+               }
+
+               break;
+       }
+
        default:
                return -1;
        }
@@ -592,7 +660,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {
                .size = sizeof(uint8_t),
                .field_index = 0,
                .input_index = 0,
-               .offset = offsetof(struct ipv4_hdr, next_proto_id),
+               .offset = offsetof(struct rte_ipv4_hdr, next_proto_id),
        },
 
        /* Source IP address (IPv4) */
@@ -601,7 +669,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {
                .size = sizeof(uint32_t),
                .field_index = 1,
                .input_index = 1,
-               .offset = offsetof(struct ipv4_hdr, src_addr),
+               .offset = offsetof(struct rte_ipv4_hdr, src_addr),
        },
 
        /* Destination IP address (IPv4) */
@@ -610,7 +678,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {
                .size = sizeof(uint32_t),
                .field_index = 2,
                .input_index = 2,
-               .offset = offsetof(struct ipv4_hdr, dst_addr),
+               .offset = offsetof(struct rte_ipv4_hdr, dst_addr),
        },
 
        /* Source Port */
@@ -619,7 +687,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {
                .size = sizeof(uint16_t),
                .field_index = 3,
                .input_index = 3,
-               .offset = sizeof(struct ipv4_hdr) +
+               .offset = sizeof(struct rte_ipv4_hdr) +
                        offsetof(struct tcp_hdr, src_port),
        },
 
@@ -629,7 +697,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv4[] = {
                .size = sizeof(uint16_t),
                .field_index = 4,
                .input_index = 3,
-               .offset = sizeof(struct ipv4_hdr) +
+               .offset = sizeof(struct rte_ipv4_hdr) +
                        offsetof(struct tcp_hdr, dst_port),
        },
 };
@@ -641,7 +709,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {
                .size = sizeof(uint8_t),
                .field_index = 0,
                .input_index = 0,
-               .offset = offsetof(struct ipv6_hdr, proto),
+               .offset = offsetof(struct rte_ipv6_hdr, proto),
        },
 
        /* Source IP address (IPv6) */
@@ -650,7 +718,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {
                .size = sizeof(uint32_t),
                .field_index = 1,
                .input_index = 1,
-               .offset = offsetof(struct ipv6_hdr, src_addr[0]),
+               .offset = offsetof(struct rte_ipv6_hdr, src_addr[0]),
        },
 
        [2] = {
@@ -658,7 +726,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {
                .size = sizeof(uint32_t),
                .field_index = 2,
                .input_index = 2,
-               .offset = offsetof(struct ipv6_hdr, src_addr[4]),
+               .offset = offsetof(struct rte_ipv6_hdr, src_addr[4]),
        },
 
        [3] = {
@@ -666,7 +734,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {
                .size = sizeof(uint32_t),
                .field_index = 3,
                .input_index = 3,
-               .offset = offsetof(struct ipv6_hdr, src_addr[8]),
+               .offset = offsetof(struct rte_ipv6_hdr, src_addr[8]),
        },
 
        [4] = {
@@ -674,7 +742,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {
                .size = sizeof(uint32_t),
                .field_index = 4,
                .input_index = 4,
-               .offset = offsetof(struct ipv6_hdr, src_addr[12]),
+               .offset = offsetof(struct rte_ipv6_hdr, src_addr[12]),
        },
 
        /* Destination IP address (IPv6) */
@@ -683,7 +751,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {
                .size = sizeof(uint32_t),
                .field_index = 5,
                .input_index = 5,
-               .offset = offsetof(struct ipv6_hdr, dst_addr[0]),
+               .offset = offsetof(struct rte_ipv6_hdr, dst_addr[0]),
        },
 
        [6] = {
@@ -691,7 +759,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {
                .size = sizeof(uint32_t),
                .field_index = 6,
                .input_index = 6,
-               .offset = offsetof(struct ipv6_hdr, dst_addr[4]),
+               .offset = offsetof(struct rte_ipv6_hdr, dst_addr[4]),
        },
 
        [7] = {
@@ -699,7 +767,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {
                .size = sizeof(uint32_t),
                .field_index = 7,
                .input_index = 7,
-               .offset = offsetof(struct ipv6_hdr, dst_addr[8]),
+               .offset = offsetof(struct rte_ipv6_hdr, dst_addr[8]),
        },
 
        [8] = {
@@ -707,7 +775,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {
                .size = sizeof(uint32_t),
                .field_index = 8,
                .input_index = 8,
-               .offset = offsetof(struct ipv6_hdr, dst_addr[12]),
+               .offset = offsetof(struct rte_ipv6_hdr, dst_addr[12]),
        },
 
        /* Source Port */
@@ -716,7 +784,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {
                .size = sizeof(uint16_t),
                .field_index = 9,
                .input_index = 9,
-               .offset = sizeof(struct ipv6_hdr) +
+               .offset = sizeof(struct rte_ipv6_hdr) +
                        offsetof(struct tcp_hdr, src_port),
        },
 
@@ -726,7 +794,7 @@ static const struct rte_acl_field_def table_acl_field_format_ipv6[] = {
                .size = sizeof(uint16_t),
                .field_index = 10,
                .input_index = 9,
-               .offset = sizeof(struct ipv6_hdr) +
+               .offset = sizeof(struct rte_ipv6_hdr) +
                        offsetof(struct tcp_hdr, dst_port),
        },
 };
@@ -1000,6 +1068,7 @@ softnic_pipeline_table_create(struct pmd_internals *softnic,
        table->a = action;
        TAILQ_INIT(&table->flows);
        TAILQ_INIT(&table->meter_profiles);
+       memset(&table->dscp_table, 0, sizeof(table->dscp_table));
        pipeline->n_tables++;
 
        return 0;