From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id 88141100C for ; Mon, 30 Apr 2018 16:44:41 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id 94-v6so6971699wrf.5 for ; Mon, 30 Apr 2018 07:44:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lE7MmXB0bRd3NkaazpFEZEjNdQj/eCNH6uIXeF1Yc6A=; b=LNMLRpB6ey8Jmly6PdYTPurnWVXROl4ZZqjuw6UCDHZTrpUufLskmy6K6qQA+anrPP lk9pMUjf4kr09Xb4TyCvgURma0JBnmmZoukss+sZMPN2BBTWW4LsWc1fQnwC9mAC3RAo 2EnaKjc+QUOJ3VOOGdwhVG+OArdDFj2709YbFaV8cSUkLCNzcfICsPaZMr8POCnA7vY8 P1eyLBDvaylkS/KhVrJppCc3rrzQHAnVJqVC1VQPRuznbyuGlCtmMiRKkQWZ1lt0Zwht QhbppBr4MSsXOkR8HKqU5aXBBn3rtHJh9Wrdq2MAuUpLwOICJvFdTbD6G5cyyrm9k4Ty HtCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lE7MmXB0bRd3NkaazpFEZEjNdQj/eCNH6uIXeF1Yc6A=; b=aaP0ewATOw0IbLDOFFS2W0A+wQklWunv/tLNkDiC96hZmvloY2vuOTLrpXANO3jp3D 3YlKYZ3UdzCLye2eeuiLRA6Vf6CUeIa07U1jFXx/kYkJPPN5ZnejE8y9+Ig+pvNTCgdB oMtcchdhrofWWS7HgScROxyjdyNvWBzYlTiYpxXKzg52XZhD4LOiQGhd6+nMWKx5XEwz Cb/HRlYVXWuHLRJaqqW2ZEQlI7BJygROmWd7XblfinCoZDEzW4JMqXLTYPpNf8JYAkl8 gfhbv/BZ7LDVOjQUjZ/nN+DaBejPl3W1MtDNFMLIJS99oVMYtyjLWjalTwEjAqDbWdXv dFGQ== X-Gm-Message-State: ALQs6tCD1NWtlxcuImYBW/g/RwGjKTAqMGG8gu2aQc1ceb1Ff4PsvqFx /H2fll5radmv+88FRa5vVsWk4yiHkjM= X-Google-Smtp-Source: AB8JxZpWO3KJWbzPRIyA9mWop4w/267F0T5vX4JFXJcRjEeS0Kcw+h6MFDC0nn0yMQPg0ebzg4WMkA== X-Received: by 2002:adf:86ed:: with SMTP id 42-v6mr9699626wry.158.1525099481127; Mon, 30 Apr 2018 07:44:41 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id o10-v6sm7426146wrg.90.2018.04.30.07.44.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Apr 2018 07:44:40 -0700 (PDT) From: luca.boccassi@gmail.com To: Andrew Rybchenko Cc: dpdk stable Date: Mon, 30 Apr 2018 15:41:40 +0100 Message-Id: <20180430144223.18657-85-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180430144223.18657-1-luca.boccassi@gmail.com> References: <20180430140606.4615-80-luca.boccassi@gmail.com> <20180430144223.18657-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'test/mempool: fix autotest retry' has been queued to stable release 18.02.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Apr 2018 14:44:41 -0000 Hi, FYI, your patch has been queued to stable release 18.02.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/02/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 1db719e857f817509ded54c2be68570066dc6665 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Wed, 25 Apr 2018 18:00:37 +0100 Subject: [PATCH] test/mempool: fix autotest retry [ upstream commit 2d645858a93e21a41e84928d4fb869318c3639a6 ] Single producer / single consumer mempool handle is stored in static variable and the mempool allocated if stored value is NULL. If the mempool is freed, NULL should be restored to make sure that the mempool is allocated once again next time when the test is run. Fixes: 8ef772aee072 ("app/test: rework mempool test") Signed-off-by: Andrew Rybchenko --- test/test/test_mempool.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/test/test/test_mempool.c b/test/test/test_mempool.c index 63f921e26..1f5610575 100644 --- a/test/test/test_mempool.c +++ b/test/test/test_mempool.c @@ -327,17 +327,17 @@ test_mempool_sp_sc(void) } if (rte_mempool_lookup("test_mempool_sp_sc") != mp_spsc) { printf("Cannot lookup mempool from its name\n"); - rte_mempool_free(mp_spsc); - RET_ERR(); + ret = -1; + goto err; } lcore_next = rte_get_next_lcore(lcore_id, 0, 1); if (lcore_next >= RTE_MAX_LCORE) { - rte_mempool_free(mp_spsc); - RET_ERR(); + ret = -1; + goto err; } if (rte_eal_lcore_role(lcore_next) != ROLE_RTE) { - rte_mempool_free(mp_spsc); - RET_ERR(); + ret = -1; + goto err; } rte_spinlock_init(&scsp_spinlock); memset(scsp_obj_table, 0, sizeof(scsp_obj_table)); @@ -348,7 +348,10 @@ test_mempool_sp_sc(void) if (rte_eal_wait_lcore(lcore_next) < 0) ret = -1; + +err: rte_mempool_free(mp_spsc); + mp_spsc = NULL; return ret; } -- 2.14.2