app/eventdev: switch sequence number to dynamic mbuf field

[dpdk.git] / lib / librte_security / rte_security.c

diff --git a/lib/librte_security/rte_security.c b/lib/librte_security/rte_security.c
index d475b09..e8116d5 100644 (file)
--- a/lib/librte_security/rte_security.c
+++ b/lib/librte_security/rte_security.c
@@ -23,21 +23,40 @@
        RTE_PTR_OR_ERR_RET(p1->p2->p3, last_retval);                    \
 } while (0)
 
+#define RTE_SECURITY_DYNFIELD_NAME "rte_security_dynfield_metadata"
+int rte_security_dynfield_offset = -1;
+
+int
+rte_security_dynfield_register(void)
+{
+       static const struct rte_mbuf_dynfield dynfield_desc = {
+               .name = RTE_SECURITY_DYNFIELD_NAME,
+               .size = sizeof(rte_security_dynfield_t),
+               .align = __alignof__(rte_security_dynfield_t),
+       };
+       rte_security_dynfield_offset =
+               rte_mbuf_dynfield_register(&dynfield_desc);
+       return rte_security_dynfield_offset;
+}
+
 struct rte_security_session *
 rte_security_session_create(struct rte_security_ctx *instance,
                            struct rte_security_session_conf *conf,
-                           struct rte_mempool *mp)
+                           struct rte_mempool *mp,
+                           struct rte_mempool *priv_mp)
 {
        struct rte_security_session *sess = NULL;
 
        RTE_PTR_CHAIN3_OR_ERR_RET(instance, ops, session_create, NULL, NULL);
        RTE_PTR_OR_ERR_RET(conf, NULL);
        RTE_PTR_OR_ERR_RET(mp, NULL);
+       RTE_PTR_OR_ERR_RET(priv_mp, NULL);
 
        if (rte_mempool_get(mp, (void **)&sess))
                return NULL;
 
-       if (instance->ops->session_create(instance->device, conf, sess, mp)) {
+       if (instance->ops->session_create(instance->device, conf,
+                               sess, priv_mp)) {
                rte_mempool_put(mp, (void *)sess);
                return NULL;
        }
@@ -108,10 +127,11 @@ rte_security_set_pkt_metadata(struct rte_security_ctx *instance,
                              struct rte_mbuf *m, void *params)
 {
 #ifdef RTE_DEBUG
-       RTE_PTR_CHAIN3_OR_ERR_RET(instance, ops, set_pkt_metadata, -EINVAL,
-                       -ENOTSUP);
        RTE_PTR_OR_ERR_RET(sess, -EINVAL);
+       RTE_PTR_OR_ERR_RET(instance, -EINVAL);
+       RTE_PTR_OR_ERR_RET(instance->ops, -EINVAL);
 #endif
+       RTE_FUNC_PTR_OR_ERR_RET(*instance->ops->set_pkt_metadata, -ENOTSUP);
        return instance->ops->set_pkt_metadata(instance->device,
                                               sess, m, params);
 }
@@ -122,8 +142,10 @@ rte_security_get_userdata(struct rte_security_ctx *instance, uint64_t md)
        void *userdata = NULL;
 
 #ifdef RTE_DEBUG
-       RTE_PTR_CHAIN3_OR_ERR_RET(instance, ops, get_userdata, NULL, NULL);
+       RTE_PTR_OR_ERR_RET(instance, NULL);
+       RTE_PTR_OR_ERR_RET(instance->ops, NULL);
 #endif
+       RTE_FUNC_PTR_OR_ERR_RET(*instance->ops->get_userdata, NULL);
        if (instance->ops->get_userdata(instance->device, md, &userdata))
                return NULL;
 
@@ -170,6 +192,11 @@ rte_security_capability_get(struct rte_security_ctx *instance,
                                if (capability->pdcp.domain ==
                                                        idx->pdcp.domain)
                                        return capability;
+                       } else if (idx->protocol ==
+                                               RTE_SECURITY_PROTOCOL_DOCSIS) {
+                               if (capability->docsis.direction ==
+                                                       idx->docsis.direction)
+                                       return capability;
                        }
                }
        }