On 12/21/2021 9:20 AM, Eli Cohen wrote:> All masks in this file are 64 bits. Change BIT to BIT_ULL. > > Other occurences use (1 << val) which yields a 32 bit value. Change them > to use BIT_ULL too. > > Signed-off-by: Eli Cohen <elic at nvidia.com>Reviewed-by: Si-Wei Liu <si-wei.liu at oracle.com>> --- > drivers/vdpa/vdpa.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c > index 4b649125a038..84ee11393349 100644 > --- a/drivers/vdpa/vdpa.c > +++ b/drivers/vdpa/vdpa.c > @@ -576,9 +576,9 @@ vdpa_nl_cmd_mgmtdev_get_dumpit(struct sk_buff *msg, struct netlink_callback *cb) > return msg->len; > } > > -#define VDPA_DEV_NET_ATTRS_MASK ((1 << VDPA_ATTR_DEV_NET_CFG_MACADDR) | \ > - (1 << VDPA_ATTR_DEV_NET_CFG_MTU) | \ > - (1 << VDPA_ATTR_DEV_NET_CFG_MAX_VQP)) > +#define VDPA_DEV_NET_ATTRS_MASK (BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MACADDR) | \ > + BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MTU) | \ > + BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MAX_VQP)) > > static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct genl_info *info) > { > @@ -597,12 +597,12 @@ static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct genl_info *i > if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]) { > macaddr = nla_data(nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]); > memcpy(config.net.mac, macaddr, sizeof(config.net.mac)); > - config.mask |= (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR); > + config.mask |= BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MACADDR); > } > if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MTU]) { > config.net.mtu > nla_get_u16(nl_attrs[VDPA_ATTR_DEV_NET_CFG_MTU]); > - config.mask |= (1 << VDPA_ATTR_DEV_NET_CFG_MTU); > + config.mask |= BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MTU); > } > if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MAX_VQP]) { > config.net.max_vq_pairs > @@ -814,7 +814,7 @@ static int vdpa_dev_net_mq_config_fill(struct vdpa_device *vdev, > { > u16 val_u16; > > - if ((features & (1ULL << VIRTIO_NET_F_MQ)) == 0) > + if ((features & BIT_ULL(VIRTIO_NET_F_MQ)) == 0) > return 0; > > val_u16 = le16_to_cpu(config->max_virtqueue_pairs);