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 01564A0527 for ; Mon, 9 Nov 2020 19:50:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B8302697B; Mon, 9 Nov 2020 19:50:37 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by dpdk.org (Postfix) with ESMTP id BB269697B for ; Mon, 9 Nov 2020 19:50:36 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id b8so9897499wrn.0 for ; Mon, 09 Nov 2020 10:50:36 -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=sX0/yxyCY4k8Fpv9A4450r3gxU4769LXegDcAgdhGU0=; b=Z/Us+R8oK4UZn/3nkiF9NSkIgguQrP1r+E8D/leYye6RXPFX4TLkDTBOgSMJpEmIPI hCsjdsUKsayJOo3u8aQMrw46A4ZWEqJtOoKInj6LixOrKZaK2GrJslzwMxkQYr7J+xe/ Qlj5ccT8edX2SWkX1snD4R+rzLysiUSmLmFApFp/y5BzaPVBqx6/KwDr0YiLFkUXACaU nT5JK0SutljRgEXHNJdus3k0Erie5wpvhqr6xsSO9MZl+fOZ5+QD3kC6xuYDI35/92iC QjtboBa0EKR8voxiWJmJpPTAu/MzHQsJXrTDH2YsbKuuooe3gWZhyOQ9TJDKl0yrysYB MpPw== 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=sX0/yxyCY4k8Fpv9A4450r3gxU4769LXegDcAgdhGU0=; b=Vce+6a4Bz9mwT/pfgPQYfXcJQVasDqaNuifHM28bgwM7yYuzYpcJldohkCWsumSd6p 1dLNC4KcmKzMEtgIplvowyZXz7H7IYKqFzx+rKxcvZSBZFAgb1+mIWA6AbhbsAavGnGm c+A8zADEU+UyoYxq7BlfVF6LEwUIrePfOAJZ1XCPQ2oJd68g4rFAJN+ERB/DFrAoKkOg Dc2IONvaIWpYYVGGTZvgh/J6jVsjzmLOHk/alUgbbiZpU6b4fO3HjDpeBlnbTYIiCRTR klX5KBCpjKCFFe/AHAfUhjnx2umvJWd4i/ICFR4eNO4nzCLmY7YNGm3YKdLkyWtPvUB1 FhgQ== X-Gm-Message-State: AOAM531O2Rsvukk5uQ8QUl0OSGWU0Jr9SgRI4JabnPo512iMmQsPHhKG SYyS04NMC81V8+MNxso3CG0= X-Google-Smtp-Source: ABdhPJz/sZEcf/8rRn5wL8vCYypUmXMJ1Gh4MLB0RyTOHuBoSBOEnJ+i12jUYPfblAH3ANDeMqSdBA== X-Received: by 2002:adf:a2c2:: with SMTP id t2mr20185568wra.54.1604947835369; Mon, 09 Nov 2020 10:50:35 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r18sm15535095wrj.50.2020.11.09.10.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:50:34 -0800 (PST) From: luca.boccassi@gmail.com To: Olivier Matz Cc: David Marchand , David Christensen , Ruifeng Wang , dpdk stable Date: Mon, 9 Nov 2020 18:50:29 +0000 Message-Id: <20201109185030.3478760-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201028104606.3504127-207-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eal: fix MCS lock and ticketlock headers install' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/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. 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/af1fc63d2e3c1634355415d2c73aadfa82b89e0b Thanks. Luca Boccassi --- >From af1fc63d2e3c1634355415d2c73aadfa82b89e0b Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Wed, 4 Nov 2020 18:03:33 +0100 Subject: [PATCH] eal: fix MCS lock and ticketlock headers install [ upstream commit f8e90bcc1d407a191435cffb1b6b5b0a8ff01c92 ] Add missing arch-specific headers in meson.build. Fixes: 2173f3333b61 ("mcslock: add MCS queued lock implementation") Fixes: ca49b92079df ("ticketlock: enable generic ticketlock on all arch") Signed-off-by: Olivier Matz Acked-by: David Marchand Acked-by: David Christensen Acked-by: Ruifeng Wang --- lib/librte_eal/common/include/arch/arm/meson.build | 2 ++ lib/librte_eal/common/include/arch/ppc_64/meson.build | 2 ++ lib/librte_eal/common/include/arch/x86/meson.build | 2 ++ 3 files changed, 6 insertions(+) diff --git a/lib/librte_eal/common/include/arch/arm/meson.build b/lib/librte_eal/common/include/arch/arm/meson.build index 77893fa359..faa3d84f67 100644 --- a/lib/librte_eal/common/include/arch/arm/meson.build +++ b/lib/librte_eal/common/include/arch/arm/meson.build @@ -14,6 +14,7 @@ install_headers( 'rte_cycles.h', 'rte_io_64.h', 'rte_io.h', + 'rte_mcslock.h', 'rte_memcpy_32.h', 'rte_memcpy_64.h', 'rte_memcpy.h', @@ -25,5 +26,6 @@ install_headers( 'rte_prefetch.h', 'rte_rwlock.h', 'rte_spinlock.h', + 'rte_ticketlock.h', 'rte_vect.h', subdir: get_option('include_subdir_arch')) diff --git a/lib/librte_eal/common/include/arch/ppc_64/meson.build b/lib/librte_eal/common/include/arch/ppc_64/meson.build index 7949c86258..5d3ebafa26 100644 --- a/lib/librte_eal/common/include/arch/ppc_64/meson.build +++ b/lib/librte_eal/common/include/arch/ppc_64/meson.build @@ -8,10 +8,12 @@ install_headers( 'rte_cpuflags.h', 'rte_cycles.h', 'rte_io.h', + 'rte_mcslock.h', 'rte_memcpy.h', 'rte_pause.h', 'rte_prefetch.h', 'rte_rwlock.h', 'rte_spinlock.h', + 'rte_ticketlock.h', 'rte_vect.h', subdir: get_option('include_subdir_arch')) diff --git a/lib/librte_eal/common/include/arch/x86/meson.build b/lib/librte_eal/common/include/arch/x86/meson.build index bc8ffea1ee..806cfad042 100644 --- a/lib/librte_eal/common/include/arch/x86/meson.build +++ b/lib/librte_eal/common/include/arch/x86/meson.build @@ -11,11 +11,13 @@ install_headers( 'rte_cpuflags.h', 'rte_cycles.h', 'rte_io.h', + 'rte_mcslock.h', 'rte_memcpy.h', 'rte_prefetch.h', 'rte_pause.h', 'rte_rtm.h', 'rte_rwlock.h', 'rte_spinlock.h', + 'rte_ticketlock.h', 'rte_vect.h', subdir: get_option('include_subdir_arch')) -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:49:40.610209615 +0000 +++ 0001-eal-fix-MCS-lock-and-ticketlock-headers-install.patch 2020-11-09 18:49:40.572079346 +0000 @@ -1 +1 @@ -From f8e90bcc1d407a191435cffb1b6b5b0a8ff01c92 Mon Sep 17 00:00:00 2001 +From af1fc63d2e3c1634355415d2c73aadfa82b89e0b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f8e90bcc1d407a191435cffb1b6b5b0a8ff01c92 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -17,3 +18,3 @@ - lib/librte_eal/arm/include/meson.build | 2 ++ - lib/librte_eal/ppc/include/meson.build | 2 ++ - lib/librte_eal/x86/include/meson.build | 2 ++ + lib/librte_eal/common/include/arch/arm/meson.build | 2 ++ + lib/librte_eal/common/include/arch/ppc_64/meson.build | 2 ++ + lib/librte_eal/common/include/arch/x86/meson.build | 2 ++ @@ -22,5 +23,5 @@ -diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build -index c6a9f70d73..770766de1a 100644 ---- a/lib/librte_eal/arm/include/meson.build -+++ b/lib/librte_eal/arm/include/meson.build -@@ -14,6 +14,7 @@ arch_headers = files( +diff --git a/lib/librte_eal/common/include/arch/arm/meson.build b/lib/librte_eal/common/include/arch/arm/meson.build +index 77893fa359..faa3d84f67 100644 +--- a/lib/librte_eal/common/include/arch/arm/meson.build ++++ b/lib/librte_eal/common/include/arch/arm/meson.build +@@ -14,6 +14,7 @@ install_headers( @@ -34 +35 @@ -@@ -26,6 +27,7 @@ arch_headers = files( +@@ -25,5 +26,6 @@ install_headers( @@ -40,7 +41,6 @@ - ) - install_headers(arch_headers, subdir: get_option('include_subdir_arch')) -diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build -index 0873b2aecb..dae40ede54 100644 ---- a/lib/librte_eal/ppc/include/meson.build -+++ b/lib/librte_eal/ppc/include/meson.build -@@ -8,12 +8,14 @@ arch_headers = files( + subdir: get_option('include_subdir_arch')) +diff --git a/lib/librte_eal/common/include/arch/ppc_64/meson.build b/lib/librte_eal/common/include/arch/ppc_64/meson.build +index 7949c86258..5d3ebafa26 100644 +--- a/lib/librte_eal/common/include/arch/ppc_64/meson.build ++++ b/lib/librte_eal/common/include/arch/ppc_64/meson.build +@@ -8,10 +8,12 @@ install_headers( @@ -53 +52,0 @@ - 'rte_power_intrinsics.h', @@ -59,7 +58,6 @@ - ) - install_headers(arch_headers, subdir: get_option('include_subdir_arch')) -diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build -index 091fb647dc..549cc21a42 100644 ---- a/lib/librte_eal/x86/include/meson.build -+++ b/lib/librte_eal/x86/include/meson.build -@@ -11,6 +11,7 @@ arch_headers = files( + subdir: get_option('include_subdir_arch')) +diff --git a/lib/librte_eal/common/include/arch/x86/meson.build b/lib/librte_eal/common/include/arch/x86/meson.build +index bc8ffea1ee..806cfad042 100644 +--- a/lib/librte_eal/common/include/arch/x86/meson.build ++++ b/lib/librte_eal/common/include/arch/x86/meson.build +@@ -11,11 +11,13 @@ install_headers( @@ -70,0 +69 @@ + 'rte_prefetch.h', @@ -72,2 +70,0 @@ - 'rte_power_intrinsics.h', -@@ -18,6 +19,7 @@ arch_headers = files( @@ -79,2 +76 @@ - ) - install_headers(arch_headers, subdir: get_option('include_subdir_arch')) + subdir: get_option('include_subdir_arch'))