[dpdk-dev] librte_ip_frag: Disable ipv4/v6 fragmentation if RTE_MBUF_REFCNT=n
Commit Message
Ipv4/v6 fragmentation libraries depends on refcnt.
There was a compilation error if RTE_MBUF_REFCNT was disabled,
so those libraries have been disabled in that situation.
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
lib/librte_ip_frag/Makefile | 4 +++-
lib/librte_ip_frag/rte_ip_frag.h | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
Comments
2014-10-21 15:15, Pablo de Lara:
> Ipv4/v6 fragmentation libraries depends on refcnt.
> There was a compilation error if RTE_MBUF_REFCNT was disabled,
> so those libraries have been disabled in that situation.
Please Pablo, could you add a short justification that it's not
possible to implement fragmentation without refcnt (at least with
the current design)?
What do you think of adding a warning as below?
> +ifeq ($(CONFIG_RTE_MBUF_REFCNT),y)
> SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_fragmentation.c
> -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_reassembly.c
> SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_fragmentation.c
+else
+$(info WARNING: Fragmentation feature is disabled because it needs MBUF_REFCNT.)
> +endif
> +SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_reassembly.c
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Thomas Monjalon
> Sent: Tuesday, October 21, 2014 10:12 PM
> To: De Lara Guarch, Pablo
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] librte_ip_frag: Disable ipv4/v6
> fragmentation if RTE_MBUF_REFCNT=n
>
> 2014-10-21 15:15, Pablo de Lara:
> > Ipv4/v6 fragmentation libraries depends on refcnt.
> > There was a compilation error if RTE_MBUF_REFCNT was disabled,
> > so those libraries have been disabled in that situation.
>
> Please Pablo, could you add a short justification that it's not
> possible to implement fragmentation without refcnt (at least with
> the current design)?
Will send a v2 with it.
>
> What do you think of adding a warning as below?
>
> > +ifeq ($(CONFIG_RTE_MBUF_REFCNT),y)
> > SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_fragmentation.c
> > -SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_reassembly.c
> > SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_fragmentation.c
> +else
> +$(info WARNING: Fragmentation feature is disabled because it needs
> MBUF_REFCNT.)
> > +endif
> > +SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_reassembly.c
Good idea. Thanks Thomas!
>
> --
> Thomas
@@ -38,9 +38,11 @@ CFLAGS += -O3
CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
#source files
+ifeq ($(CONFIG_RTE_MBUF_REFCNT),y)
SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_fragmentation.c
-SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_reassembly.c
SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_fragmentation.c
+endif
+SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_reassembly.c
SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_reassembly.c
SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ip_frag_common.c
SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += ip_frag_internal.c
@@ -175,6 +175,7 @@ rte_ip_frag_table_destroy( struct rte_ip_frag_tbl *tbl)
rte_free(tbl);
}
+#ifdef RTE_MBUF_REFCNT
/**
* This function implements the fragmentation of IPv6 packets.
*
@@ -203,7 +204,7 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
uint16_t mtu_size,
struct rte_mempool *pool_direct,
struct rte_mempool *pool_indirect);
-
+#endif
/*
* This function implements reassembly of fragmented IPv6 packets.
@@ -252,6 +253,7 @@ rte_ipv6_frag_get_ipv6_fragment_header(struct ipv6_hdr *hdr)
return NULL;
}
+#ifdef RTE_MBUF_REFCNT
/**
* IPv4 fragmentation.
*
@@ -280,6 +282,7 @@ int32_t rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
uint16_t nb_pkts_out, uint16_t mtu_size,
struct rte_mempool *pool_direct,
struct rte_mempool *pool_indirect);
+#endif
/*
* This function implements reassembly of fragmented IPv4 packets.