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 B67A6A0518 for ; Fri, 24 Jul 2020 14:04:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AFDB01BFE5; Fri, 24 Jul 2020 14:04:07 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 596F01BFE5 for ; Fri, 24 Jul 2020 14:04:06 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id j18so7735191wmi.3 for ; Fri, 24 Jul 2020 05:04:06 -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 :mime-version:content-transfer-encoding; bh=rBhPqj2VAqXLsxCOKipGSgwtoviD3jldbPNxXoCIyQI=; b=qu0r3JuFpp70luFB7iNXCI6cqwa67DQU0xzANK5JN1ZhKSPDxrVcRmp2zHRTUWE35G 9FTHiHi3Q61h0+FohAYHtMyK+cZbckt6jEXp+LoE6XrQMYO8xB8LnMSxKAZaaaq/tU5P 7m7P03mPlF0k0R+w/dWyRuSsrrQ+ND7edDZNh9eCJjs7dNfgFiwPjc16ytIPTmnpDXCg F+ZFXyL/pgGf2DDEV9d9DVkgZ6SfExhhc0au402/VF/+9b9YhH5naua4yy74HBSv4BfF T/lT1FVNAJKiquhvVo3R+uVw3ZhlC0X4Qd45larEqR72bwrWVINaowUED5e75Td7po4i Mw+w== 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=rBhPqj2VAqXLsxCOKipGSgwtoviD3jldbPNxXoCIyQI=; b=S2B8RVIm/d0Ty4aViXPXfupMySClT/mEPQYqlL4IK/fFbgbLHjTDiN7F/vZyJ0D2g6 a83y+C9WuUweJ/x+/jZdcduQgOOLON20b2ILnl8baVoe1msCyO0ZKyouBZAtBhhnAw5f Zy03SWWjyoCvxL/CsJHRPsu8SNIV7+R9p8sm0i2aIcR34nPXkMkG/U7dZSjNjP5IMWco HKjbtAWh0U+GkBOY7uQpG1ewzJAmZzfNKQozYTGigpzLMkvXmBA5Jj0dQPDHZx7wYV1f 82i/FFTv/SlPX3V8LSt+3syWT61jjXSvGYk5aeQqmFqdj+LaniyJ0lqLMss/7N9PbNbx zmvg== X-Gm-Message-State: AOAM532PsXgttXlOookTHm37/dyZnAGiPFskE5ABxMGwxBcdYnyuhP42 nP9qh4p00TEnjS2CfZVoYOQ= X-Google-Smtp-Source: ABdhPJw5jgOTApJvH+V44lN6O/DIDq48DzHJuJNxFRO2j2JFE01XzYj8OWNvTNllQMq3wA22TzJYxA== X-Received: by 2002:a1c:4d11:: with SMTP id o17mr8287318wmh.134.1595592246079; Fri, 24 Jul 2020 05:04:06 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p17sm6584762wma.47.2020.07.24.05.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:04:04 -0700 (PDT) From: luca.boccassi@gmail.com To: Xiaolong Ye Cc: Olivier Matz , dpdk stable Date: Fri, 24 Jul 2020 12:58:11 +0100 Message-Id: <20200724120030.1863487-53-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'mbuf: fix error code in dynamic field/flag registration' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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 862946d7be44ce2760558b274e90281363ab76dd Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Sat, 13 Jun 2020 23:49:18 +0800 Subject: [PATCH] mbuf: fix error code in dynamic field/flag registration [ upstream commit 359386e15b4778e5924dcb90d5d686a1c865436f ] Set rte_errno as ENOMEM when allocation failure. Fixes: 4958ca3a443a ("mbuf: support dynamic fields and flags") Signed-off-by: Xiaolong Ye Acked-by: Olivier Matz --- lib/librte_mbuf/rte_mbuf_dyn.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf_dyn.c b/lib/librte_mbuf/rte_mbuf_dyn.c index 13d6da6d1..de7d2eb9a 100644 --- a/lib/librte_mbuf/rte_mbuf_dyn.c +++ b/lib/librte_mbuf/rte_mbuf_dyn.c @@ -278,12 +278,15 @@ __rte_mbuf_dynfield_register_offset(const struct rte_mbuf_dynfield *params, mbuf_dynfield_tailq.head, mbuf_dynfield_list); te = rte_zmalloc("MBUF_DYNFIELD_TAILQ_ENTRY", sizeof(*te), 0); - if (te == NULL) + if (te == NULL) { + rte_errno = ENOMEM; return -1; + } mbuf_dynfield = rte_zmalloc("mbuf_dynfield", sizeof(*mbuf_dynfield), 0); if (mbuf_dynfield == NULL) { rte_free(te); + rte_errno = ENOMEM; return -1; } @@ -456,12 +459,15 @@ __rte_mbuf_dynflag_register_bitnum(const struct rte_mbuf_dynflag *params, mbuf_dynflag_tailq.head, mbuf_dynflag_list); te = rte_zmalloc("MBUF_DYNFLAG_TAILQ_ENTRY", sizeof(*te), 0); - if (te == NULL) + if (te == NULL) { + rte_errno = ENOMEM; return -1; + } mbuf_dynflag = rte_zmalloc("mbuf_dynflag", sizeof(*mbuf_dynflag), 0); if (mbuf_dynflag == NULL) { rte_free(te); + rte_errno = ENOMEM; return -1; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:50.649103082 +0100 +++ 0053-mbuf-fix-error-code-in-dynamic-field-flag-registrati.patch 2020-07-24 12:53:48.275006236 +0100 @@ -1,12 +1,13 @@ -From 359386e15b4778e5924dcb90d5d686a1c865436f Mon Sep 17 00:00:00 2001 +From 862946d7be44ce2760558b274e90281363ab76dd Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Sat, 13 Jun 2020 23:49:18 +0800 Subject: [PATCH] mbuf: fix error code in dynamic field/flag registration +[ upstream commit 359386e15b4778e5924dcb90d5d686a1c865436f ] + Set rte_errno as ENOMEM when allocation failure. Fixes: 4958ca3a443a ("mbuf: support dynamic fields and flags") -Cc: stable@dpdk.org Signed-off-by: Xiaolong Ye Acked-by: Olivier Matz