From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 81173A051C for ; Tue, 11 Feb 2020 12:30:36 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 78AF72BE9; Tue, 11 Feb 2020 12:30:36 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 672DE2BE9 for ; Tue, 11 Feb 2020 12:30:35 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id r11so8659464wrq.10 for ; Tue, 11 Feb 2020 03:30:35 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=8u3D1aT55DTzElWYoDydJ0lfiiTJAyix2/so1aOcBHk=; b=OCGStFa43vfs/2k3xR1Dg0gMit8HQjRGdIxeUKpTVR1l31fEXqWV6NJVJopEGkJjvw G2TFUPSGAaWZGUi1ilGIDkuPmSU8waiunK8y6krbfs5eCYdImenYUlkdncWnUr8qLBip iJtj74moKwSwB5IGx9AKHgCBqY1O1s7OG5nubvI7bv88MNiplNGPiQRqChBxlrrrqrvb XqJCFBXKlKVli0GyrPXnam8s9Yw71e8wrgwWyFYMEcRxt7nL/kU6v6PDWJomYpQXw/+P n59t9GuJdoIaRKAl9ZyiDoPJw+0OsSYYY7lkxPiZz0AxiOJ+LyQ5yELRp3N6Cu2sNlBl Pq/Q== 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:mime-version:content-transfer-encoding; bh=8u3D1aT55DTzElWYoDydJ0lfiiTJAyix2/so1aOcBHk=; b=m8csHQloYlXvZ/kJnKu3X7VrEs1wY36KP3KoEvWekFRJaogPqS3mVZyZsAhn4eEEG1 ypXNLVSS+Pmx/9dya8ijvIYpoPcmxchJRFJhqmMd6984KfDR1CDTToXdnJHUN3zNrF8I hbVeF6b3k0MPWG2EXtivWf6gI8m+KsNYyWUYRJFUd8CoNP6m3x275RnCYVYDJyysvQbB 1mt7j2o1Acyz1vovUuJ0OJzITiAkZMGx8/Zcff36gmyGPlCCckfv4cZszSTJ+BvKjZVJ oPHqalQiCkOHM8uWVVf8uLy+0yf5qhYaWC85gF0ZJWBbr8Xl1xDsVbCiC8qrH11tGI1E Vtjw== X-Gm-Message-State: APjAAAU2/ezCjFib2Jf2uZfJJqQiu9Ci9JfMy2LQAzeosdL8ODw/f2OK wzt8E3gF3zl+R0hlDSnJeX8= X-Google-Smtp-Source: APXvYqyy8DSjKUOtkXXErlk/1pUnr4g+mHFrrSI6BZysSnq4YiAbH1eyn00oWg/Hqti8ZghcC2EZmA== X-Received: by 2002:adf:f707:: with SMTP id r7mr7881880wrp.194.1581420635056; Tue, 11 Feb 2020 03:30:35 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m9sm4904333wrx.55.2020.02.11.03.30.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:30:34 -0800 (PST) From: luca.boccassi@gmail.com To: Olivier Matz Cc: dpdk stable Date: Tue, 11 Feb 2020 11:20:58 +0000 Message-Id: <20200211112216.3929-112-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'mempool: fix anonymous populate' has been queued to stable release 19.11.1 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 2c3e77b93f9bcfa5004dfa7bfb5e7f54c4ec28a8 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Fri, 17 Jan 2020 15:34:29 +0100 Subject: [PATCH] mempool: fix anonymous populate [ upstream commit f159c61c35ebc6ff18d2c6c2cb07c177935a96e3 ] The documentation says that a negative errno is returned on error, but in most places that's not the case. Fix the documentation and the exceptions in code. The second one (return from populate_virt) also fixes a memory leak. Note that testpmd was using the function correctly. Fixes: aa10457eb4c2 ("mempool: make mempool populate and free api public") Fixes: 6780f72fb82f ("mempool: populate with anonymous memory") Fixes: 66e7ba0bad4c ("mempool: ensure mempool is initialized before populating") Signed-off-by: Olivier Matz --- lib/librte_mempool/rte_mempool.c | 10 +++++++--- lib/librte_mempool/rte_mempool.h | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c index 78d8eb941e..f8d453d21f 100644 --- a/lib/librte_mempool/rte_mempool.c +++ b/lib/librte_mempool/rte_mempool.c @@ -645,8 +645,10 @@ rte_mempool_populate_anon(struct rte_mempool *mp) } ret = mempool_ops_alloc_once(mp); - if (ret != 0) - return ret; + if (ret < 0) { + rte_errno = -ret; + return 0; + } size = get_anon_size(mp); if (size < 0) { @@ -670,8 +672,10 @@ rte_mempool_populate_anon(struct rte_mempool *mp) ret = rte_mempool_populate_virt(mp, addr, size, getpagesize(), rte_mempool_memchunk_anon_free, addr); - if (ret == 0) + if (ret < 0) { + rte_errno = -ret; goto fail; + } return mp->populated_size; diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h index f81152af96..0a1dc6059f 100644 --- a/lib/librte_mempool/rte_mempool.h +++ b/lib/librte_mempool/rte_mempool.h @@ -1167,8 +1167,8 @@ int rte_mempool_populate_default(struct rte_mempool *mp); * A pointer to the mempool structure. * @return * The number of objects added on success. - * On error, the chunk is not added in the memory list of the - * mempool and a negative errno is returned. + * On error, 0 is returned, rte_errno is set, and the chunk is not added in + * the memory list of the mempool. */ int rte_mempool_populate_anon(struct rte_mempool *mp); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:42.688529665 +0000 +++ 0112-mempool-fix-anonymous-populate.patch 2020-02-11 11:17:38.576004638 +0000 @@ -1,8 +1,10 @@ -From f159c61c35ebc6ff18d2c6c2cb07c177935a96e3 Mon Sep 17 00:00:00 2001 +From 2c3e77b93f9bcfa5004dfa7bfb5e7f54c4ec28a8 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Fri, 17 Jan 2020 15:34:29 +0100 Subject: [PATCH] mempool: fix anonymous populate +[ upstream commit f159c61c35ebc6ff18d2c6c2cb07c177935a96e3 ] + The documentation says that a negative errno is returned on error, but in most places that's not the case. @@ -14,7 +16,6 @@ Fixes: aa10457eb4c2 ("mempool: make mempool populate and free api public") Fixes: 6780f72fb82f ("mempool: populate with anonymous memory") Fixes: 66e7ba0bad4c ("mempool: ensure mempool is initialized before populating") -Cc: stable@dpdk.org Signed-off-by: Olivier Matz ---