From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UPPERCASE_50_75,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3D6BC433DF for ; Fri, 21 Aug 2020 23:13:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 957142067C for ; Fri, 21 Aug 2020 23:13:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="SFkFEtDP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726817AbgHUXN2 (ORCPT ); Fri, 21 Aug 2020 19:13:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726541AbgHUXN0 (ORCPT ); Fri, 21 Aug 2020 19:13:26 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC5BFC061573 for ; Fri, 21 Aug 2020 16:13:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To:Subject:Sender :Reply-To:Content-ID:Content-Description; bh=m7RfewVLa8YXRGQn+dkSgkj1/tUR4KO62lCzO2eGme0=; b=SFkFEtDPiTOFzC89MGpp0n9oGq mJvgsCKzGl00eAbqTVPpCyy9au4WCddYjJOixeUC+1Xel6PuGHY1pR/ZIXWe33lmrO8H1Wch+M9RM zHv9docnzihGwCvRHsI+QtWENI+YggQ4IWqycwtf+wi98kPeh904P/VHs3U0oxrRnzMUJKY9oUH+G /cVyZZ0zxgBPKkDSTrh9+aF2KQIiSMqxmJm9p6hvFc5cksZHMd6aC/+8l7fMFF99yfm7fyyY12/rT Ic6h5dclFxSdjl7FPnjlVO8Z7eXP9zwLji6+dcYrk/ybR+nCImqgNlNlv18vJPJCum8jJd6uMbK58 SLF8VZ6A==; Received: from [2601:1c0:6280:3f0::19c2] by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9GDr-0001Qs-1n; Fri, 21 Aug 2020 23:13:23 +0000 Subject: Re: [PATCH] vdpa/mlx5: Avoid warnings about shifts on 32-bit platforms To: Nathan Chancellor , "Michael S. Tsirkin" , Jason Wang , Eli Cohen Cc: virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com References: <20200821225018.940798-1-natechancellor@gmail.com> From: Randy Dunlap Message-ID: <1975c0a0-c19a-c91e-dc10-2918061cc4e7@infradead.org> Date: Fri, 21 Aug 2020 16:13:19 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200821225018.940798-1-natechancellor@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/21/20 3:50 PM, Nathan Chancellor wrote: > Clang warns several times when building for 32-bit ARM along the lines > of: > > drivers/vdpa/mlx5/net/mlx5_vnet.c:1462:31: warning: shift count >= width > of type [-Wshift-count-overflow] > ndev->mvdev.mlx_features |= BIT(VIRTIO_F_VERSION_1); > ^~~~~~~~~~~~~~~~~~~~~~~ > > This is related to the BIT macro, which uses an unsigned long literal, > which is 32-bit on ARM so having a shift equal to or larger than 32 will > cause this warning, such as the above, where VIRTIO_F_VERSION_1 is 32. > To avoid this, use BIT_ULL, which will be an unsigned long long. This > matches the size of the features field throughout this driver, which is > u64 so there should be no functional change. > > Fixes: 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices") > Link: https://github.com/ClangBuiltLinux/linux/issues/1140 > Signed-off-by: Nathan Chancellor Reported-by: Randy Dunlap on 2020-AUG-10 for i386: https://lore.kernel.org/linux-next/5a7a0e6d-842a-78f6-aeac-c5b4c27b7186@infradead.org/ :( Acked-by: Randy Dunlap # build-tested Thanks. > --- > drivers/vdpa/mlx5/net/mlx5_vnet.c | 50 +++++++++++++++---------------- > 1 file changed, 25 insertions(+), 25 deletions(-) > > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c > index 9df69d5efe8c..70676a6d1691 100644 > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c > @@ -16,19 +16,19 @@ > #define to_mvdev(__vdev) container_of((__vdev), struct mlx5_vdpa_dev, vdev) > > #define VALID_FEATURES_MASK \ > - (BIT(VIRTIO_NET_F_CSUM) | BIT(VIRTIO_NET_F_GUEST_CSUM) | \ > - BIT(VIRTIO_NET_F_CTRL_GUEST_OFFLOADS) | BIT(VIRTIO_NET_F_MTU) | BIT(VIRTIO_NET_F_MAC) | \ > - BIT(VIRTIO_NET_F_GUEST_TSO4) | BIT(VIRTIO_NET_F_GUEST_TSO6) | \ > - BIT(VIRTIO_NET_F_GUEST_ECN) | BIT(VIRTIO_NET_F_GUEST_UFO) | BIT(VIRTIO_NET_F_HOST_TSO4) | \ > - BIT(VIRTIO_NET_F_HOST_TSO6) | BIT(VIRTIO_NET_F_HOST_ECN) | BIT(VIRTIO_NET_F_HOST_UFO) | \ > - BIT(VIRTIO_NET_F_MRG_RXBUF) | BIT(VIRTIO_NET_F_STATUS) | BIT(VIRTIO_NET_F_CTRL_VQ) | \ > - BIT(VIRTIO_NET_F_CTRL_RX) | BIT(VIRTIO_NET_F_CTRL_VLAN) | \ > - BIT(VIRTIO_NET_F_CTRL_RX_EXTRA) | BIT(VIRTIO_NET_F_GUEST_ANNOUNCE) | \ > - BIT(VIRTIO_NET_F_MQ) | BIT(VIRTIO_NET_F_CTRL_MAC_ADDR) | BIT(VIRTIO_NET_F_HASH_REPORT) | \ > - BIT(VIRTIO_NET_F_RSS) | BIT(VIRTIO_NET_F_RSC_EXT) | BIT(VIRTIO_NET_F_STANDBY) | \ > - BIT(VIRTIO_NET_F_SPEED_DUPLEX) | BIT(VIRTIO_F_NOTIFY_ON_EMPTY) | \ > - BIT(VIRTIO_F_ANY_LAYOUT) | BIT(VIRTIO_F_VERSION_1) | BIT(VIRTIO_F_ACCESS_PLATFORM) | \ > - BIT(VIRTIO_F_RING_PACKED) | BIT(VIRTIO_F_ORDER_PLATFORM) | BIT(VIRTIO_F_SR_IOV)) > + (BIT_ULL(VIRTIO_NET_F_CSUM) | BIT_ULL(VIRTIO_NET_F_GUEST_CSUM) | \ > + BIT_ULL(VIRTIO_NET_F_CTRL_GUEST_OFFLOADS) | BIT_ULL(VIRTIO_NET_F_MTU) | BIT_ULL(VIRTIO_NET_F_MAC) | \ > + BIT_ULL(VIRTIO_NET_F_GUEST_TSO4) | BIT_ULL(VIRTIO_NET_F_GUEST_TSO6) | \ > + BIT_ULL(VIRTIO_NET_F_GUEST_ECN) | BIT_ULL(VIRTIO_NET_F_GUEST_UFO) | BIT_ULL(VIRTIO_NET_F_HOST_TSO4) | \ > + BIT_ULL(VIRTIO_NET_F_HOST_TSO6) | BIT_ULL(VIRTIO_NET_F_HOST_ECN) | BIT_ULL(VIRTIO_NET_F_HOST_UFO) | \ > + BIT_ULL(VIRTIO_NET_F_MRG_RXBUF) | BIT_ULL(VIRTIO_NET_F_STATUS) | BIT_ULL(VIRTIO_NET_F_CTRL_VQ) | \ > + BIT_ULL(VIRTIO_NET_F_CTRL_RX) | BIT_ULL(VIRTIO_NET_F_CTRL_VLAN) | \ > + BIT_ULL(VIRTIO_NET_F_CTRL_RX_EXTRA) | BIT_ULL(VIRTIO_NET_F_GUEST_ANNOUNCE) | \ > + BIT_ULL(VIRTIO_NET_F_MQ) | BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR) | BIT_ULL(VIRTIO_NET_F_HASH_REPORT) | \ > + BIT_ULL(VIRTIO_NET_F_RSS) | BIT_ULL(VIRTIO_NET_F_RSC_EXT) | BIT_ULL(VIRTIO_NET_F_STANDBY) | \ > + BIT_ULL(VIRTIO_NET_F_SPEED_DUPLEX) | BIT_ULL(VIRTIO_F_NOTIFY_ON_EMPTY) | \ > + BIT_ULL(VIRTIO_F_ANY_LAYOUT) | BIT_ULL(VIRTIO_F_VERSION_1) | BIT_ULL(VIRTIO_F_ACCESS_PLATFORM) | \ > + BIT_ULL(VIRTIO_F_RING_PACKED) | BIT_ULL(VIRTIO_F_ORDER_PLATFORM) | BIT_ULL(VIRTIO_F_SR_IOV)) > > #define VALID_STATUS_MASK \ > (VIRTIO_CONFIG_S_ACKNOWLEDGE | VIRTIO_CONFIG_S_DRIVER | VIRTIO_CONFIG_S_DRIVER_OK | \ > @@ -149,7 +149,7 @@ static bool mlx5_vdpa_debug; > > #define MLX5_LOG_VIO_FLAG(_feature) \ > do { \ > - if (features & BIT(_feature)) \ > + if (features & BIT_ULL(_feature)) \ > mlx5_vdpa_info(mvdev, "%s\n", #_feature); \ > } while (0) > > @@ -750,10 +750,10 @@ static bool vq_is_tx(u16 idx) > > static u16 get_features_12_3(u64 features) > { > - return (!!(features & BIT(VIRTIO_NET_F_HOST_TSO4)) << 9) | > - (!!(features & BIT(VIRTIO_NET_F_HOST_TSO6)) << 8) | > - (!!(features & BIT(VIRTIO_NET_F_CSUM)) << 7) | > - (!!(features & BIT(VIRTIO_NET_F_GUEST_CSUM)) << 6); > + return (!!(features & BIT_ULL(VIRTIO_NET_F_HOST_TSO4)) << 9) | > + (!!(features & BIT_ULL(VIRTIO_NET_F_HOST_TSO6)) << 8) | > + (!!(features & BIT_ULL(VIRTIO_NET_F_CSUM)) << 7) | > + (!!(features & BIT_ULL(VIRTIO_NET_F_GUEST_CSUM)) << 6); > } > > static int create_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq) > @@ -1439,13 +1439,13 @@ static u64 mlx_to_vritio_features(u16 dev_features) > u64 result = 0; > > if (dev_features & MLX5_VIRTIO_NET_F_GUEST_CSUM) > - result |= BIT(VIRTIO_NET_F_GUEST_CSUM); > + result |= BIT_ULL(VIRTIO_NET_F_GUEST_CSUM); > if (dev_features & MLX5_VIRTIO_NET_F_CSUM) > - result |= BIT(VIRTIO_NET_F_CSUM); > + result |= BIT_ULL(VIRTIO_NET_F_CSUM); > if (dev_features & MLX5_VIRTIO_NET_F_HOST_TSO6) > - result |= BIT(VIRTIO_NET_F_HOST_TSO6); > + result |= BIT_ULL(VIRTIO_NET_F_HOST_TSO6); > if (dev_features & MLX5_VIRTIO_NET_F_HOST_TSO4) > - result |= BIT(VIRTIO_NET_F_HOST_TSO4); > + result |= BIT_ULL(VIRTIO_NET_F_HOST_TSO4); > > return result; > } > @@ -1459,15 +1459,15 @@ static u64 mlx5_vdpa_get_features(struct vdpa_device *vdev) > dev_features = MLX5_CAP_DEV_VDPA_EMULATION(mvdev->mdev, device_features_bits_mask); > ndev->mvdev.mlx_features = mlx_to_vritio_features(dev_features); > if (MLX5_CAP_DEV_VDPA_EMULATION(mvdev->mdev, virtio_version_1_0)) > - ndev->mvdev.mlx_features |= BIT(VIRTIO_F_VERSION_1); > - ndev->mvdev.mlx_features |= BIT(VIRTIO_F_ACCESS_PLATFORM); > + ndev->mvdev.mlx_features |= BIT_ULL(VIRTIO_F_VERSION_1); > + ndev->mvdev.mlx_features |= BIT_ULL(VIRTIO_F_ACCESS_PLATFORM); > print_features(mvdev, ndev->mvdev.mlx_features, false); > return ndev->mvdev.mlx_features; > } > > static int verify_min_features(struct mlx5_vdpa_dev *mvdev, u64 features) > { > - if (!(features & BIT(VIRTIO_F_ACCESS_PLATFORM))) > + if (!(features & BIT_ULL(VIRTIO_F_ACCESS_PLATFORM))) > return -EOPNOTSUPP; > > return 0; > > base-commit: 8a7c3213db068135e816a6a517157de6443290d6 > -- ~Randy