mbuf: remove build option to disable refcnt

[dpdk.git] / examples / vhost / main.c

diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index a397eae..334e2fe 100644 (file)
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -139,6 +139,8 @@
 /* Number of descriptors per cacheline. */
 #define DESC_PER_CACHELINE (RTE_CACHE_LINE_SIZE / sizeof(struct vring_desc))
 
+#define MBUF_EXT_MEM(mb)   (RTE_MBUF_FROM_BADDR((mb)->buf_addr) != (mb))
+
 /* mask of enabled ports */
 static uint32_t enabled_port_mask = 0;
 
@@ -745,19 +747,6 @@ us_vhost_parse_args(int argc, char **argv)
                                        return -1;
                                } else
                                        zero_copy = ret;
-
-                               if (zero_copy) {
-#ifdef RTE_MBUF_REFCNT
-                                       RTE_LOG(ERR, VHOST_CONFIG, "Before running "
-                                       "zero copy vhost APP, please "
-                                       "disable RTE_MBUF_REFCNT\n"
-                                       "in config file and then rebuild DPDK "
-                                       "core lib!\n"
-                                       "Otherwise please disable zero copy "
-                                       "flag in command line!\n");
-                                       return -1;
-#endif
-                               }
                        }
 
                        /* Specify the descriptor number on RX. */
@@ -1601,7 +1590,7 @@ txmbuf_clean_zcp(struct virtio_net *dev, struct vpool *vpool)
 
        for (index = 0; index < mbuf_count; index++) {
                mbuf = __rte_mbuf_raw_alloc(vpool->pool);
-               if (likely(RTE_MBUF_INDIRECT(mbuf)))
+               if (likely(MBUF_EXT_MEM(mbuf)))
                        pktmbuf_detach_zcp(mbuf);
                rte_ring_sp_enqueue(vpool->ring, mbuf);
 
@@ -1664,7 +1653,7 @@ static void mbuf_destroy_zcp(struct vpool *vpool)
        for (index = 0; index < mbuf_count; index++) {
                mbuf = __rte_mbuf_raw_alloc(vpool->pool);
                if (likely(mbuf != NULL)) {
-                       if (likely(RTE_MBUF_INDIRECT(mbuf)))
+                       if (likely(MBUF_EXT_MEM(mbuf)))
                                pktmbuf_detach_zcp(mbuf);
                        rte_ring_sp_enqueue(vpool->ring, (void *)mbuf);
                }