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 BBAF8A0563; Wed, 15 Apr 2020 13:09:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 684CA1D69F; Wed, 15 Apr 2020 13:09:34 +0200 (CEST) Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by dpdk.org (Postfix) with ESMTP id ADE6D1D5A8 for ; Wed, 15 Apr 2020 13:09:32 +0200 (CEST) Received: by mail-lj1-f194.google.com with SMTP id u6so1596572ljl.6 for ; Wed, 15 Apr 2020 04:09:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gpg4x/MJEv2AkYRflNIyZmHBTjPx1zjuTG9VoTfOss8=; b=nmUO2JKCKf8mgoRNDJGw+fH3ZpN3ZdPcMeuY+8lg1Ip6C6WwnLxWLyc6CRrcUUhaUz q2kGwe3UdUmYGz29JKYZT0makuGytWkJSU2zQ4gnByAvI+/vkkFqHYlk0wLKFzWDgViT LV5AxyqSpK2D6eF/bCMav8Gaf2diAvocORij4P39JE6YLViMO2+K/D6uiN/3L8CfcPma tTe7EUCQ3XVOKGnIPVJMFln8rIipR4PEsqu51KiHb5NRvOSGvT1SdIfoyQ5+PusWReWw b8LQMGr17W3fPkA8qcE2dAG9/NTMTTa7SZGMOtyQ8Y/kNjbEhLgbsCdhaPIUU8W8h5Zk PD8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gpg4x/MJEv2AkYRflNIyZmHBTjPx1zjuTG9VoTfOss8=; b=Y45Uvj9qcHvHgayMSxHKVJ9SQ7XnBfY0IlU6Rm9blsR9jyVDfqEn1GA9z4/5R88ZYY lruTOElagIPZ5UVNWf2f5RC5ColtrvYMrzdiJ5Wx61wUQb5b647yGP3vKsUfQjBXDnx1 BFeC+eGS4drVPQIGFLndudaEvpNBOdOROw7O0Y1UppWxIzINstU1SvRCHtx+jjxhWnoc 35g3RGWTiD02w7miUTFcAk2DeLBvF0fiAtzn0nfH0qvn9IpRLWyABq7J5TmfOSzRPnVQ rkJlZAdco3sV8gWqG60pGBZpbk4RYPAGCpN7SSKtLsRm+oPQg+gCouKssvVenbamwoeP lCeA== X-Gm-Message-State: AGi0PuY4h7HGHRi8dBqzrn2oUokhlnf1KrVT33rMl+G2JyjIvnFkC53Q GISk9r3sEOcnwXnzIBI5OfI= X-Google-Smtp-Source: APiQypKQTOudNQLzH8ECVfXHb76x8rh4vnBf/czgCvEMt7NSC23dPoxiCnqUQjEonivfuDJS/2MdvQ== X-Received: by 2002:a2e:b4e5:: with SMTP id s5mr2812095ljm.262.1586948972122; Wed, 15 Apr 2020 04:09:32 -0700 (PDT) Received: from Sovereign (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id s6sm6023113lfs.74.2020.04.15.04.09.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 04:09:31 -0700 (PDT) Date: Wed, 15 Apr 2020 14:09:30 +0300 From: Dmitry Kozlyuk To: Jerin Jacob Cc: dpdk-dev , "Dmitry Malloy (MESHCHANINOV)" , Narcisa Ana Maria Vasile , Fady Bader , Tal Shnaiderman , Anatoly Burakov , Ray Kinsella Message-ID: <20200415140930.51ba810c@Sovereign> In-Reply-To: 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> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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. Agreed. > Since it has ULL, I believe both cases(enum or define), it will be > treated as unsigned long long. ie. NO ABI breakage. I was talking about API only (compile-time compatibility). Getting rid of #ifdef and workarounds sounds right, we'll just need a notice in release notes. -- Dmitry Kozlyuk