[dpdk-dev] [PATCH v2] examples/l3fwd: fix compilation issue when using exact-match

[Thomas Monjalon]

2015-08-10 18:58, Thomas Monjalon:
> Hi Pablo,
> 
> 2015-08-09 11:28, Pablo de Lara:
> > From: "Pablo de Lara" <pablo.de.lara.guarch at intel.com>
> > 
> > L3fwd was trying to use an inexistent function "simple_ipv6_fwd_4pkts",
> > instead it should be "simple_ipv6_fwd_8pkts", and "simple_ipv8_fwd_4pkts"
> > instead of "simple_ipv4_fwd_8pkts".
> > 
> > Fixes: 80fcb4d4 ("examples/l3fwd: increase lookup burst size to 8")
> > 
> > Signed-off-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
> > Acked-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy at intel.com>
> > ---
> > 
> > Changes in v2:
> > 
> > - Missing to fix additional type
> 
> More fixes are needed:
> 
> make RTE_SDK=$(readlink -m ../..) RTE_TARGET=x86_64-native-linuxapp-clang \
> 	EXTRA_CFLAGS='-DAPP_LOOKUP_METHOD=APP_LOOKUP_EXACT_MATCH'
> 
> examples/l3fwd/main.c:545:1: error: unused function 'send_packetsx4'
> examples/l3fwd/main.c:1165:1: error: unused function 'rfc1812_process'
> 
> The right fix would be to remove one APP_LOOKUP_METHOD.

Build flags are:
- APP_LOOKUP_METHOD
- DO_RFC_1812_CHECKS
- defined(__SSE4_1__) -> ENABLE_MULTI_BUFFER_OPTIMIZE
- RTE_NEXT_ABI

Waiting a cleanup for 2.2, this fix should be OK and will be applied:

--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -541,6 +541,7 @@ send_single_packet(struct rte_mbuf *m, uint8_t port)
        return 0;
 }
 
+#if (APP_LOOKUP_METHOD == APP_LOOKUP_LPM)
 static inline __attribute__((always_inline)) void
 send_packetsx4(struct lcore_conf *qconf, uint8_t port,
        struct rte_mbuf *m[], uint32_t num)
@@ -618,6 +619,7 @@ send_packetsx4(struct lcore_conf *qconf, uint8_t port,
 
        qconf->tx_mbufs[port].len = len;
 }
+#endif /* APP_LOOKUP_LPM */
 
 #ifdef DO_RFC_1812_CHECKS
 static inline int
@@ -1138,6 +1140,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon
 #endif
 }
 
+#if ((APP_LOOKUP_METHOD == APP_LOOKUP_LPM) && \
+       (ENABLE_MULTI_BUFFER_OPTIMIZE == 1))
 #ifdef DO_RFC_1812_CHECKS
 
 #define        IPV4_MIN_VER_IHL        0x45
@@ -1188,6 +1192,7 @@ rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t flags)
 #else
 #define        rfc1812_process(mb, dp) do { } while (0)
 #endif /* DO_RFC_1812_CHECKS */
+#endif /* APP_LOOKUP_LPM && ENABLE_MULTI_BUFFER_OPTIMIZE */
 
 
 #if ((APP_LOOKUP_METHOD == APP_LOOKUP_LPM) && \