From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 08D30A0350 for ; Mon, 21 Feb 2022 16:40:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0420740DF6; Mon, 21 Feb 2022 16:40:49 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 03AD4410F6 for ; Mon, 21 Feb 2022 16:40:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lWM2HcDVNfOK+QDw/y6niyuQWm1+PUyTai1Gais0fsI=; b=ipxTr9XVvDkK2brouFwjFtlCbpkpDtV4b1bBNSdKKCMqxkEkzU+LSaA5AAlysycB825ift 5Cx+HnpSMesX+rhYWptYmOYn+DglZabtmnTGAU8dVIDnXG6IgzThAXwYIXRlEDoDzu+Gjm n6UIvxjM2oGrLWntRv7T+gEs+mRNGqI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-303-YO-vc2ZfPNqHnkF-OCzdrg-1; Mon, 21 Feb 2022 10:40:44 -0500 X-MC-Unique: YO-vc2ZfPNqHnkF-OCzdrg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C7AE71853020; Mon, 21 Feb 2022 15:40:42 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94F757E2C5; Mon, 21 Feb 2022 15:40:41 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Nan Zhou , Konstantin Ananyev , dpdk stable Subject: patch 'ring: fix error code when creating ring' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:11 +0000 Message-Id: <20220221153625.152324-122-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.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/26/22. 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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/8b45a1dea3cf6c20554736f7daa41a5e980703c0 Thanks. Kevin --- >From 8b45a1dea3cf6c20554736f7daa41a5e980703c0 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 10 Jan 2022 17:23:03 +0800 Subject: [PATCH] ring: fix error code when creating ring [ upstream commit 074717be3ef9e7a8868b5af078b0ca7b61bcc44b ] The error value returned by rte_ring_create_elem() should be positive integers. However, if the rte_ring_get_memsize_elem() function fails, a negative number is returned and is directly used as the return value. As a result, this will cause the external call to check the return value to fail(like called by rte_mempool_create()). Fixes: a182620042aa ("ring: get size in memory") Reported-by: Nan Zhou Signed-off-by: Yunjian Wang Acked-by: Konstantin Ananyev --- lib/ring/rte_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c index f17bd966be..185f9be798 100644 --- a/lib/ring/rte_ring.c +++ b/lib/ring/rte_ring.c @@ -268,5 +268,5 @@ rte_ring_create_elem(const char *name, unsigned int esize, unsigned int count, ring_size = rte_ring_get_memsize_elem(esize, count); if (ring_size < 0) { - rte_errno = ring_size; + rte_errno = -ring_size; return NULL; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.252575184 +0000 +++ 0122-ring-fix-error-code-when-creating-ring.patch 2022-02-21 15:22:44.250704484 +0000 @@ -1 +1 @@ -From 074717be3ef9e7a8868b5af078b0ca7b61bcc44b Mon Sep 17 00:00:00 2001 +From 8b45a1dea3cf6c20554736f7daa41a5e980703c0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 074717be3ef9e7a8868b5af078b0ca7b61bcc44b ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org