From patchwork Wed Sep 6 11:28:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shukla X-Patchwork-Id: 28412 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 82E7C2C13; Wed, 6 Sep 2017 13:29:20 +0200 (CEST) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0059.outbound.protection.outlook.com [104.47.34.59]) by dpdk.org (Postfix) with ESMTP id 1DB742C13 for ; Wed, 6 Sep 2017 13:29:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ur3Y8jyRNyg9K/9L9ogbuuwnNlyzBc+UrVygsbJzMkM=; b=cWNQo3nExZEdeyXlvOFEPh/A/yP2tg/9XHKYhoxWdh2Ex+jOydrBYKRVw7HUq1LXdUG9eJTeRs8E78kO2jtkML8Y/e1qPxC6PKr2gLmT0jdaGfJwqnHCpiHpKE8adRM2+lww8GglvBFKEdFmh1sD4OmgiTDqV7vwTNtf5jUpq9w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Santosh.Shukla@cavium.com; Received: from localhost.localdomain (14.140.2.178) by DM5PR07MB3098.namprd07.prod.outlook.com (10.172.85.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.35.12; Wed, 6 Sep 2017 11:29:13 +0000 From: Santosh Shukla To: olivier.matz@6wind.com, dev@dpdk.org Cc: thomas@monjalon.net, jerin.jacob@caviumnetworks.com, hemant.agrawal@nxp.com, Santosh Shukla Date: Wed, 6 Sep 2017 16:58:27 +0530 Message-Id: <20170906112834.32378-2-santosh.shukla@caviumnetworks.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170906112834.32378-1-santosh.shukla@caviumnetworks.com> References: <20170815060743.21076-1-santosh.shukla@caviumnetworks.com> <20170906112834.32378-1-santosh.shukla@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [14.140.2.178] X-ClientProxiedBy: BM1PR01CA0080.INDPRD01.PROD.OUTLOOK.COM (10.174.208.148) To DM5PR07MB3098.namprd07.prod.outlook.com (10.172.85.8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 269892c5-ccd4-450b-a342-08d4f51a81ba X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:DM5PR07MB3098; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3098; 3:1xycl2N4RMs3dwidIRh77PHge7E6s+2GqF7ObcYjZhkLff7y4opw4o3x2cB2mcXWlMbAba6ECITILI+UJBKiGxnYIqPVR9HQQw2yM1t9+Ba3xtc8zY1vN2CgL5xzvzJtom66z767nYaTJHzGjfZ5Jz9/GHR45YBDz/jEjlzlxVQam/YyVFTaLsRdGnVHDHIRKa6G2kHfifQBdavTOdvO1s5zrT3oL/pzqAPJFyAaychDBDAEXCFVAQuiQL4iHgtq; 25:OKhcxJ+NtupsnVM3dFVbxj65wlv8EjCE/5JUAMsVQ0q2WC/KB2Xz7jTX0LCAXeGHWY4R3x4O+xlPoDrBb0V/XjdIAEg8pi5oSVITcYuLfBBXMa5aQdTOoaBn94xqU2r4j3ckgHr591Ee+PwwyRDPy8g/ysf9u4sVsFVXP/TDQsHCpgtV4+RUONRQ79owDw85uaeiE/bWXlhD0M1Qy8fXiYdTkH9/zEbjpVhLQDC/LlYvCmlWp4WeUKx/AXUFsIFE+u5LaIREYv7yBSgVz6eTybnU+t3DosyrDrrpdRhKszMoGDS+X1yqFqOxJzKtGN7Ssx9MJQdLanRgw+RsRV/SAA==; 31:QWpmIFg0ACcNWaByiljKMSnGWIi5v6xJoU/M6uvVqCGkhwmnieWARwF8RW6CEPYiaHwVLQ70Dl0ngJ01zlRJm3K4xutUInl9xgSpkT7ybEf0SCHIoYVpw4SpPl3TcUgr1EVOyhV03pdMsxoCq4d/rSZ7EWJBM3rQrykdlFn27q5RTvv6lm8udl24gjYArmtQfCuVmwxbVz5k4uNq71wHitgFriuVL5mouu1JvvmOBEs= X-MS-TrafficTypeDiagnostic: DM5PR07MB3098: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3098; 20:Iyuv/st/oBQeq9pqlAtag5qOb3v+wJUba4xGugDl/P4gGDtnfiOwqsuIMgKr4wsq8AO43j39kTbsTgyxlek9RzfqIfqrvMaJPKJFLWruVdGUzMFKbE/hZkdWAa5mExsjBEUSxx+5o4ZqpOPl8Q4WB25e8blggyzaeNR8VZ6bO3RrM2PSOo3uPlbkfEDVTuU6GE98/8SPQ+x2rBLW61fmomMAFeNt6ZskAace91WTBxQwbTAAWKGo83MZJXhI2GZ63xxMJ3ln0YxBb4wO9BQV/V0jReGa8eHG7QDBYikodeA1hvV7QPlhttSven3ADzBtF1FIVGwSvAFH1C2LufuPobfC7Z8JANXauNWlxEQSN+A8w9gq+nOE+e6za0e5pJr4to2El/2G7YEOyEXOh+hL2y5O8/KQ3d7QKRfCfzlt7tlJJE63qTepj6L3KILXaH9mgAaSy8eFiHYDYmC9OZxSmQWiBaafBZavmqqpV/uw7gD4SxTIkMZhoC1eCi9ARPYR5/fJWTwhQLVMslC0MW3sXujOD977TI9WQMW9sNjwSorUIMhWEr31U1U8CveCvCXYKrIahZmAxmtfmU07FYEzBIMVV5T3rQC20dOe1nZM7Ps=; 4:OOtwxCBdTRz9fi5K04Xh52UWG8VrJgYjlRqpoGkV0yHFxhfeuKLwvbvtZBL4+fdwrosNbQVRFPhB8ZxjLmQFi6Wp9qlIUTcFM6mZK9HNugbrLdaG/CBf257kAHA9RWKybi2M8YAdxZ+OlcO5Da9kBtRiEsuCQPqi8V4Dc0IiK/F6MwKq2oKpR5LHKiI2OBN8Ixw6hVp6OBRLweeYNjWvqfpSjWx9+RGfrAEf40eLeVHSxJ4miwn5AfgY9JPaDURg X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(10201501046)(100000703101)(100105400095)(3002001)(6041248)(20161123560025)(20161123558100)(20161123564025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR07MB3098; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR07MB3098; X-Forefront-PRVS: 0422860ED4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(6069001)(189002)(199003)(53936002)(42882006)(2950100002)(6666003)(6506006)(6486002)(6512007)(50986999)(76176999)(106356001)(36756003)(189998001)(42186005)(105586002)(50466002)(8936002)(50226002)(48376002)(33646002)(8676002)(81156014)(81166006)(7736002)(101416001)(305945005)(68736007)(6116002)(3846002)(5003940100001)(1076002)(478600001)(5660300001)(72206003)(2906002)(25786009)(97736004)(4326008)(8656003)(5009440100003)(110136004)(107886003)(66066001)(47776003)(110426004); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3098; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR07MB3098; 23:HeAnHAg98AOMWvY4a/V3CEhsb5lFPc8YsdJbJ9B9/?= jd+v4MWNwjWYqrdJbekentN1RooKKC8tGqjAghz6YtrdsMhXg3cyvgJfFlSN8HgLLxzPJRiUcVCGYBhCFK4YnIP3Bo/dua3pWt1WDObShWbwUqzGHRqNsEn1hLd9+XMf8WcFmJgXof2X4JvRVPIkk4eILkIegtpe5sMFXsQQT0kxKLnFvHHhrvLqOLqAXZS4at7c9RDU/X91s1qdgcW/jFdGW9gFNCuZSHppcvsVSh2QAxqEP77STJRdg7HJZbUDUWBS3VqPe8szrS+BpFeG7efazgT36JYrwe4+fysDciRA7FtW+swWWzyA2SHm12Suxa/NOrr71XPJT9dmj3nuioUv/qVTK4GP3v4PHnZEP7ni/8zp8nBg5xHwvi6BAsMm5Sa3jzLI0/Y9IGngHQgaooce3x8u8VnCXEe0ocFA9w466oB1EXLHG0gBMa8emdGr0Il0UtV0KeVCuta6OdHRSjyQUxwSllY/qJ4fQZU5Qdw2xoociI7Val7on2ow/SfZ75Vhbxvso+u/WhiQg9B/gaS85sDlcHj/yyH5ecdzyvwTn5iMbSR9E8cVAqLTd8ZhhixH/HBpzoV/Lz7zoJv/Yelmthb4QsQr4ktr3sZCoMg79D/NB9CJKln27Lh0/eJCn8h6yFFwTgvUIgl288XX1cT9I0xX/YjhmjlUztCm8u2i+pl0kO4STItb8Fpy+B1v0X4CtEhjR46WwGmWYcRxJo9o0k5evez+zmMOO2Cn55+gkjRPtsPGd3Y+TTrBLZBe4Fc512WultQk2lQmpErSTg4JOUsmZmZcq2CyJHCkYwBl5xtTMgS4skaAQNmtix1ksIwEuWX7o+y5RetaPHfrvADif9Jdig0EJ7Tsy1zQ/VbqVJUfC0KSl7riHAtTNKWakDPwyTdAPA52Fo4qyVMCJSHx6uwoJU2/Un6N2i0+g+WudZ4Y9MgvAB6nsstcGjlaSvV674A4o+DiYWtERuO4Ih9/JECALmwx04YypiCemS3SoA4T5EjcXhD6EtW10ZFlj6OrZ0CeUihEUCtd7DItAi+JO11e+T7mNyoyzZnQbZxcBH4f2OIcfLaKJGwtiwFrZSeHVSTmHewu77z3WAliq2E3RIiRmUJCoZxcSNRoyjh6g== X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3098; 6:7DF9g4iFLLFSLJx+C3B4P7d6ltqc6nMMm8Kgh8mO/F81RBYoTboEBOBw26dVrrZVq7GAAfEh131lQeGFalTUividr5uZaHwbcm6+qHLf2eScziLA9ctuFu+TGA25ybDxIzrqnOUoOSlVKxtMrKEvCOxRCOU+vA8tMWJMrPDgZQ/H9IcibAKnb1aZf6KWG/Djl2GpZDHc1L9wiKeXbI0vkXwb4OO3MJXhTU0p5bbyltG03etkHqxpBOeb/jnnCH4/qUMLvrFbCT0/9Sx4c7m3utsVuzN4NM+WhM5zKEPkocf5qo0ypZnY7kSMX4wPFFlExjU9vwCO4g+6d883j1zB2Q==; 5:S4W7Wxr0KeWTU3dWbFj6RLxPzI1m4h45pCWJp3NIMOHhms+n2t5shtxv13zvX6CHO3ySp8l2R6WQaT8Mwp6bkWlXyXEo+MUjL7hTHsSYylADhzwowk9aw3hRuuwZiitZHGEjFnwisL1ymCvoXmrXFvo52Y38Qs4bwgXH8RTD264=; 24:VRloK88aFRp6zE44Yu7QoybnkB8zXcwyK4jqFqWvwH+Zv/QffB7C1twRgVrICa0LYfHFCE47AwBHILtF+f3rZKbxXo+Ful8s4rgWAzCFMKI=; 7:dKiW6ReM9rSRWMbEdUXl6FTNPHZIMQu32Y61WdPv5neT1jLjFtGc3AIwZq/QA4hIBJBZ45lBEKgsNSjp0X0yIKlDyu462tK+x1+Jl5lbDI9DkO9BNEg+tLciLV3Zsf5OwDG1J+70Dml06eMpZ5bFfC9QFHScoA/LPY+qAGmgkjaL8T7jS6fLXzr8a1dyMC4M5kYvJ4+16RCioJKxBerAN1scXnfE0CPhqTyn6nreBDI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2017 11:29:13.6623 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB3098 Subject: [dpdk-dev] [PATCH v5 1/8] mempool: remove unused flags argument X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" * Remove redundant 'flags' API description from - __mempool_generic_put - __mempool_generic_get - rte_mempool_generic_put - rte_mempool_generic_get * Remove unused 'flags' argument from - rte_mempool_generic_put - rte_mempool_generic_get Signed-off-by: Santosh Shukla Signed-off-by: Jerin Jacob Acked-by: Olivier Matz --- v4 --> v5: - Splitted v4's [01/07] patch and created specific patch for unused flag removal. lib/librte_mempool/rte_mempool.h | 31 +++++++++---------------------- test/test/test_mempool.c | 18 +++++++++--------- test/test/test_mempool_perf.c | 4 ++-- 3 files changed, 20 insertions(+), 33 deletions(-) diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h index 76b5b3b15..ec3884473 100644 --- a/lib/librte_mempool/rte_mempool.h +++ b/lib/librte_mempool/rte_mempool.h @@ -1034,13 +1034,10 @@ rte_mempool_default_cache(struct rte_mempool *mp, unsigned lcore_id) * positive. * @param cache * A pointer to a mempool cache structure. May be NULL if not needed. - * @param flags - * The flags used for the mempool creation. - * Single-producer (MEMPOOL_F_SP_PUT flag) or multi-producers. */ static __rte_always_inline void __mempool_generic_put(struct rte_mempool *mp, void * const *obj_table, - unsigned n, struct rte_mempool_cache *cache) + unsigned int n, struct rte_mempool_cache *cache) { void **cache_objs; @@ -1096,14 +1093,10 @@ __mempool_generic_put(struct rte_mempool *mp, void * const *obj_table, * The number of objects to add in the mempool from the obj_table. * @param cache * A pointer to a mempool cache structure. May be NULL if not needed. - * @param flags - * The flags used for the mempool creation. - * Single-producer (MEMPOOL_F_SP_PUT flag) or multi-producers. */ static __rte_always_inline void rte_mempool_generic_put(struct rte_mempool *mp, void * const *obj_table, - unsigned n, struct rte_mempool_cache *cache, - __rte_unused int flags) + unsigned int n, struct rte_mempool_cache *cache) { __mempool_check_cookies(mp, obj_table, n, 0); __mempool_generic_put(mp, obj_table, n, cache); @@ -1125,11 +1118,11 @@ rte_mempool_generic_put(struct rte_mempool *mp, void * const *obj_table, */ static __rte_always_inline void rte_mempool_put_bulk(struct rte_mempool *mp, void * const *obj_table, - unsigned n) + unsigned int n) { struct rte_mempool_cache *cache; cache = rte_mempool_default_cache(mp, rte_lcore_id()); - rte_mempool_generic_put(mp, obj_table, n, cache, mp->flags); + rte_mempool_generic_put(mp, obj_table, n, cache); } /** @@ -1160,16 +1153,13 @@ rte_mempool_put(struct rte_mempool *mp, void *obj) * The number of objects to get, must be strictly positive. * @param cache * A pointer to a mempool cache structure. May be NULL if not needed. - * @param flags - * The flags used for the mempool creation. - * Single-consumer (MEMPOOL_F_SC_GET flag) or multi-consumers. * @return * - >=0: Success; number of objects supplied. * - <0: Error; code of ring dequeue function. */ static __rte_always_inline int __mempool_generic_get(struct rte_mempool *mp, void **obj_table, - unsigned n, struct rte_mempool_cache *cache) + unsigned int n, struct rte_mempool_cache *cache) { int ret; uint32_t index, len; @@ -1241,16 +1231,13 @@ __mempool_generic_get(struct rte_mempool *mp, void **obj_table, * The number of objects to get from mempool to obj_table. * @param cache * A pointer to a mempool cache structure. May be NULL if not needed. - * @param flags - * The flags used for the mempool creation. - * Single-consumer (MEMPOOL_F_SC_GET flag) or multi-consumers. * @return * - 0: Success; objects taken. * - -ENOENT: Not enough entries in the mempool; no object is retrieved. */ static __rte_always_inline int -rte_mempool_generic_get(struct rte_mempool *mp, void **obj_table, unsigned n, - struct rte_mempool_cache *cache, __rte_unused int flags) +rte_mempool_generic_get(struct rte_mempool *mp, void **obj_table, + unsigned int n, struct rte_mempool_cache *cache) { int ret; ret = __mempool_generic_get(mp, obj_table, n, cache); @@ -1282,11 +1269,11 @@ rte_mempool_generic_get(struct rte_mempool *mp, void **obj_table, unsigned n, * - -ENOENT: Not enough entries in the mempool; no object is retrieved. */ static __rte_always_inline int -rte_mempool_get_bulk(struct rte_mempool *mp, void **obj_table, unsigned n) +rte_mempool_get_bulk(struct rte_mempool *mp, void **obj_table, unsigned int n) { struct rte_mempool_cache *cache; cache = rte_mempool_default_cache(mp, rte_lcore_id()); - return rte_mempool_generic_get(mp, obj_table, n, cache, mp->flags); + return rte_mempool_generic_get(mp, obj_table, n, cache); } /** diff --git a/test/test/test_mempool.c b/test/test/test_mempool.c index 0a4423954..47dc3ac5f 100644 --- a/test/test/test_mempool.c +++ b/test/test/test_mempool.c @@ -129,7 +129,7 @@ test_mempool_basic(struct rte_mempool *mp, int use_external_cache) rte_mempool_dump(stdout, mp); printf("get an object\n"); - if (rte_mempool_generic_get(mp, &obj, 1, cache, 0) < 0) + if (rte_mempool_generic_get(mp, &obj, 1, cache) < 0) GOTO_ERR(ret, out); rte_mempool_dump(stdout, mp); @@ -152,21 +152,21 @@ test_mempool_basic(struct rte_mempool *mp, int use_external_cache) #endif printf("put the object back\n"); - rte_mempool_generic_put(mp, &obj, 1, cache, 0); + rte_mempool_generic_put(mp, &obj, 1, cache); rte_mempool_dump(stdout, mp); printf("get 2 objects\n"); - if (rte_mempool_generic_get(mp, &obj, 1, cache, 0) < 0) + if (rte_mempool_generic_get(mp, &obj, 1, cache) < 0) GOTO_ERR(ret, out); - if (rte_mempool_generic_get(mp, &obj2, 1, cache, 0) < 0) { - rte_mempool_generic_put(mp, &obj, 1, cache, 0); + if (rte_mempool_generic_get(mp, &obj2, 1, cache) < 0) { + rte_mempool_generic_put(mp, &obj, 1, cache); GOTO_ERR(ret, out); } rte_mempool_dump(stdout, mp); printf("put the objects back\n"); - rte_mempool_generic_put(mp, &obj, 1, cache, 0); - rte_mempool_generic_put(mp, &obj2, 1, cache, 0); + rte_mempool_generic_put(mp, &obj, 1, cache); + rte_mempool_generic_put(mp, &obj2, 1, cache); rte_mempool_dump(stdout, mp); /* @@ -178,7 +178,7 @@ test_mempool_basic(struct rte_mempool *mp, int use_external_cache) GOTO_ERR(ret, out); for (i = 0; i < MEMPOOL_SIZE; i++) { - if (rte_mempool_generic_get(mp, &objtable[i], 1, cache, 0) < 0) + if (rte_mempool_generic_get(mp, &objtable[i], 1, cache) < 0) break; } @@ -200,7 +200,7 @@ test_mempool_basic(struct rte_mempool *mp, int use_external_cache) ret = -1; } - rte_mempool_generic_put(mp, &objtable[i], 1, cache, 0); + rte_mempool_generic_put(mp, &objtable[i], 1, cache); } free(objtable); diff --git a/test/test/test_mempool_perf.c b/test/test/test_mempool_perf.c index 07b28c066..3b8f7de7c 100644 --- a/test/test/test_mempool_perf.c +++ b/test/test/test_mempool_perf.c @@ -186,7 +186,7 @@ per_lcore_mempool_test(void *arg) ret = rte_mempool_generic_get(mp, &obj_table[idx], n_get_bulk, - cache, 0); + cache); if (unlikely(ret < 0)) { rte_mempool_dump(stdout, mp); /* in this case, objects are lost... */ @@ -200,7 +200,7 @@ per_lcore_mempool_test(void *arg) while (idx < n_keep) { rte_mempool_generic_put(mp, &obj_table[idx], n_put_bulk, - cache, 0); + cache); idx += n_put_bulk; } }