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 C2E30A0032 for ; Fri, 18 Feb 2022 13:44:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD86A40141; Fri, 18 Feb 2022 13:44:37 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id D801641142 for ; Fri, 18 Feb 2022 13:44:36 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id n8so5147089wms.3 for ; Fri, 18 Feb 2022 04:44:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WUynMAsVbA4sDRTBwp6Wl/l2NaQhKxhgP4zt+QoonGA=; b=L0etfdnejX6PJlT1z3RDbjPlT+ehnXCbHkEXIZ3lBiRq4x1M/2xl8DKTij49UECVIM JHr4+oI8ZI1PnM6FvG5+b9wxwZzDiHly0V/wg1tJwTxb9JdsVnjLerz4hbGPEM3sL8GQ owuR6LPtuSOdMEc7v4HeYjPEjaB5QoUMEbMYWrhUOzuf08M7M+bVMKzDi6UBsT71sOKu 8ieLNOUPk3Zj8d6MnoWIbl7q5YThC6uo6pMy74eK6Sh61kYFDTtyp6QR14icF7TvzGV9 dnvVD33qrmCSMqcNHV/2PIAiIbWI5LKYln0mF7/3m7J5bEH4GA7vh0Q8f0TgkgO/6jEk OhJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WUynMAsVbA4sDRTBwp6Wl/l2NaQhKxhgP4zt+QoonGA=; b=Kb4N+wUdN+nXGxEvIcXq8D4//kD6xm7No2cNyXwjUkNjLPInGewrEqn9Y+zYskAJvO WwcmITk0pAU3ZeIyJNgiQY3MSw/I/2LMQKN6UNwrQf5brhIJuk45E4MiNE8/KJn92PRp pBxIEKQbY+i5yVs48bF1T5cnGDuhRYZ7EkE23BbGMOjebiB0JbxfwKAWcJyS0Ew5BnYc vq+cc1UWcdtPbh8yYc2hForf9/cHToiyT71OvEfu1STuhdgUCFDxj4XhZD9cMpqbiQO2 uS7fwXrLZ9IRmmA3wkke0B1agQznsz0m9TexB8kCAlbp6dEhor8Zh7SBFqwxESJNfOti aPtA== X-Gm-Message-State: AOAM530jp40cOhy6L6k4Ip/aGCA2M0lbCRDto32HFK/pMBABWtX4Xe1N YiutCbqfE8HMbBRm9sdVC/CndbvHdWmaG+Xe X-Google-Smtp-Source: ABdhPJx8iXgEXN6waaCXrtltkZwZVp7Tn7m0zroigIkMviGncqfSnt8loX+haoIULEGNDoVGk/n1ug== X-Received: by 2002:a05:600c:154d:b0:37b:f5c4:4ee8 with SMTP id f13-20020a05600c154d00b0037bf5c44ee8mr7103962wmg.109.1645188276513; Fri, 18 Feb 2022 04:44:36 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id l31sm4936717wms.0.2022.02.18.04.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:44:36 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: dpdk stable Subject: patch 'eal: fix C++ include' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:07 +0000 Message-Id: <20220218123931.1749595-98-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/ae0613e1333077f194f40edd6d709b1ff0aacd05 Thanks. Luca Boccassi --- >From ae0613e1333077f194f40edd6d709b1ff0aacd05 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 10 Feb 2022 15:42:33 +0000 Subject: [PATCH] eal: fix C++ include [ upstream commit 59144f6edd884bfc392143b60bf4d0f082053784 ] C++ files could not include some headers because: * "new" is a keyword in C++, so can't be a variable name * there is no automatic casting to/from void * Fixes: 184104fc6121 ("ticketlock: introduce fair ticket based locking") Fixes: 032a7e5499a0 ("trace: implement provider payload") Signed-off-by: Bruce Richardson --- lib/librte_eal/include/generic/rte_ticketlock.h | 14 +++++++------- lib/librte_eal/include/rte_trace_point.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/librte_eal/include/generic/rte_ticketlock.h b/lib/librte_eal/include/generic/rte_ticketlock.h index c1b8808f51..693c67b517 100644 --- a/lib/librte_eal/include/generic/rte_ticketlock.h +++ b/lib/librte_eal/include/generic/rte_ticketlock.h @@ -91,13 +91,13 @@ rte_ticketlock_unlock(rte_ticketlock_t *tl) static inline int rte_ticketlock_trylock(rte_ticketlock_t *tl) { - rte_ticketlock_t old, new; - old.tickets = __atomic_load_n(&tl->tickets, __ATOMIC_RELAXED); - new.tickets = old.tickets; - new.s.next++; - if (old.s.next == old.s.current) { - if (__atomic_compare_exchange_n(&tl->tickets, &old.tickets, - new.tickets, 0, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED)) + rte_ticketlock_t oldl, newl; + oldl.tickets = __atomic_load_n(&tl->tickets, __ATOMIC_RELAXED); + newl.tickets = oldl.tickets; + newl.s.next++; + if (oldl.s.next == oldl.s.current) { + if (__atomic_compare_exchange_n(&tl->tickets, &oldl.tickets, + newl.tickets, 0, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED)) return 1; } diff --git a/lib/librte_eal/include/rte_trace_point.h b/lib/librte_eal/include/rte_trace_point.h index e226f073f7..0f8700974f 100644 --- a/lib/librte_eal/include/rte_trace_point.h +++ b/lib/librte_eal/include/rte_trace_point.h @@ -370,7 +370,7 @@ do { \ do { \ if (unlikely(in == NULL)) \ return; \ - rte_strscpy(mem, in, __RTE_TRACE_EMIT_STRING_LEN_MAX); \ + rte_strscpy((char *)mem, in, __RTE_TRACE_EMIT_STRING_LEN_MAX); \ mem = RTE_PTR_ADD(mem, __RTE_TRACE_EMIT_STRING_LEN_MAX); \ } while (0) -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.609470308 +0000 +++ 0098-eal-fix-C-include.patch 2022-02-18 12:37:37.830795047 +0000 @@ -1 +1 @@ -From 59144f6edd884bfc392143b60bf4d0f082053784 Mon Sep 17 00:00:00 2001 +From ae0613e1333077f194f40edd6d709b1ff0aacd05 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 59144f6edd884bfc392143b60bf4d0f082053784 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - lib/eal/include/generic/rte_ticketlock.h | 14 +++++++------- - lib/eal/include/rte_trace_point.h | 2 +- + lib/librte_eal/include/generic/rte_ticketlock.h | 14 +++++++------- + lib/librte_eal/include/rte_trace_point.h | 2 +- @@ -21 +22 @@ -diff --git a/lib/eal/include/generic/rte_ticketlock.h b/lib/eal/include/generic/rte_ticketlock.h +diff --git a/lib/librte_eal/include/generic/rte_ticketlock.h b/lib/librte_eal/include/generic/rte_ticketlock.h @@ -23,2 +24,2 @@ ---- a/lib/eal/include/generic/rte_ticketlock.h -+++ b/lib/eal/include/generic/rte_ticketlock.h +--- a/lib/librte_eal/include/generic/rte_ticketlock.h ++++ b/lib/librte_eal/include/generic/rte_ticketlock.h @@ -46 +47 @@ -diff --git a/lib/eal/include/rte_trace_point.h b/lib/eal/include/rte_trace_point.h +diff --git a/lib/librte_eal/include/rte_trace_point.h b/lib/librte_eal/include/rte_trace_point.h @@ -48,2 +49,2 @@ ---- a/lib/eal/include/rte_trace_point.h -+++ b/lib/eal/include/rte_trace_point.h +--- a/lib/librte_eal/include/rte_trace_point.h ++++ b/lib/librte_eal/include/rte_trace_point.h