Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/25057/?format=api
{ "id": 25057, "url": "http://patches.dpdk.org/api/patches/25057/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20170605154901.110312-1-allain.legacy@windriver.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": "<20170605154901.110312-1-allain.legacy@windriver.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20170605154901.110312-1-allain.legacy@windriver.com", "date": "2017-06-05T15:49:01", "name": "[dpdk-dev,v2] ip_frag: free mbufs on reassembly table destroy", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "533b7072bad23a5a5a103096dd9d5155466408dc", "submitter": { "id": 679, "url": "http://patches.dpdk.org/api/people/679/?format=api", "name": "Allain Legacy", "email": "allain.legacy@windriver.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20170605154901.110312-1-allain.legacy@windriver.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/25057/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/25057/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 6E75F7CB8;\n\tMon, 5 Jun 2017 17:49:11 +0200 (CEST)", "from mail1.windriver.com (mail1.windriver.com [147.11.146.13])\n\tby dpdk.org (Postfix) with ESMTP id 6C3697CB6\n\tfor <dev@dpdk.org>; Mon, 5 Jun 2017 17:49:09 +0200 (CEST)", "from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com\n\t[147.11.189.40])\n\tby mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id v55Fn86T025873\n\t(version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL);\n\tMon, 5 Jun 2017 08:49:08 -0700 (PDT)", "from yow-cgts4-lx.wrs.com (128.224.145.137) by\n\tALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server\n\t(TLS) id 14.3.294.0; Mon, 5 Jun 2017 08:49:07 -0700" ], "From": "Allain Legacy <allain.legacy@windriver.com>", "To": "<konstantin.ananyev@intel.com>", "CC": "<dev@dpdk.org>, Dahir Osman <dahir.osman@windriver.com>", "Date": "Mon, 5 Jun 2017 11:49:01 -0400", "Message-ID": "<20170605154901.110312-1-allain.legacy@windriver.com>", "X-Mailer": "git-send-email 2.12.1", "In-Reply-To": "<20170425170450.173221-1-allain.legacy@windriver.com>", "References": "<20170425170450.173221-1-allain.legacy@windriver.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[128.224.145.137]", "Subject": "[dpdk-dev] [PATCH v2] ip_frag: free mbufs on reassembly table\n\tdestroy", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\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>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Dahir Osman <dahir.osman@windriver.com>\n\nThe rte_ip_frag_table_destroy procedure simply releases the memory for the\ntable without freeing the packet buffers that may be referenced in the hash\ntable for in-flight or incomplete packet reassembly operations. To prevent\nleaked mbufs go through the list of fragments and free each one\nindividually.\n\nFixes: 416707812c03 (\"ip_frag: refactor reassembly code into a proper library\")\n\nReported-by: Matt Peters <matt.peters@windriver.com>\nSigned-off-by: Allain Legacy <allain.legacy@windriver.com>\n---\n lib/librte_ip_frag/ip_frag_common.h | 20 ++++++++++++++++++++\n lib/librte_ip_frag/rte_ip_frag.h | 7 ++-----\n lib/librte_ip_frag/rte_ip_frag_common.c | 13 +++++++++++++\n lib/librte_ip_frag/rte_ipfrag_version.map | 7 +++++++\n 4 files changed, 42 insertions(+), 5 deletions(-)", "diff": "diff --git a/lib/librte_ip_frag/ip_frag_common.h b/lib/librte_ip_frag/ip_frag_common.h\nindex 835e4f93f..9f5619651 100644\n--- a/lib/librte_ip_frag/ip_frag_common.h\n+++ b/lib/librte_ip_frag/ip_frag_common.h\n@@ -130,6 +130,26 @@ ip_frag_free(struct ip_frag_pkt *fp, struct rte_ip_frag_death_row *dr)\n \tdr->cnt = k;\n }\n \n+/* delete fragment's mbufs immediately instead of using death row */\n+static inline void\n+ip_frag_free_immediate(struct ip_frag_pkt *fp)\n+{\n+\tuint32_t i;\n+\n+\tfor (i = 0; i < fp->last_idx; i++) {\n+\t\tif (fp->frags[i].mb != NULL) {\n+\t\t\tIP_FRAG_LOG(DEBUG, \"%s:%d\\n\"\n+\t\t\t \"mbuf: %p, tms: %\" PRIu64\", key: <%\" PRIx64 \", %#x>\\n\",\n+\t\t\t __func__, __LINE__, fp->frags[i].mb, fp->start,\n+\t\t\t fp->key.src_dst[0], fp->key.id);\n+\t\t\trte_pktmbuf_free(fp->frags[i].mb);\n+\t\t\tfp->frags[i].mb = NULL;\n+\t\t}\n+\t}\n+\n+\tfp->last_idx = 0;\n+}\n+\n /* if key is empty, mark key as in use */\n static inline void\n ip_frag_inuse(struct rte_ip_frag_tbl *tbl, const struct ip_frag_pkt *fp)\ndiff --git a/lib/librte_ip_frag/rte_ip_frag.h b/lib/librte_ip_frag/rte_ip_frag.h\nindex 6708906d3..ff16f4c52 100644\n--- a/lib/librte_ip_frag/rte_ip_frag.h\n+++ b/lib/librte_ip_frag/rte_ip_frag.h\n@@ -180,11 +180,8 @@ struct rte_ip_frag_tbl * rte_ip_frag_table_create(uint32_t bucket_num,\n * @param tbl\n * Fragmentation table to free.\n */\n-static inline void\n-rte_ip_frag_table_destroy(struct rte_ip_frag_tbl *tbl)\n-{\n-\trte_free(tbl);\n-}\n+void\n+rte_ip_frag_table_destroy(struct rte_ip_frag_tbl *tbl);\n \n /**\n * This function implements the fragmentation of IPv6 packets.\ndiff --git a/lib/librte_ip_frag/rte_ip_frag_common.c b/lib/librte_ip_frag/rte_ip_frag_common.c\nindex 6176ff4e0..8460f8e83 100644\n--- a/lib/librte_ip_frag/rte_ip_frag_common.c\n+++ b/lib/librte_ip_frag/rte_ip_frag_common.c\n@@ -109,6 +109,19 @@ rte_ip_frag_table_create(uint32_t bucket_num, uint32_t bucket_entries,\n \treturn tbl;\n }\n \n+/* delete fragmentation table */\n+void\n+rte_ip_frag_table_destroy(struct rte_ip_frag_tbl *tbl)\n+{\n+\tstruct ip_frag_pkt *fp;\n+\n+\tTAILQ_FOREACH(fp, &tbl->lru, lru) {\n+\t\tip_frag_free_immediate(fp);\n+\t}\n+\n+\trte_free(tbl);\n+}\n+\n /* dump frag table statistics to file */\n void\n rte_ip_frag_table_statistics_dump(FILE *f, const struct rte_ip_frag_tbl *tbl)\ndiff --git a/lib/librte_ip_frag/rte_ipfrag_version.map b/lib/librte_ip_frag/rte_ipfrag_version.map\nindex 354fa0822..d1acf07cb 100644\n--- a/lib/librte_ip_frag/rte_ipfrag_version.map\n+++ b/lib/librte_ip_frag/rte_ipfrag_version.map\n@@ -11,3 +11,10 @@ DPDK_2.0 {\n \n \tlocal: *;\n };\n+\n+DPDK_17.08 {\n+ global:\n+\n+ rte_ip_frag_table_destroy;\n+\n+} DPDK_2.0;\n", "prefixes": [ "dpdk-dev", "v2" ] }