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 B337CA0563; Wed, 15 Apr 2020 12:57:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E7C7B1D6B8; Wed, 15 Apr 2020 12:57:51 +0200 (CEST) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by dpdk.org (Postfix) with ESMTP id 3243D1D6B5 for ; Wed, 15 Apr 2020 12:57:50 +0200 (CEST) Received: by mail-io1-f68.google.com with SMTP id b12so16605266ion.8 for ; Wed, 15 Apr 2020 03:57:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=eYraWpthShtDyFUGInN2T4CMPpx4R1t4dEGuBQ96pog=; b=l6DNyQDWJq0qwT8AIhLqvj3uhPev+1AWhWx7Z3WA4tQcgIZO7mGUoG79qQyvKf+Yxg nktDp1Fu8GSIlDcUNWlmkBzI6z58IpUjBsmGECjqSzo5FtYPjkkOtOijHWm7zgZ6PVWs 2XyUap/+1eLdox7NJYYju8/0KHmSODqWfEjbNuEB4aWt4cE2Lf51LtpTb0PI/d3MAu1H LG3eD4lDNLvTeklE4dqgzhBlePAzkyZfhjfWRmOfatHeYzQK6b8chME81Do2UxEju/kG cy0zNKk8x0d5+64RLP1YJZTr++uXkzEgkdunr6KnZe+qj4qxFlBsJnJhpiGJdy0jsYP2 Am+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=eYraWpthShtDyFUGInN2T4CMPpx4R1t4dEGuBQ96pog=; b=cegEcmBDKYUU/xLVBy1C3CvBCTtmP1dOtBMCWc0YLgqzobz+M37qLjmOlqWgkR4d0A kfuBCeJcWL6X75RK89AFBhAi07jnzrhZmt4EVvO4JB9IsxO7Pqn4pmz5MGH1hygMu+y9 c7sPEYU65bhsMO20LpyDGItcUV4WKcd6xKbzVT76SiQoPt3VMc46jin65fL3SyLkTxCP oUpYinCSmRyxfGA7h08tWwBHMgdWQVJsDDomQwnZNB3dOptBgcceQ2sSQg2SRwx8r5Dk pOlheu1S7LfPKPQjqKqJJDJB/DrMultbtYX5Csod+H5uL99M3DSiuqdkNzxTDISJtVlV /biQ== X-Gm-Message-State: AGi0PuY7B62vU1yd5ApiX9wOHv392Z2AVMk/wPlmH9uz1qNf96Xnb3mk jJEiC0LDBx1RjUe/0+Yt+X60A3YXbePtmNUM7OY= X-Google-Smtp-Source: APiQypLDrZSLlj3DhS0ZimSgGuIp4ZWhyCkRvaHcC6uCuYcnABaZ7LP7oGSpfH/VCIKgYaIgxuSQva36xReMBWQbZJk= X-Received: by 2002:a05:6638:5ad:: with SMTP id b13mr18637329jar.113.1586948269428; Wed, 15 Apr 2020 03:57:49 -0700 (PDT) MIME-Version: 1.0 References: <20200410164342.1194634-1-dmitry.kozliuk@gmail.com> <20200414194426.1640704-1-dmitry.kozliuk@gmail.com> <20200414194426.1640704-9-dmitry.kozliuk@gmail.com> <20200415133226.180cffb9@Sovereign> In-Reply-To: <20200415133226.180cffb9@Sovereign> From: Jerin Jacob Date: Wed, 15 Apr 2020 16:27:33 +0530 Message-ID: To: Dmitry Kozlyuk Cc: dpdk-dev , "Dmitry Malloy (MESHCHANINOV)" , Narcisa Ana Maria Vasile , Fady Bader , Tal Shnaiderman , Anatoly Burakov , Ray Kinsella Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH v3 08/10] eal/windows: fix rte_page_sizes with Clang on Windows X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Wed, Apr 15, 2020 at 4:02 PM Dmitry Kozlyuk wrote: > > > On Wed, Apr 15, 2020 at 1:16 AM Dmitry Kozlyuk wrote: > > > > > > Clang on Windows follows MS ABI where enum values are limited to 2^31-1. > > > Enum rte_page_size has members valued above this limit, which get > > > wrapped to zero, resulting in compilation error (duplicate values in > > > enum). Using MS ABI is mandatory for Windows EAL to call Win32 APIs. > > > > > > Define these values outside of the enum for Clang on Windows only. > > > This does not affect runtime, because Windows doesn't run on machines > > > with 4GiB and 16GiB hugepages. > > > > > > Signed-off-by: Dmitry Kozlyuk > > > --- > > > lib/librte_eal/include/rte_memory.h | 6 ++++++ > > > 1 file changed, 6 insertions(+) > > > > > > diff --git a/lib/librte_eal/include/rte_memory.h b/lib/librte_eal/include/rte_memory.h > > > index 1b7c3e5df..3ec673f51 100644 > > > --- a/lib/librte_eal/include/rte_memory.h > > > +++ b/lib/librte_eal/include/rte_memory.h > > > @@ -34,8 +34,14 @@ enum rte_page_sizes { > > > RTE_PGSIZE_256M = 1ULL << 28, > > > RTE_PGSIZE_512M = 1ULL << 29, > > > RTE_PGSIZE_1G = 1ULL << 30, > > > +/* Work around Clang on Windows being limited to 32-bit underlying type. */ > > > > It does look like "enum rte_page_sizes" NOT used as enum anywhere. > > > > [master][dpdk.org] $ grep -ri "enum rte_page_sizes" lib/ > > lib/librte_eal/include/rte_memory.h:enum rte_page_sizes { > > > > Why not remove this workaround and define all items as #define to > > avoid below ifdef clutter. > > > > > +#if !defined(RTE_CC_CLANG) || !defined(RTE_EXEC_ENV_WINDOWS) > > > > See above. > > > > > RTE_PGSIZE_4G = 1ULL << 32, > > > RTE_PGSIZE_16G = 1ULL << 34, > > > +#else > > > +#define RTE_PGSIZE_4G (1ULL << 32) > > > +#define RTE_PGSIZE_16G (1ULL << 34) > > > +#endif > > > }; > > > > > > #define SOCKET_ID_ANY -1 /**< Any NUMA socket. */ > > > -- > > > 2.25.1 > > > > > This is a public header and removing enum rte_page_sizes will break API. > Moving members out of enum while keeping enum itself might break compilation > because of integer constants being converted to enum (with -Werror). If none of the public API is using this enum then I think, we may not need to make this enum as public. Since it has ULL, I believe both cases(enum or define), it will be treated as unsigned long long. ie. NO ABI breakage. > > -- > Dmitry Kozlyuk