net/nfb: switch Rx timestamp to dynamic mbuf field

The mbuf timestamp is moved to a dynamic field
in order to allow removal of the deprecated static field.
The related mbuf flag is also replaced.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: David Marchand <david.marchand@redhat.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>

diff --git a/drivers/net/nfb/nfb_rx.c b/drivers/net/nfb/nfb_rx.c
index d97179f..d6d4ba9 100644 (file)
--- a/drivers/net/nfb/nfb_rx.c
+++ b/drivers/net/nfb/nfb_rx.c
@@ -9,6 +9,9 @@
 #include "nfb_rx.h"
 #include "nfb.h"
 
+uint64_t nfb_timestamp_rx_dynflag;
+int nfb_timestamp_dynfield_offset = -1;
+
 static int
 timestamp_check_handler(__rte_unused const char *key,
        const char *value, __rte_unused void *opaque)
@@ -24,6 +27,7 @@ static int
 nfb_check_timestamp(struct rte_devargs *devargs)
 {
        struct rte_kvargs *kvlist;
+       int ret;
 
        if (devargs == NULL)
                return 0;
@@ -38,6 +42,7 @@ nfb_check_timestamp(struct rte_devargs *devargs)
        }
        /* Timestamps are enabled when there is
         * key-value pair: enable_timestamp=1
+        * TODO: timestamp should be enabled with DEV_RX_OFFLOAD_TIMESTAMP
         */
        if (rte_kvargs_process(kvlist, TIMESTAMP_ARG,
                timestamp_check_handler, NULL) < 0) {
@@ -46,6 +51,14 @@ nfb_check_timestamp(struct rte_devargs *devargs)
        }
        rte_kvargs_free(kvlist);
 
+       ret = rte_mbuf_dyn_rx_timestamp_register(
+                       &nfb_timestamp_dynfield_offset,
+                       &nfb_timestamp_rx_dynflag);
+       if (ret != 0) {
+               RTE_LOG(ERR, PMD, "Cannot register Rx timestamp field/flag\n");
+               return -rte_errno;
+       }
+
        return 1;
 }
 
@@ -125,7 +138,7 @@ nfb_eth_rx_queue_setup(struct rte_eth_dev *dev,
        else
                rte_free(rxq);
 
-       if (nfb_check_timestamp(dev->device->devargs))
+       if (nfb_check_timestamp(dev->device->devargs) > 0)
                rxq->flags |= NFB_TIMESTAMP_FLAG;
 
        return ret;

diff --git a/drivers/net/nfb/nfb_rx.h b/drivers/net/nfb/nfb_rx.h
index cf3899b..27a2888 100644 (file)
--- a/drivers/net/nfb/nfb_rx.h
+++ b/drivers/net/nfb/nfb_rx.h
@@ -15,6 +15,16 @@
 
 #define NFB_TIMESTAMP_FLAG (1 << 0)
 
+extern uint64_t nfb_timestamp_rx_dynflag;
+extern int nfb_timestamp_dynfield_offset;
+
+static inline rte_mbuf_timestamp_t *
+nfb_timestamp_dynfield(struct rte_mbuf *mbuf)
+{
+       return RTE_MBUF_DYNFIELD(mbuf,
+               nfb_timestamp_dynfield_offset, rte_mbuf_timestamp_t *);
+}
+
 struct ndp_rx_queue {
        struct nfb_device *nfb;      /* nfb dev structure */
        struct ndp_queue *queue;     /* rx queue */
@@ -190,16 +200,19 @@ nfb_eth_ndp_rx(void *queue,
                        mbuf->ol_flags = 0;
 
                        if (timestamping_enabled) {
+                               rte_mbuf_timestamp_t timestamp;
+
                                /* nanoseconds */
-                               mbuf->timestamp =
+                               timestamp =
                                        rte_le_to_cpu_32(*((uint32_t *)
                                        (packets[i].header + 4)));
-                               mbuf->timestamp <<= 32;
+                               timestamp <<= 32;
                                /* seconds */
-                               mbuf->timestamp |=
+                               timestamp |=
                                        rte_le_to_cpu_32(*((uint32_t *)
                                        (packets[i].header + 8)));
-                               mbuf->ol_flags |= PKT_RX_TIMESTAMP;
+                               *nfb_timestamp_dynfield(mbuf) = timestamp;
+                               mbuf->ol_flags |= nfb_timestamp_rx_dynflag;
                        }
 
                        bufs[num_rx++] = mbuf;