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 75583A0540 for ; Thu, 7 Jul 2022 09:55:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 70DA0406B4; Thu, 7 Jul 2022 09:55:49 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id DABB0406B4 for ; Thu, 7 Jul 2022 09:55:47 +0200 (CEST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 76DE340274 for ; Thu, 7 Jul 2022 07:55:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180547; bh=Z+fEh3VblSinFKgMjNnb5ltG3m/zJKUEgpbL5jd+a6k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=A5t04y/Zj1/dUdE97oXWbhOMlTCtxQMSjmSeDeQecNe8EMZB1JvB1jdloudSPjRb+ SHU9+BOsyaNJejwlrW5hQUPPWDs5eKDYenlZk5f9rXiI1Uz+/1NGCnQ31Ig/YDKZ+b VKlRLowyQ+SkATXwd3hCLpPxpLtL/OTH87DLorlxG2eKhCObq8Tmejkb9vOjPmQHKq pHIsNV8asFwnHY/6yoWaqmGLfYLdB8lBQeR311D8AOEuniNWQWm1BE0BPdo0ZRmqXE ULICCghUR+fitKZZYUCzugaYS7bTxpcNfP/hy0Rdx9INsiSBYr0kgUN/3IbhJeAKOp 10AsKKCl7VcRg== Received: by mail-ed1-f69.google.com with SMTP id v16-20020a056402349000b00435a1c942a9so13475252edc.15 for ; Thu, 07 Jul 2022 00:55:47 -0700 (PDT) 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=Z+fEh3VblSinFKgMjNnb5ltG3m/zJKUEgpbL5jd+a6k=; b=FcHhEdiGGROX/MQoqAOpyYipZX6NQ+Ft90FIRKmBOTX/RbJzYXoi5+IYPW+DmKlHRM d1djVfM6VFYkM3pDewn59r0y9rXS18VLUgbfGg8uciBl/a5LQkuQCzWq0v6FEyn49uHc kSPzhQP7PJH+0FV5AjYL1aUkGWaa7+3Mue7w6moy3PErBupqzvbvliw6p0ScqUGdqaU6 I2b2CSWq3P2OJuaFlUqUnvq/4yN+Zv6/9yIAL/79ayuZREMEhDSMmYSEvrrnkX46poKt waI1yjvin7K1sxIh+8WVxMnbFodcRIU5gJfGXFEMqhsb/RED0WyFDujJD2+V8nIAJ2qP 7kNg== X-Gm-Message-State: AJIora+6GkI1Dk3RGgJXO6b4iZsw/ywos0GssRNbjoXtTTSdl+NMEkXG PJCUO0NrhZYx7d51qeqvYwok6S2YmCgopNY9MY+sFRa7qfKYhYSodCFpnqPpzSwGZ++5Dzmk206 JntsOFxm2s3j5kf1/fU9vze7n X-Received: by 2002:a17:907:763a:b0:72a:5128:b34f with SMTP id jy26-20020a170907763a00b0072a5128b34fmr38779673ejc.372.1657180547250; Thu, 07 Jul 2022 00:55:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1th+MUXEXQ9vPzkLtjZtQKui4vndLPiBCIpZNG+MxSARCzodqF9LQOMehiA+en46O+wDaSAYg== X-Received: by 2002:a17:907:763a:b0:72a:5128:b34f with SMTP id jy26-20020a170907763a00b0072a5128b34fmr38779658ejc.372.1657180547090; Thu, 07 Jul 2022 00:55:47 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id c12-20020a170906d18c00b00727c6da69besm11731855ejz.38.2022.07.07.00.55.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:55:46 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Tianhao Chai Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'eal: fix C++ include for device event and DMA' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:02 +0200 Message-Id: <20220707075522.194223-7-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.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 19.11.13 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/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/a2e44b157eacb14992251fc36adceb52ac50c5cd Thanks. Christian Ehrhardt --- >From a2e44b157eacb14992251fc36adceb52ac50c5cd Mon Sep 17 00:00:00 2001 From: Tianhao Chai Date: Wed, 4 May 2022 23:39:35 -0500 Subject: [PATCH] eal: fix C++ include for device event and DMA [ upstream commit 28c5d600723a9bb384a4b2f79bf6af8c40950bba ] Currently the "extern C" section ends right before rte_dev_dma_unmap and other DMA function declarations, causing some C++ compilers to produce C++ mangled symbols to rte_dev_dma_unmap instead of C symbols. This leads to build failures later when linking a final executable against this object. Fixes: a753e53d517b ("eal: add device event monitor framework") Signed-off-by: Tianhao Chai Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- lib/librte_eal/common/include/rte_dev.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index a5c35f00c0..606f4b7cc1 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -339,10 +339,6 @@ rte_dev_iterator_next(struct rte_dev_iterator *it); dev != NULL; \ dev = rte_dev_iterator_next(it)) -#ifdef __cplusplus -} -#endif - /** * @warning * @b EXPERIMENTAL: this API may change without prior notice @@ -515,4 +511,8 @@ int rte_dev_dma_unmap(struct rte_device *dev, void *addr, uint64_t iova, size_t len); +#ifdef __cplusplus +} +#endif + #endif /* _RTE_DEV_H_ */ -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:11.501421957 +0200 +++ 0007-eal-fix-C-include-for-device-event-and-DMA.patch 2022-07-07 09:54:10.789823530 +0200 @@ -1 +1 @@ -From 28c5d600723a9bb384a4b2f79bf6af8c40950bba Mon Sep 17 00:00:00 2001 +From a2e44b157eacb14992251fc36adceb52ac50c5cd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 28c5d600723a9bb384a4b2f79bf6af8c40950bba ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ - lib/eal/include/rte_dev.h | 8 ++++---- + lib/librte_eal/common/include/rte_dev.h | 8 ++++---- @@ -22,5 +23,5 @@ -diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h -index 448a41cb0e..e6ff1218f9 100644 ---- a/lib/eal/include/rte_dev.h -+++ b/lib/eal/include/rte_dev.h -@@ -320,10 +320,6 @@ rte_dev_iterator_next(struct rte_dev_iterator *it); +diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h +index a5c35f00c0..606f4b7cc1 100644 +--- a/lib/librte_eal/common/include/rte_dev.h ++++ b/lib/librte_eal/common/include/rte_dev.h +@@ -339,10 +339,6 @@ rte_dev_iterator_next(struct rte_dev_iterator *it); @@ -37 +38 @@ -@@ -496,4 +492,8 @@ int +@@ -515,4 +511,8 @@ int