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 16FD6A0540 for ; Thu, 7 Jul 2022 09:58:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 122D8406B4; Thu, 7 Jul 2022 09:58:10 +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 1CBEE406B4 for ; Thu, 7 Jul 2022 09:58:09 +0200 (CEST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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 86A6F402B9 for ; Thu, 7 Jul 2022 07:58:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180687; bh=nSSowxoPdBg6NB8q96RnlwcHUlibekB5bZzC/uXY/2w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=ff/jWvuSxEmDRVZLA0dJKOPE+AhCTRMTDBwYwP5ODHszIEbV+jMwxUDcY/KJYGzAH W7MVhoI5fMmfd6iEESCUNjY8UZPUxCo6zaj6I/G4R4LcsNOXhuNJcqhoelQlIFix58 l/jKOV/KKhWN7TEYtV20luoe/6+X+pg9uNxOy/gQRZy+WWBE/3R28gpDqxDACsO/Os K2QTdd4y3yGPRM8UwkJx6vCTtUn4dh1gienIMvLcHLVwDM1oDEJiZKrjCW7Mbnj993 IvblH3Ev50JhCMoMqOW/GTXyPJwa1xpWNmKroD5SGbsdfHHLHWovfaYCKBLszAuds5 YfoHQS3P4YG/g== Received: by mail-ed1-f70.google.com with SMTP id f9-20020a056402354900b0043a902b7452so2414929edd.13 for ; Thu, 07 Jul 2022 00:58:07 -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=nSSowxoPdBg6NB8q96RnlwcHUlibekB5bZzC/uXY/2w=; b=6EIVp8BrEp3DWclGzgmLn8NSbkEtrqOJcrY7NOnZh0215tdaoS1JHJj0m/Y0cbQp5l pFSL3U5tCSwb+sdTmHBPhc1Xa/J3+DcUmUu3NUgNt/3wpIxIYo/TiiPHLcqq1IMkjGpv WEbXTLcUs4iW8SxsYynpguWQcY94tWVD3Sb62tZcYzstdCh1zDdbq4MSkobHBC4w4nzj ASytu1j3lGr84HWf+0RKGuAw/RTJDpMufmnaomKEfjX3OuYY9UVktVGLUhqiFdBYqkyv FBSxqEh9DluM9RcLhCsJ1DDHZ85MW+ILbtzeadBKJCzKXBCdhFdodysHUeLqGOITEcfm YFJQ== X-Gm-Message-State: AJIora+XNZlBq/QG9s5+9aAUyih4zVd1V3v3QE9nBB+bGBI+nhnkNqAt s+iZUROY41Rf1V8uO0PYUhlDUW5HGrKp5upawPsLv9sBj38ubOPHxzAOj+fGpu+L2IQKP+tP2xO MD/kPtbZQ88lt/yJ2gyHb1/qy X-Received: by 2002:a17:907:3d8d:b0:726:3f5e:dc58 with SMTP id he13-20020a1709073d8d00b007263f5edc58mr40992764ejc.416.1657180686665; Thu, 07 Jul 2022 00:58:06 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uQ4imNioG7RjLVoDKed5OkgIs21qM23tpIPyk/vgVORPqNGLHs4ZjhrfJsMZkwXrQMeTd3yQ== X-Received: by 2002:a17:907:3d8d:b0:726:3f5e:dc58 with SMTP id he13-20020a1709073d8d00b007263f5edc58mr40992752ejc.416.1657180686431; Thu, 07 Jul 2022 00:58:06 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id q21-20020aa7cc15000000b0042617ba638esm27392052edt.24.2022.07.07.00.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:58:05 -0700 (PDT) From: christian.ehrhardt@canonical.com To: David Marchand Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'eal/x86: drop export of internal alignment macro' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:50 +0200 Message-Id: <20220707075522.194223-55-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-Type: text/plain; charset=UTF-8 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/3ba04d598f8c1a1953a1f2a80d617346ba0f8734 Thanks. Christian Ehrhardt --- >From 3ba04d598f8c1a1953a1f2a80d617346ba0f8734 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 21 Jun 2022 16:13:25 +0200 Subject: [PATCH] eal/x86: drop export of internal alignment macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 11f61ea2f6fcdd88df2a81b82235ddb7033c3e5d ] ALIGNMENT_MASK is only used internally. Besides it lacks a DPDK-related prefix. Hide it from external eyes. Fixes: f5472703c0bd ("eal: optimize aligned memcpy on x86") Reported-by: Morten Brørup Signed-off-by: David Marchand --- lib/librte_eal/common/include/arch/x86/rte_memcpy.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h index 8c2e243d9e..0c3a2caa91 100644 --- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h +++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h @@ -851,6 +851,8 @@ rte_memcpy(void *dst, const void *src, size_t n) return rte_memcpy_generic(dst, src, n); } +#undef ALIGNMENT_MASK + #if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION >= 100000) #pragma GCC diagnostic pop #endif -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:13.482150060 +0200 +++ 0055-eal-x86-drop-export-of-internal-alignment-macro.patch 2022-07-07 09:54:10.949824519 +0200 @@ -1 +1 @@ -From 11f61ea2f6fcdd88df2a81b82235ddb7033c3e5d Mon Sep 17 00:00:00 2001 +From 3ba04d598f8c1a1953a1f2a80d617346ba0f8734 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 11f61ea2f6fcdd88df2a81b82235ddb7033c3e5d ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ - lib/eal/x86/include/rte_memcpy.h | 2 ++ + lib/librte_eal/common/include/arch/x86/rte_memcpy.h | 2 ++ @@ -22,4 +23,4 @@ -diff --git a/lib/eal/x86/include/rte_memcpy.h b/lib/eal/x86/include/rte_memcpy.h -index 18aa4e43a7..b678b5c942 100644 ---- a/lib/eal/x86/include/rte_memcpy.h -+++ b/lib/eal/x86/include/rte_memcpy.h +diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h +index 8c2e243d9e..0c3a2caa91 100644 +--- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h ++++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h