[v7,2/8] fib: make lookup function type configurable
Checks
Commit Message
Add type argument to dir24_8_get_lookup_fn()
Now it supports 3 different lookup implementations:
RTE_FIB_DIR24_8_SCALAR_MACRO
RTE_FIB_DIR24_8_SCALAR_INLINE
RTE_FIB_DIR24_8_SCALAR_UNI
Add new rte_fib_set_lookup_fn() - user can change lookup
function type runtime.
Signed-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
---
lib/librte_fib/dir24_8.c | 32 +++++++++++++++++++-----------
lib/librte_fib/dir24_8.h | 2 +-
lib/librte_fib/rte_fib.c | 21 +++++++++++++++++++-
lib/librte_fib/rte_fib.h | 23 +++++++++++++++++++++
lib/librte_fib/rte_fib_version.map | 1 +
5 files changed, 65 insertions(+), 14 deletions(-)
Comments
>
> Add type argument to dir24_8_get_lookup_fn()
> Now it supports 3 different lookup implementations:
> RTE_FIB_DIR24_8_SCALAR_MACRO
> RTE_FIB_DIR24_8_SCALAR_INLINE
> RTE_FIB_DIR24_8_SCALAR_UNI
>
> Add new rte_fib_set_lookup_fn() - user can change lookup
> function type runtime.
>
> Signed-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
> ---
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
> 2.17.1
13/07/2020 13:56, Vladimir Medvedkin:
> Add type argument to dir24_8_get_lookup_fn()
> Now it supports 3 different lookup implementations:
> RTE_FIB_DIR24_8_SCALAR_MACRO
> RTE_FIB_DIR24_8_SCALAR_INLINE
> RTE_FIB_DIR24_8_SCALAR_UNI
>
> Add new rte_fib_set_lookup_fn() - user can change lookup
> function type runtime.
>
> Signed-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
[...]
> --- a/lib/librte_fib/rte_fib.h
> +++ b/lib/librte_fib/rte_fib.h
> +enum rte_fib_dir24_8_lookup_type {
> + RTE_FIB_DIR24_8_SCALAR_MACRO,
> + RTE_FIB_DIR24_8_SCALAR_INLINE,
> + RTE_FIB_DIR24_8_SCALAR_UNI
> +};
Doxygen missing.
[...]
> +/**
> + * Set lookup function based on type
> + *
> + * @param fib
> + * FIB object handle
> + * @param type
> + * type of lookup function
> + *
> + * @return
> + * -EINVAL on failure
> + * 0 on success
> + */
> +__rte_experimental
> +int
> +rte_fib_set_lookup_fn(struct rte_fib *fib,
> + enum rte_fib_dir24_8_lookup_type type);
I think the types deserve to be documented,
explaining why using one or the other.
Hi Thomas,
чт, 16 июл. 2020 г. в 15:32, Thomas Monjalon <thomas@monjalon.net>:
> 13/07/2020 13:56, Vladimir Medvedkin:
> > Add type argument to dir24_8_get_lookup_fn()
> > Now it supports 3 different lookup implementations:
> > RTE_FIB_DIR24_8_SCALAR_MACRO
> > RTE_FIB_DIR24_8_SCALAR_INLINE
> > RTE_FIB_DIR24_8_SCALAR_UNI
> >
> > Add new rte_fib_set_lookup_fn() - user can change lookup
> > function type runtime.
> >
> > Signed-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
> [...]
> > --- a/lib/librte_fib/rte_fib.h
> > +++ b/lib/librte_fib/rte_fib.h
> > +enum rte_fib_dir24_8_lookup_type {
> > + RTE_FIB_DIR24_8_SCALAR_MACRO,
> > + RTE_FIB_DIR24_8_SCALAR_INLINE,
> > + RTE_FIB_DIR24_8_SCALAR_UNI
> > +};
>
> Doxygen missing.
>
> [...]
> > +/**
> > + * Set lookup function based on type
> > + *
> > + * @param fib
> > + * FIB object handle
> > + * @param type
> > + * type of lookup function
> > + *
> > + * @return
> > + * -EINVAL on failure
> > + * 0 on success
> > + */
> > +__rte_experimental
> > +int
> > +rte_fib_set_lookup_fn(struct rte_fib *fib,
> > + enum rte_fib_dir24_8_lookup_type type);
>
> I think the types deserve to be documented,
> explaining why using one or the other.
>
I'm going to get rid of extra lookup types in next releases, so there will
be only well understandable SCALAR and VECTOR types
>
>
@@ -45,13 +45,6 @@ struct dir24_8_tbl {
#define ROUNDUP(x, y) RTE_ALIGN_CEIL(x, (1 << (32 - y)))
-enum lookup_type {
- MACRO,
- INLINE,
- UNI
-};
-enum lookup_type test_lookup = MACRO;
-
static inline void *
get_tbl24_p(struct dir24_8_tbl *dp, uint32_t ip, uint8_t nh_sz)
{
@@ -253,11 +246,18 @@ dir24_8_lookup_bulk_uni(void *p, const uint32_t *ips,
}
rte_fib_lookup_fn_t
-dir24_8_get_lookup_fn(struct rte_fib_conf *fib_conf)
+dir24_8_get_lookup_fn(void *p, enum rte_fib_dir24_8_lookup_type type)
{
- enum rte_fib_dir24_8_nh_sz nh_sz = fib_conf->dir24_8.nh_sz;
+ enum rte_fib_dir24_8_nh_sz nh_sz;
+ struct dir24_8_tbl *dp = p;
- if (test_lookup == MACRO) {
+ if (dp == NULL)
+ return NULL;
+
+ nh_sz = dp->nh_sz;
+
+ switch (type) {
+ case RTE_FIB_DIR24_8_SCALAR_MACRO:
switch (nh_sz) {
case RTE_FIB_DIR24_8_1B:
return dir24_8_lookup_bulk_1b;
@@ -267,8 +267,10 @@ dir24_8_get_lookup_fn(struct rte_fib_conf *fib_conf)
return dir24_8_lookup_bulk_4b;
case RTE_FIB_DIR24_8_8B:
return dir24_8_lookup_bulk_8b;
+ default:
+ return NULL;
}
- } else if (test_lookup == INLINE) {
+ case RTE_FIB_DIR24_8_SCALAR_INLINE:
switch (nh_sz) {
case RTE_FIB_DIR24_8_1B:
return dir24_8_lookup_bulk_0;
@@ -278,9 +280,15 @@ dir24_8_get_lookup_fn(struct rte_fib_conf *fib_conf)
return dir24_8_lookup_bulk_2;
case RTE_FIB_DIR24_8_8B:
return dir24_8_lookup_bulk_3;
+ default:
+ return NULL;
}
- } else
+ case RTE_FIB_DIR24_8_SCALAR_UNI:
return dir24_8_lookup_bulk_uni;
+ default:
+ return NULL;
+ }
+
return NULL;
}
@@ -22,7 +22,7 @@ void
dir24_8_free(void *p);
rte_fib_lookup_fn_t
-dir24_8_get_lookup_fn(struct rte_fib_conf *conf);
+dir24_8_get_lookup_fn(void *p, enum rte_fib_dir24_8_lookup_type type);
int
dir24_8_modify(struct rte_fib *fib, uint32_t ip, uint8_t depth,
@@ -107,7 +107,8 @@ init_dataplane(struct rte_fib *fib, __rte_unused int socket_id,
fib->dp = dir24_8_create(dp_name, socket_id, conf);
if (fib->dp == NULL)
return -rte_errno;
- fib->lookup = dir24_8_get_lookup_fn(conf);
+ fib->lookup = dir24_8_get_lookup_fn(fib->dp,
+ RTE_FIB_DIR24_8_SCALAR_MACRO);
fib->modify = dir24_8_modify;
return 0;
default:
@@ -317,3 +318,21 @@ rte_fib_get_rib(struct rte_fib *fib)
{
return (fib == NULL) ? NULL : fib->rib;
}
+
+int
+rte_fib_set_lookup_fn(struct rte_fib *fib,
+ enum rte_fib_dir24_8_lookup_type type)
+{
+ rte_fib_lookup_fn_t fn;
+
+ switch (fib->type) {
+ case RTE_FIB_DIR24_8:
+ fn = dir24_8_get_lookup_fn(fib->dp, type);
+ if (fn == NULL)
+ return -EINVAL;
+ fib->lookup = fn;
+ return 0;
+ default:
+ return -EINVAL;
+ }
+}
@@ -58,6 +58,12 @@ enum rte_fib_dir24_8_nh_sz {
RTE_FIB_DIR24_8_8B
};
+enum rte_fib_dir24_8_lookup_type {
+ RTE_FIB_DIR24_8_SCALAR_MACRO,
+ RTE_FIB_DIR24_8_SCALAR_INLINE,
+ RTE_FIB_DIR24_8_SCALAR_UNI
+};
+
/** FIB configuration structure */
struct rte_fib_conf {
enum rte_fib_type type; /**< Type of FIB struct */
@@ -196,6 +202,23 @@ __rte_experimental
struct rte_rib *
rte_fib_get_rib(struct rte_fib *fib);
+/**
+ * Set lookup function based on type
+ *
+ * @param fib
+ * FIB object handle
+ * @param type
+ * type of lookup function
+ *
+ * @return
+ * -EINVAL on failure
+ * 0 on success
+ */
+__rte_experimental
+int
+rte_fib_set_lookup_fn(struct rte_fib *fib,
+ enum rte_fib_dir24_8_lookup_type type);
+
#ifdef __cplusplus
}
#endif
@@ -9,6 +9,7 @@ EXPERIMENTAL {
rte_fib_lookup_bulk;
rte_fib_get_dp;
rte_fib_get_rib;
+ rte_fib_set_lookup_fn;
rte_fib6_add;
rte_fib6_create;