Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/137932/?format=api
{ "id": 137932, "url": "http://patches.dpdk.org/api/patches/137932/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1709574764-9041-14-git-send-email-roretzla@linux.microsoft.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1709574764-9041-14-git-send-email-roretzla@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1709574764-9041-14-git-send-email-roretzla@linux.microsoft.com", "date": "2024-03-04T17:52:18", "name": "[v7,13/39] distributor: use C11 alignas", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "d83652ea17a44e4d6fce8dc2d139736b773ef425", "submitter": { "id": 2077, "url": "http://patches.dpdk.org/api/people/2077/?format=api", "name": "Tyler Retzlaff", "email": "roretzla@linux.microsoft.com" }, "delegate": { "id": 24651, "url": "http://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1709574764-9041-14-git-send-email-roretzla@linux.microsoft.com/mbox/", "series": [ { "id": 31365, "url": "http://patches.dpdk.org/api/series/31365/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31365", "date": "2024-03-04T17:52:05", "name": "use C11 alignas", "version": 7, "mbox": "http://patches.dpdk.org/series/31365/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/137932/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/137932/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 0044143B9B;\n\tMon, 4 Mar 2024 18:54:59 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0949242E50;\n\tMon, 4 Mar 2024 18:53:15 +0100 (CET)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id 7C35240EA5\n for <dev@dpdk.org>; Mon, 4 Mar 2024 18:52:52 +0100 (CET)", "by linux.microsoft.com (Postfix, from userid 1086)\n id C390D20B74CD; Mon, 4 Mar 2024 09:52:50 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com C390D20B74CD", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1709574770;\n bh=hU7ki+v9fjHkfx6b6ui/6LAXM2ZRvRFBy1WBp4Z/9Ew=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=nzvo6EjSHnVAxZQ0y6T0D2I9eyQnep+jmtav4JxmG43Ca96Cvu7BUZ24qE76dxNEj\n mpMpg8WNFUnjYWbLvKd3js9e/UWl4bQz03rchoiOQ3YBCeIuduLR03LBmzRg8qNWD/\n EAs0W2/bLFvs8KQXeSfxYDwWYTVmhtEUCLSnKpqU=", "From": "Tyler Retzlaff <roretzla@linux.microsoft.com>", "To": "dev@dpdk.org", "Cc": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Bruce Richardson <bruce.richardson@intel.com>,\n Chengwen Feng <fengchengwen@huawei.com>,\n Cristian Dumitrescu <cristian.dumitrescu@intel.com>,\n David Christensen <drc@linux.vnet.ibm.com>,\n David Hunt <david.hunt@intel.com>, Ferruh Yigit <ferruh.yigit@amd.com>,\n Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,\n Jasvinder Singh <jasvinder.singh@intel.com>,\n Jerin Jacob <jerinj@marvell.com>, Kevin Laatz <kevin.laatz@intel.com>,\n Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,\n Min Zhou <zhoumin@loongson.cn>, Ruifeng Wang <ruifeng.wang@arm.com>,\n Sameh Gobriel <sameh.gobriel@intel.com>,\n Stanislaw Kardach <kda@semihalf.com>,\n Thomas Monjalon <thomas@monjalon.net>,\n Vladimir Medvedkin <vladimir.medvedkin@intel.com>,\n Yipeng Wang <yipeng1.wang@intel.com>,\n Tyler Retzlaff <roretzla@linux.microsoft.com>", "Subject": "[PATCH v7 13/39] distributor: use C11 alignas", "Date": "Mon, 4 Mar 2024 09:52:18 -0800", "Message-Id": "<1709574764-9041-14-git-send-email-roretzla@linux.microsoft.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1709574764-9041-1-git-send-email-roretzla@linux.microsoft.com>", "References": "<1707873986-29352-1-git-send-email-roretzla@linux.microsoft.com>\n <1709574764-9041-1-git-send-email-roretzla@linux.microsoft.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "The current location used for __rte_aligned(a) for alignment of types\nand variables is not compatible with MSVC. There is only a single\nlocation accepted by both toolchains.\n\nFor variables standard C11 offers alignas(a) supported by conformant\ncompilers i.e. both MSVC and GCC.\n\nFor types the standard offers no alignment facility that compatibly\ninteroperates with C and C++ but may be achieved by relocating the\nplacement of __rte_aligned(a) to the aforementioned location accepted\nby all currently supported toolchains.\n\nTo allow alignment for both compilers do the following:\n\n* Move __rte_aligned from the end of {struct,union} definitions to\n be between {struct,union} and tag.\n\n The placement between {struct,union} and the tag allows the desired\n alignment to be imparted on the type regardless of the toolchain being\n used for all of GCC, LLVM, MSVC compilers building both C and C++.\n\n* Replace use of __rte_aligned(a) on variables/fields with alignas(a).\n\nSigned-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>\nAcked-by: Morten Brørup <mb@smartsharesystems.com>\n---\n lib/distributor/distributor_private.h | 34 ++++++++++++++++++----------------\n lib/distributor/rte_distributor.c | 5 +++--\n 2 files changed, 21 insertions(+), 18 deletions(-)", "diff": "diff --git a/lib/distributor/distributor_private.h b/lib/distributor/distributor_private.h\nindex dfeb9b5..07c2c05 100644\n--- a/lib/distributor/distributor_private.h\n+++ b/lib/distributor/distributor_private.h\n@@ -5,6 +5,8 @@\n #ifndef _DIST_PRIV_H_\n #define _DIST_PRIV_H_\n \n+#include <stdalign.h>\n+\n /**\n * @file\n * RTE distributor\n@@ -51,10 +53,10 @@\n * the next cache line to worker 0, we pad this out to three cache lines.\n * Only 64-bits of the memory is actually used though.\n */\n-union rte_distributor_buffer_single {\n+union __rte_cache_aligned rte_distributor_buffer_single {\n \tvolatile RTE_ATOMIC(int64_t) bufptr64;\n \tchar pad[RTE_CACHE_LINE_SIZE*3];\n-} __rte_cache_aligned;\n+};\n \n /*\n * Transfer up to 8 mbufs at a time to/from workers, and\n@@ -62,12 +64,12 @@\n */\n #define RTE_DIST_BURST_SIZE 8\n \n-struct rte_distributor_backlog {\n+struct __rte_cache_aligned rte_distributor_backlog {\n \tunsigned int start;\n \tunsigned int count;\n-\tint64_t pkts[RTE_DIST_BURST_SIZE] __rte_cache_aligned;\n+\talignas(RTE_CACHE_LINE_SIZE) int64_t pkts[RTE_DIST_BURST_SIZE];\n \tuint16_t *tags; /* will point to second cacheline of inflights */\n-} __rte_cache_aligned;\n+};\n \n \n struct rte_distributor_returned_pkts {\n@@ -113,17 +115,17 @@ enum rte_distributor_match_function {\n * There is a separate cacheline for returns in the burst API.\n */\n struct rte_distributor_buffer {\n-\tvolatile RTE_ATOMIC(int64_t) bufptr64[RTE_DIST_BURST_SIZE]\n-\t\t__rte_cache_aligned; /* <= outgoing to worker */\n+\tvolatile alignas(RTE_CACHE_LINE_SIZE) RTE_ATOMIC(int64_t) bufptr64[RTE_DIST_BURST_SIZE];\n+\t\t/* <= outgoing to worker */\n \n-\tint64_t pad1 __rte_cache_aligned; /* <= one cache line */\n+\talignas(RTE_CACHE_LINE_SIZE) int64_t pad1; /* <= one cache line */\n \n-\tvolatile RTE_ATOMIC(int64_t) retptr64[RTE_DIST_BURST_SIZE]\n-\t\t__rte_cache_aligned; /* <= incoming from worker */\n+\tvolatile alignas(RTE_CACHE_LINE_SIZE) RTE_ATOMIC(int64_t) retptr64[RTE_DIST_BURST_SIZE];\n+\t\t/* <= incoming from worker */\n \n-\tint64_t pad2 __rte_cache_aligned; /* <= one cache line */\n+\talignas(RTE_CACHE_LINE_SIZE) int64_t pad2; /* <= one cache line */\n \n-\tint count __rte_cache_aligned; /* <= number of current mbufs */\n+\talignas(RTE_CACHE_LINE_SIZE) int count; /* <= number of current mbufs */\n };\n \n struct rte_distributor {\n@@ -138,11 +140,11 @@ struct rte_distributor {\n \t * on the worker core. Second cache line are the backlog\n \t * that are going to go to the worker core.\n \t */\n-\tuint16_t in_flight_tags[RTE_DISTRIB_MAX_WORKERS][RTE_DIST_BURST_SIZE*2]\n-\t\t\t__rte_cache_aligned;\n+\talignas(RTE_CACHE_LINE_SIZE) uint16_t\n+\t\tin_flight_tags[RTE_DISTRIB_MAX_WORKERS][RTE_DIST_BURST_SIZE*2];\n \n-\tstruct rte_distributor_backlog backlog[RTE_DISTRIB_MAX_WORKERS]\n-\t\t\t__rte_cache_aligned;\n+\talignas(RTE_CACHE_LINE_SIZE) struct rte_distributor_backlog\n+\t\tbacklog[RTE_DISTRIB_MAX_WORKERS];\n \n \tstruct rte_distributor_buffer bufs[RTE_DISTRIB_MAX_WORKERS];\n \ndiff --git a/lib/distributor/rte_distributor.c b/lib/distributor/rte_distributor.c\nindex e842dc9..e58727c 100644\n--- a/lib/distributor/rte_distributor.c\n+++ b/lib/distributor/rte_distributor.c\n@@ -2,6 +2,7 @@\n * Copyright(c) 2017 Intel Corporation\n */\n \n+#include <stdalign.h>\n #include <stdio.h>\n #include <stdlib.h>\n #include <sys/queue.h>\n@@ -447,7 +448,7 @@\n \tstruct rte_mbuf *next_mb = NULL;\n \tint64_t next_value = 0;\n \tuint16_t new_tag = 0;\n-\tuint16_t flows[RTE_DIST_BURST_SIZE] __rte_cache_aligned;\n+\talignas(RTE_CACHE_LINE_SIZE) uint16_t flows[RTE_DIST_BURST_SIZE];\n \tunsigned int i, j, w, wid, matching_required;\n \n \tif (d->alg_type == RTE_DIST_ALG_SINGLE) {\n@@ -477,7 +478,7 @@\n \t\treturn 0;\n \n \twhile (next_idx < num_mbufs) {\n-\t\tuint16_t matches[RTE_DIST_BURST_SIZE] __rte_aligned(128);\n+\t\talignas(128) uint16_t matches[RTE_DIST_BURST_SIZE];\n \t\tunsigned int pkts;\n \n \t\tif ((num_mbufs - next_idx) < RTE_DIST_BURST_SIZE)\n", "prefixes": [ "v7", "13/39" ] }