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 4B41A460B1; Tue, 28 Jan 2025 22:17:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 818A74042E; Tue, 28 Jan 2025 22:17:18 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 89165402CE for ; Tue, 28 Jan 2025 22:17:14 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1213) id BC25A2037194; Tue, 28 Jan 2025 13:17:13 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com BC25A2037194 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1738099033; bh=iLhsqMEZXOM2va9pEExjOsxPjUZ2n8pSd0p5UZrBSZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gw6cYLXOwVKcMdtxZPjV/K35DgqzUCcb8pp/QPc75y9veR2HGrmP2aBmLPsDC5ea5 M0eTKN4xXBsJlSOUQiPDzMj2G994jrLxyrvV1izgiNoXsL3tyzdBngddmDUNGWXMnT 1iZMN0GIh4Ht7VmSqUmG9X5VdPIQc75AgzwS8/Lk= From: Andre Muezerie To: andremue@linux.microsoft.com Cc: dev@dpdk.org, david.marchand@redhat.com Subject: [PATCH v2 2/2] stack: enable build with MSVC Date: Tue, 28 Jan 2025 13:16:54 -0800 Message-Id: <1738099014-16629-3-git-send-email-andremue@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1738099014-16629-1-git-send-email-andremue@linux.microsoft.com> References: <1733848355-19048-1-git-send-email-andremue@linux.microsoft.com> <1738099014-16629-1-git-send-email-andremue@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org An implementation compatible with MSVC is provided for atomic128_cmp_exchange in rte_stack_lf_c11.h. Now that the issues preventing the code needed to build lib/stack have been addressed, it can be enabled so that it also gets built when using the MSVC compiler. Signed-off-by: Andre Muezerie --- lib/stack/meson.build | 6 ---- lib/stack/rte_stack_lf_c11.h | 62 ++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/lib/stack/meson.build b/lib/stack/meson.build index 7631a14784..18177a742f 100644 --- a/lib/stack/meson.build +++ b/lib/stack/meson.build @@ -1,12 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Intel Corporation -if is_ms_compiler - build = false - reason = 'not supported building with Visual Studio Toolset' - subdir_done() -endif - sources = files('rte_stack.c', 'rte_stack_std.c', 'rte_stack_lf.c') headers = files('rte_stack.h') # subheaders, not for direct inclusion by apps diff --git a/lib/stack/rte_stack_lf_c11.h b/lib/stack/rte_stack_lf_c11.h index 60d46e963b..79d40486f9 100644 --- a/lib/stack/rte_stack_lf_c11.h +++ b/lib/stack/rte_stack_lf_c11.h @@ -8,6 +8,64 @@ #include #include +/** + * The maximum lock-free data size that can be manipulated atomically using C11 + * standard is limited to 8 bytes. + * + * This implementation for __rte_atomic128_cmp_exchange operates on 16-byte + * data types and is made available here so that it can be used without the + * need to unnecessarily expose other non-C11 atomics present in + * rte_atomic_64.h. + */ +#ifdef RTE_TOOLCHAIN_MSVC +static inline int +__rte_atomic128_cmp_exchange(rte_int128_t *dst, + rte_int128_t *exp, + const rte_int128_t *src, + unsigned int weak, + int success, + int failure) +{ + return (int)_InterlockedCompareExchange128( + (int64_t volatile *) dst, + src->val[1], /* exchange high */ + src->val[0], /* exchange low */ + (int64_t *) exp /* comparand result */ + ); +} +#else +static inline int +__rte_atomic128_cmp_exchange(rte_int128_t *dst, + rte_int128_t *exp, + const rte_int128_t *src, + unsigned int weak, + int success, + int failure) +{ + RTE_SET_USED(weak); + RTE_SET_USED(success); + RTE_SET_USED(failure); + uint8_t res; + + asm volatile ( + MPLOCKED + "cmpxchg16b %[dst];" + " sete %[res]" + : [dst] "=m" (dst->val[0]), + "=a" (exp->val[0]), + "=d" (exp->val[1]), + [res] "=r" (res) + : "b" (src->val[0]), + "c" (src->val[1]), + "a" (exp->val[0]), + "d" (exp->val[1]), + "m" (dst->val[0]) + : "memory"); + + return res; +} +#endif /* RTE_TOOLCHAIN_MSVC */ + static __rte_always_inline unsigned int __rte_stack_lf_count(struct rte_stack *s) { @@ -55,7 +113,7 @@ __rte_stack_lf_push_elems(struct rte_stack_lf_list *list, /* Use the release memmodel to ensure the writes to the LF LIFO * elements are visible before the head pointer write. */ - success = rte_atomic128_cmp_exchange( + success = __rte_atomic128_cmp_exchange( (rte_int128_t *)&list->head, (rte_int128_t *)&old_head, (rte_int128_t *)&new_head, @@ -155,7 +213,7 @@ __rte_stack_lf_pop_elems(struct rte_stack_lf_list *list, * length is visible before the head update, but * acquire semantics on the length update is enough. */ - success = rte_atomic128_cmp_exchange( + success = __rte_atomic128_cmp_exchange( (rte_int128_t *)&list->head, (rte_int128_t *)&old_head, (rte_int128_t *)&new_head, -- 2.47.2.vfs.0.1