Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/254/?format=api
{ "id": 254, "url": "http://patches.dpdk.org/api/patches/254/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1409154628-30825-3-git-send-email-bruce.richardson@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1409154628-30825-3-git-send-email-bruce.richardson@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1409154628-30825-3-git-send-email-bruce.richardson@intel.com", "date": "2014-08-27T15:50:24", "name": "[dpdk-dev,2/6] mbuf: rename RTE_MBUF_SCATTER_GATHER into RTE_MBUF_REFCNT", "commit_ref": "", "pull_url": "", "state": "superseded", "archived": true, "hash": "b98b3a578f324db4cc9f13b94fb7ef9ef2163ea3", "submitter": { "id": 20, "url": "http://patches.dpdk.org/api/people/20/?format=api", "name": "Bruce Richardson", "email": "bruce.richardson@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1409154628-30825-3-git-send-email-bruce.richardson@intel.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/254/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/254/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<bricha3@ecsmtp.ir.intel.com>", "Received": [ "from mga01.intel.com (mga01.intel.com [192.55.52.88])\r\n\tby dpdk.org (Postfix) with ESMTP id BE209B387\r\n\tfor <dev@dpdk.org>; Wed, 27 Aug 2014 17:46:44 +0200 (CEST)", "from fmsmga003.fm.intel.com ([10.253.24.29])\r\n\tby fmsmga101.fm.intel.com with ESMTP; 27 Aug 2014 08:50:36 -0700", "from irvmail001.ir.intel.com ([163.33.26.43])\r\n\tby FMSMGA003.fm.intel.com with ESMTP; 27 Aug 2014 08:46:17 -0700", "from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com\r\n\t[10.237.217.46])\r\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\r\n\ts7RFoTEj026036; Wed, 27 Aug 2014 16:50:29 +0100", "from sivswdev02.ir.intel.com (localhost [127.0.0.1])\r\n\tby sivswdev02.ir.intel.com with ESMTP id s7RFoT6n031303;\r\n\tWed, 27 Aug 2014 16:50:29 +0100", "(from bricha3@localhost)\r\n\tby sivswdev02.ir.intel.com with id s7RFoSrk031299;\r\n\tWed, 27 Aug 2014 16:50:28 +0100" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"4.97,862,1389772800\"; d=\"scan'208\";a=\"377699011\"", "From": "Bruce Richardson <bruce.richardson@intel.com>", "To": "dev@dpdk.org", "Date": "Wed, 27 Aug 2014 16:50:24 +0100", "Message-Id": "<1409154628-30825-3-git-send-email-bruce.richardson@intel.com>", "X-Mailer": "git-send-email 1.7.0.7", "In-Reply-To": "<1409154628-30825-1-git-send-email-bruce.richardson@intel.com>", "References": "<1409154628-30825-1-git-send-email-bruce.richardson@intel.com>", "Subject": "[dpdk-dev] [PATCH 2/6] mbuf: rename RTE_MBUF_SCATTER_GATHER into\r\n\tRTE_MBUF_REFCNT", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\r\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\r\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "X-List-Received-Date": "Wed, 27 Aug 2014 15:46:46 -0000" }, "content": "From: Olivier Matz <olivier.matz@6wind.com>\n\nIt seems that RTE_MBUF_SCATTER_GATHER is not the proper name for the\nfeature it provides. \"Scatter gather\" means that data is stored using\nseveral buffers. RTE_MBUF_REFCNT seems to be a better name for that\nfeature as it provides a reference counter for mbufs.\n\nThe macro RTE_MBUF_SCATTER_GATHER is poisoned to ensure this\nmodification is seen by drivers or applications using it.\n\nSigned-off-by: Olivier Matz <olivier.matz@6wind.com>\nSigned-off-by: Bruce Richardson <bruce.richardson@intel.com>\n---\n app/test/test_mbuf.c | 16 ++++++++--------\n config/common_bsdapp | 2 +-\n config/common_linuxapp | 2 +-\n doc/doxy-api.conf | 2 +-\n examples/Makefile | 4 ++--\n examples/ip_fragmentation/Makefile | 4 ++--\n examples/ip_pipeline/Makefile | 2 +-\n examples/ip_pipeline/main.c | 2 +-\n examples/ipv4_multicast/Makefile | 4 ++--\n examples/vhost/main.c | 4 ++--\n lib/librte_mbuf/rte_mbuf.c | 2 +-\n lib/librte_mbuf/rte_mbuf.h | 35 +++++++++++++++++++----------------\n lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c | 4 ++--\n lib/librte_port/Makefile | 4 ++--\n 14 files changed, 45 insertions(+), 42 deletions(-)", "diff": "diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c\r\nindex 2b87521..678c382 100644\r\n--- a/app/test/test_mbuf.c\r\n+++ b/app/test/test_mbuf.c\r\n@@ -82,7 +82,7 @@\r\n static struct rte_mempool *pktmbuf_pool = NULL;\r\n static struct rte_mempool *ctrlmbuf_pool = NULL;\r\n \r\n-#if defined RTE_MBUF_SCATTER_GATHER && defined RTE_MBUF_REFCNT_ATOMIC\r\n+#if defined RTE_MBUF_REFCNT && defined RTE_MBUF_REFCNT_ATOMIC\r\n \r\n static struct rte_mempool *refcnt_pool = NULL;\r\n static struct rte_ring *refcnt_mbuf_ring = NULL;\r\n@@ -365,7 +365,7 @@ fail:\r\n static int\r\n testclone_testupdate_testdetach(void)\r\n {\r\n-#ifndef RTE_MBUF_SCATTER_GATHER\r\n+#ifndef RTE_MBUF_REFCNT\r\n \treturn 0;\r\n #else\r\n \tstruct rte_mbuf *mc = NULL;\r\n@@ -406,7 +406,7 @@ fail:\r\n \tif (mc)\r\n \t\trte_pktmbuf_free(mc);\r\n \treturn -1;\r\n-#endif /* RTE_MBUF_SCATTER_GATHER */\r\n+#endif /* RTE_MBUF_REFCNT */\r\n }\r\n #undef GOTO_FAIL\r\n \r\n@@ -439,7 +439,7 @@ test_pktmbuf_pool(void)\r\n \t\tprintf(\"Error pool not empty\");\r\n \t\tret = -1;\r\n \t}\r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \textra = rte_pktmbuf_clone(m[0], pktmbuf_pool);\r\n \tif(extra != NULL) {\r\n \t\tprintf(\"Error pool not empty\");\r\n@@ -548,11 +548,11 @@ test_pktmbuf_free_segment(void)\r\n /*\r\n * Stress test for rte_mbuf atomic refcnt.\r\n * Implies that:\r\n- * RTE_MBUF_SCATTER_GATHER and RTE_MBUF_REFCNT_ATOMIC are both defined.\r\n+ * RTE_MBUF_REFCNT and RTE_MBUF_REFCNT_ATOMIC are both defined.\r\n * For more efficency, recomended to run with RTE_LIBRTE_MBUF_DEBUG defined.\r\n */\r\n \r\n-#if defined RTE_MBUF_SCATTER_GATHER && defined RTE_MBUF_REFCNT_ATOMIC\r\n+#if defined RTE_MBUF_REFCNT && defined RTE_MBUF_REFCNT_ATOMIC\r\n \r\n static int\r\n test_refcnt_slave(__attribute__((unused)) void *arg)\r\n@@ -657,7 +657,7 @@ test_refcnt_master(void)\r\n static int\r\n test_refcnt_mbuf(void)\r\n {\r\n-#if defined RTE_MBUF_SCATTER_GATHER && defined RTE_MBUF_REFCNT_ATOMIC\r\n+#if defined RTE_MBUF_REFCNT && defined RTE_MBUF_REFCNT_ATOMIC\r\n \r\n \tunsigned lnum, master, slave, tref;\r\n \r\n@@ -808,7 +808,7 @@ test_failing_mbuf_sanity_check(void)\r\n \t\treturn -1;\r\n \t}\r\n \r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \tbadbuf = *buf;\r\n \tbadbuf.refcnt = 0;\r\n \tif (verify_mbuf_check_panics(&badbuf)) {\r\ndiff --git a/config/common_bsdapp b/config/common_bsdapp\r\nindex bf6d8a0..645949f 100644\r\n--- a/config/common_bsdapp\r\n+++ b/config/common_bsdapp\r\n@@ -249,7 +249,7 @@ CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG=n\r\n #\r\n CONFIG_RTE_LIBRTE_MBUF=y\r\n CONFIG_RTE_LIBRTE_MBUF_DEBUG=n\r\n-CONFIG_RTE_MBUF_SCATTER_GATHER=y\r\n+CONFIG_RTE_MBUF_REFCNT=y\r\n CONFIG_RTE_MBUF_REFCNT_ATOMIC=y\r\n CONFIG_RTE_PKTMBUF_HEADROOM=128\r\n \r\ndiff --git a/config/common_linuxapp b/config/common_linuxapp\r\nindex 9047975..5bee910 100644\r\n--- a/config/common_linuxapp\r\n+++ b/config/common_linuxapp\r\n@@ -277,7 +277,7 @@ CONFIG_RTE_LIBRTE_MEMPOOL_DEBUG=n\r\n #\r\n CONFIG_RTE_LIBRTE_MBUF=y\r\n CONFIG_RTE_LIBRTE_MBUF_DEBUG=n\r\n-CONFIG_RTE_MBUF_SCATTER_GATHER=y\r\n+CONFIG_RTE_MBUF_REFCNT=y\r\n CONFIG_RTE_MBUF_REFCNT_ATOMIC=y\r\n CONFIG_RTE_PKTMBUF_HEADROOM=128\r\n \r\ndiff --git a/doc/doxy-api.conf b/doc/doxy-api.conf\r\nindex 1fd4492..63dc64d 100644\r\n--- a/doc/doxy-api.conf\r\n+++ b/doc/doxy-api.conf\r\n@@ -56,7 +56,7 @@ FILE_PATTERNS = rte_*.h \\\r\n cmdline.h\r\n PREDEFINED = __DOXYGEN__ \\\r\n __attribute__(x)= \\\r\n- RTE_MBUF_SCATTER_GATHER\r\n+ RTE_MBUF_REFCNT\r\n \r\n OPTIMIZE_OUTPUT_FOR_C = YES\r\n ENABLE_PREPROCESSING = YES\r\ndiff --git a/examples/Makefile b/examples/Makefile\r\nindex dc85cf3..6245f83 100644\r\n--- a/examples/Makefile\r\n+++ b/examples/Makefile\r\n@@ -45,8 +45,8 @@ DIRS-y += exception_path\r\n DIRS-y += helloworld\r\n DIRS-y += ip_pipeline\r\n DIRS-y += ip_reassembly\r\n-DIRS-$(CONFIG_RTE_MBUF_SCATTER_GATHER) += ip_fragmentation\r\n-DIRS-$(CONFIG_RTE_MBUF_SCATTER_GATHER) += ipv4_multicast\r\n+DIRS-$(CONFIG_RTE_MBUF_REFCNT) += ip_fragmentation\r\n+DIRS-$(CONFIG_RTE_MBUF_REFCNT) += ipv4_multicast\r\n DIRS-$(CONFIG_RTE_LIBRTE_KNI) += kni\r\n DIRS-y += l2fwd\r\n DIRS-$(CONFIG_RTE_LIBRTE_IVSHMEM) += l2fwd-ivshmem\r\ndiff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation/Makefile\r\nindex 6d729f0..ea0e11f 100644\r\n--- a/examples/ip_fragmentation/Makefile\r\n+++ b/examples/ip_fragmentation/Makefile\r\n@@ -39,8 +39,8 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc\r\n \r\n include $(RTE_SDK)/mk/rte.vars.mk\r\n \r\n-ifneq ($(CONFIG_RTE_MBUF_SCATTER_GATHER),y)\r\n-$(error This application requires RTE_MBUF_SCATTER_GATHER to be enabled)\r\n+ifneq ($(CONFIG_RTE_MBUF_REFCNT),y)\r\n+$(error This application requires RTE_MBUF_REFCNT to be enabled)\r\n endif\r\n \r\n # binary name\r\ndiff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile\r\nindex a807ee8..b0a4106 100644\r\n--- a/examples/ip_pipeline/Makefile\r\n+++ b/examples/ip_pipeline/Makefile\r\n@@ -52,7 +52,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_flow_classification.c\r\n SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_routing.c\r\n SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_passthrough.c\r\n \r\n-ifeq ($(CONFIG_RTE_MBUF_SCATTER_GATHER),y)\r\n+ifeq ($(CONFIG_RTE_MBUF_REFCNT),y)\r\n SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_ipv4_frag.c\r\n SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += pipeline_ipv4_ras.c\r\n endif\r\ndiff --git a/examples/ip_pipeline/main.c b/examples/ip_pipeline/main.c\r\nindex f773958..e19412f 100644\r\n--- a/examples/ip_pipeline/main.c\r\n+++ b/examples/ip_pipeline/main.c\r\n@@ -148,7 +148,7 @@ app_lcore_main_loop(__attribute__((unused)) void *arg)\r\n \t\t\trte_exit(EXIT_FAILURE, \"ACL not present in build\\n\");\r\n #endif\r\n \r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \t\tcase APP_CORE_IPV4_FRAG:\r\n \t\t\tapp_main_loop_pipeline_ipv4_frag();\r\n \t\t\treturn 0;\r\ndiff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile\r\nindex 191574b..604cebe 100644\r\n--- a/examples/ipv4_multicast/Makefile\r\n+++ b/examples/ipv4_multicast/Makefile\r\n@@ -39,8 +39,8 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc\r\n \r\n include $(RTE_SDK)/mk/rte.vars.mk\r\n \r\n-ifneq ($(CONFIG_RTE_MBUF_SCATTER_GATHER),y)\r\n-$(error This application requires RTE_MBUF_SCATTER_GATHER to be enabled)\r\n+ifneq ($(CONFIG_RTE_MBUF_REFCNT),y)\r\n+$(error This application requires RTE_MBUF_REFCNT to be enabled)\r\n endif\r\n \r\n # binary name\r\ndiff --git a/examples/vhost/main.c b/examples/vhost/main.c\r\nindex 193aa25..fe28912 100644\r\n--- a/examples/vhost/main.c\r\n+++ b/examples/vhost/main.c\r\n@@ -727,10 +727,10 @@ us_vhost_parse_args(int argc, char **argv)\r\n \t\t\t\t\tzero_copy = ret;\r\n \r\n \t\t\t\tif (zero_copy) {\r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \t\t\t\t\tRTE_LOG(ERR, VHOST_CONFIG, \"Before running \"\r\n \t\t\t\t\t\"zero copy vhost APP, please \"\r\n-\t\t\t\t\t\"disable RTE_MBUF_SCATTER_GATHER\\n\"\r\n+\t\t\t\t\t\"disable RTE_MBUF_REFCNT\\n\"\r\n \t\t\t\t\t\"in config file and then rebuild DPDK \"\r\n \t\t\t\t\t\"core lib!\\n\"\r\n \t\t\t\t\t\"Otherwise please disable zero copy \"\r\ndiff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c\r\nindex 09d8934..a4967e3 100644\r\n--- a/lib/librte_mbuf/rte_mbuf.c\r\n+++ b/lib/librte_mbuf/rte_mbuf.c\r\n@@ -160,7 +160,7 @@ rte_mbuf_sanity_check(const struct rte_mbuf *m, enum rte_mbuf_type t,\r\n \tif (m->buf_addr == NULL)\r\n \t\trte_panic(\"bad virt addr\\n\");\r\n \r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \tuint16_t cnt = rte_mbuf_refcnt_read(m);\r\n \tif ((cnt == 0) || (cnt == UINT16_MAX))\r\n \t\trte_panic(\"bad ref cnt\\n\");\r\ndiff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h\r\nindex 2735f37..fbd1c7b 100644\r\n--- a/lib/librte_mbuf/rte_mbuf.h\r\n+++ b/lib/librte_mbuf/rte_mbuf.h\r\n@@ -67,6 +67,9 @@\r\n extern \"C\" {\r\n #endif\r\n \r\n+/* deprecated feature, renamed in RTE_MBUF_REFCNT */\r\n+#pragma GCC poison RTE_MBUF_SCATTER_GATHER\r\n+\r\n /**\r\n * A control message buffer.\r\n */\r\n@@ -185,7 +188,7 @@ struct rte_mbuf {\r\n \tvoid *buf_addr; /**< Virtual address of segment buffer. */\r\n \tphys_addr_t buf_physaddr; /**< Physical address of segment buffer. */\r\n \tuint16_t buf_len; /**< Length of segment buffer. */\r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \t/**\r\n \t * 16-bit Reference counter.\r\n \t * It should only be accessed using the following functions:\r\n@@ -298,7 +301,7 @@ if (!(exp)) { \\\r\n \r\n #endif /* RTE_LIBRTE_MBUF_DEBUG */\r\n \r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n #ifdef RTE_MBUF_REFCNT_ATOMIC\r\n \r\n /**\r\n@@ -380,14 +383,14 @@ rte_mbuf_refcnt_set(struct rte_mbuf *m, uint16_t new_value)\r\n \t\trte_prefetch0(m); \\\r\n } while (0)\r\n \r\n-#else /* ! RTE_MBUF_SCATTER_GATHER */\r\n+#else /* ! RTE_MBUF_REFCNT */\r\n \r\n /** Mbuf prefetch */\r\n #define RTE_MBUF_PREFETCH_TO_FREE(m) do { } while(0)\r\n \r\n #define rte_mbuf_refcnt_set(m,v) do { } while(0)\r\n \r\n-#endif /* RTE_MBUF_SCATTER_GATHER */\r\n+#endif /* RTE_MBUF_REFCNT */\r\n \r\n \r\n /**\r\n@@ -426,10 +429,10 @@ static inline struct rte_mbuf *__rte_mbuf_raw_alloc(struct rte_mempool *mp)\r\n \tif (rte_mempool_get(mp, &mb) < 0)\r\n \t\treturn NULL;\r\n \tm = (struct rte_mbuf *)mb;\r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \tRTE_MBUF_ASSERT(rte_mbuf_refcnt_read(m) == 0);\r\n \trte_mbuf_refcnt_set(m, 1);\r\n-#endif /* RTE_MBUF_SCATTER_GATHER */\r\n+#endif /* RTE_MBUF_REFCNT */\r\n \treturn (m);\r\n }\r\n \r\n@@ -444,9 +447,9 @@ static inline struct rte_mbuf *__rte_mbuf_raw_alloc(struct rte_mempool *mp)\r\n static inline void __attribute__((always_inline))\r\n __rte_mbuf_raw_free(struct rte_mbuf *m)\r\n {\r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \tRTE_MBUF_ASSERT(rte_mbuf_refcnt_read(m) == 0);\r\n-#endif /* RTE_MBUF_SCATTER_GATHER */\r\n+#endif /* RTE_MBUF_REFCNT */\r\n \trte_mempool_put(m->pool, m);\r\n }\r\n \r\n@@ -506,9 +509,9 @@ static inline struct rte_mbuf *rte_ctrlmbuf_alloc(struct rte_mempool *mp)\r\n static inline void rte_ctrlmbuf_free(struct rte_mbuf *m)\r\n {\r\n \t__rte_mbuf_sanity_check(m, RTE_MBUF_CTRL, 0);\r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \tif (rte_mbuf_refcnt_update(m, -1) == 0)\r\n-#endif /* RTE_MBUF_SCATTER_GATHER */\r\n+#endif /* RTE_MBUF_REFCNT */\r\n \t\t__rte_mbuf_raw_free(m);\r\n }\r\n \r\n@@ -623,7 +626,7 @@ static inline struct rte_mbuf *rte_pktmbuf_alloc(struct rte_mempool *mp)\r\n \treturn (m);\r\n }\r\n \r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \r\n /**\r\n * Attach packet mbuf to another packet mbuf.\r\n@@ -691,7 +694,7 @@ static inline void rte_pktmbuf_detach(struct rte_mbuf *m)\r\n \tm->pkt.data_len = 0;\r\n }\r\n \r\n-#endif /* RTE_MBUF_SCATTER_GATHER */\r\n+#endif /* RTE_MBUF_REFCNT */\r\n \r\n \r\n static inline struct rte_mbuf* __attribute__((always_inline))\r\n@@ -699,7 +702,7 @@ __rte_pktmbuf_prefree_seg(struct rte_mbuf *m)\r\n {\r\n \t__rte_mbuf_sanity_check(m, RTE_MBUF_PKT, 0);\r\n \r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \tif (likely (rte_mbuf_refcnt_read(m) == 1) ||\r\n \t\t\tlikely (rte_mbuf_refcnt_update(m, -1) == 0)) {\r\n \t\tstruct rte_mbuf *md = RTE_MBUF_FROM_BADDR(m->buf_addr);\r\n@@ -717,7 +720,7 @@ __rte_pktmbuf_prefree_seg(struct rte_mbuf *m)\r\n \t\t}\r\n #endif\r\n \t\treturn(m);\r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \t}\r\n \treturn (NULL);\r\n #endif\r\n@@ -761,7 +764,7 @@ static inline void rte_pktmbuf_free(struct rte_mbuf *m)\r\n \t}\r\n }\r\n \r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \r\n /**\r\n * Creates a \"clone\" of the given packet mbuf.\r\n@@ -837,7 +840,7 @@ static inline void rte_pktmbuf_refcnt_update(struct rte_mbuf *m, int16_t v)\r\n \t} while ((m = m->pkt.next) != NULL);\r\n }\r\n \r\n-#endif /* RTE_MBUF_SCATTER_GATHER */\r\n+#endif /* RTE_MBUF_REFCNT */\r\n \r\n /**\r\n * Get the headroom in a packet mbuf.\r\ndiff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c\r\nindex 56dce23..047acf0 100644\r\n--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c\r\n+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c\r\n@@ -385,7 +385,7 @@ ixgbe_tx_free_bufs(struct igb_tx_queue *txq)\r\n \tstruct igb_tx_entry_seq *txsp;\r\n \tuint32_t status;\r\n \tuint32_t n, k;\r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \tuint32_t i;\r\n \tint nb_free = 0;\r\n \tstruct rte_mbuf *m, *free[RTE_IXGBE_TX_MAX_FREE_BUF_SZ];\r\n@@ -408,7 +408,7 @@ ixgbe_tx_free_bufs(struct igb_tx_queue *txq)\r\n \r\n \twhile (n > 0) {\r\n \t\tk = RTE_MIN(n, txsp[n-1].same_pool);\r\n-#ifdef RTE_MBUF_SCATTER_GATHER\r\n+#ifdef RTE_MBUF_REFCNT\r\n \t\tfor (i = 0; i < k; i++) {\r\n \t\t\tm = __rte_pktmbuf_prefree_seg((txep+n-k+i)->mbuf);\r\n \t\t\tif (m != NULL)\r\ndiff --git a/lib/librte_port/Makefile b/lib/librte_port/Makefile\r\nindex 28793a5..82b5192 100644\r\n--- a/lib/librte_port/Makefile\r\n+++ b/lib/librte_port/Makefile\r\n@@ -45,7 +45,7 @@ CFLAGS += $(WERROR_FLAGS)\r\n SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ethdev.c\r\n SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ring.c\r\n ifeq ($(CONFIG_RTE_LIBRTE_IP_FRAG),y)\r\n-ifeq ($(CONFIG_RTE_MBUF_SCATTER_GATHER),y)\r\n+ifeq ($(CONFIG_RTE_MBUF_REFCNT),y)\r\n SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_frag.c\r\n endif\r\n SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ras.c\r\n@@ -58,7 +58,7 @@ SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port.h\r\n SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ethdev.h\r\n SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ring.h\r\n ifeq ($(CONFIG_RTE_LIBRTE_IP_FRAG),y)\r\n-ifeq ($(CONFIG_RTE_MBUF_SCATTER_GATHER),y)\r\n+ifeq ($(CONFIG_RTE_MBUF_REFCNT),y)\r\n SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_frag.h\r\n endif\r\n SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ras.h\r\n", "prefixes": [ "dpdk-dev", "2/6" ] }