devlink: use devlink_nl_put_u64() helper

Use devlink_nl_put_u64() shortcut added by prev commit on all devlink/.

Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Joe Damato <jdamato@fastly.com>
Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Link: https://patch.msgid.link/20241023131248.27192-3-przemyslaw.kitszel@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/devlink/dev.c b/net/devlink/dev.c
index 13c73f50da3d1664383e29a8cf572bc78c3759ba..9264bbc90d0cef7d64b9d734b09dceb5963b1db7 100644 (file)
--- a/net/devlink/dev.c
+++ b/net/devlink/dev.c
@@ -971,14 +971,14 @@ static int devlink_nl_flash_update_fill(struct sk_buff *msg,
            nla_put_string(msg, DEVLINK_ATTR_FLASH_UPDATE_COMPONENT,
                           params->component))
                goto nla_put_failure;
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE,
-                             params->done, DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE,
+                              params->done))
                goto nla_put_failure;
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL,
-                             params->total, DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL,
+                              params->total))
                goto nla_put_failure;
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_FLASH_UPDATE_STATUS_TIMEOUT,
-                             params->timeout, DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_FLASH_UPDATE_STATUS_TIMEOUT,
+                              params->timeout))
                goto nla_put_failure;
 
 out:

diff --git a/net/devlink/dpipe.c b/net/devlink/dpipe.c
index 55009b377447fe7734a1533828185e8e2e162bd8..e55701b007f0d4424e6297497e1b474585a1d3b4 100644 (file)
--- a/net/devlink/dpipe.c
+++ b/net/devlink/dpipe.c
@@ -165,18 +165,17 @@ static int devlink_dpipe_table_put(struct sk_buff *skb,
                return -EMSGSIZE;
 
        if (nla_put_string(skb, DEVLINK_ATTR_DPIPE_TABLE_NAME, table->name) ||
-           nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_TABLE_SIZE, table_size,
-                             DEVLINK_ATTR_PAD))
+           devlink_nl_put_u64(skb, DEVLINK_ATTR_DPIPE_TABLE_SIZE, table_size))
                goto nla_put_failure;
        if (nla_put_u8(skb, DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED,
                       table->counters_enabled))
                goto nla_put_failure;
 
        if (table->resource_valid) {
-               if (nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_ID,
-                                     table->resource_id, DEVLINK_ATTR_PAD) ||
-                   nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_UNITS,
-                                     table->resource_units, DEVLINK_ATTR_PAD))
+               if (devlink_nl_put_u64(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_ID,
+                                      table->resource_id) ||
+                   devlink_nl_put_u64(skb, DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_UNITS,
+                                      table->resource_units))
                        goto nla_put_failure;
        }
        if (devlink_dpipe_matches_put(table, skb))
@@ -403,12 +402,11 @@ static int devlink_dpipe_entry_put(struct sk_buff *skb,
        if (!entry_attr)
                return  -EMSGSIZE;
 
-       if (nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_ENTRY_INDEX, entry->index,
-                             DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(skb, DEVLINK_ATTR_DPIPE_ENTRY_INDEX, entry->index))
                goto nla_put_failure;
        if (entry->counter_valid)
-               if (nla_put_u64_64bit(skb, DEVLINK_ATTR_DPIPE_ENTRY_COUNTER,
-                                     entry->counter, DEVLINK_ATTR_PAD))
+               if (devlink_nl_put_u64(skb, DEVLINK_ATTR_DPIPE_ENTRY_COUNTER,
+                                      entry->counter))
                        goto nla_put_failure;
 
        matches_attr = nla_nest_start_noflag(skb,

diff --git a/net/devlink/health.c b/net/devlink/health.c
index acb8c0e174bb818c9b7f798c553b2cde48f3795e..b8d3084e6fe06359297e4c39ddf020419e6b9035 100644 (file)
--- a/net/devlink/health.c
+++ b/net/devlink/health.c
@@ -287,29 +287,27 @@ devlink_nl_health_reporter_fill(struct sk_buff *msg,
        if (nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_STATE,
                       reporter->health_state))
                goto reporter_nest_cancel;
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT,
-                             reporter->error_count, DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT,
+                              reporter->error_count))
                goto reporter_nest_cancel;
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT,
-                             reporter->recovery_count, DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT,
+                              reporter->recovery_count))
                goto reporter_nest_cancel;
        if (reporter->ops->recover &&
-           nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,
-                             reporter->graceful_period,
-                             DEVLINK_ATTR_PAD))
+           devlink_nl_put_u64(msg, DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,
+                              reporter->graceful_period))
                goto reporter_nest_cancel;
        if (reporter->ops->recover &&
            nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER,
                       reporter->auto_recover))
                goto reporter_nest_cancel;
        if (reporter->dump_fmsg &&
-           nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS,
-                             jiffies_to_msecs(reporter->dump_ts),
-                             DEVLINK_ATTR_PAD))
+           devlink_nl_put_u64(msg, DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS,
+                              jiffies_to_msecs(reporter->dump_ts)))
                goto reporter_nest_cancel;
        if (reporter->dump_fmsg &&
-           nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS_NS,
-                             reporter->dump_real_ts, DEVLINK_ATTR_PAD))
+           devlink_nl_put_u64(msg, DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS_NS,
+                              reporter->dump_real_ts))
                goto reporter_nest_cancel;
        if (reporter->ops->dump &&
            nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_AUTO_DUMP,
@@ -963,8 +961,7 @@ devlink_fmsg_item_fill_data(struct devlink_fmsg_item *msg, struct sk_buff *skb)
        case NLA_U32:
                return nla_put_u32(skb, attrtype, *(u32 *)msg->value);
        case NLA_U64:
-               return nla_put_u64_64bit(skb, attrtype, *(u64 *)msg->value,
-                                        DEVLINK_ATTR_PAD);
+               return devlink_nl_put_u64(skb, attrtype, *(u64 *)msg->value);
        case NLA_NUL_STRING:
                return nla_put_string(skb, attrtype, (char *)&msg->value);
        case NLA_BINARY:

diff --git a/net/devlink/rate.c b/net/devlink/rate.c
index 7139e67e93aebf7f9b5435f4fc672d35f4331967..8828ffaf6cbc0372115674e52d754bd9ed65dca9 100644 (file)
--- a/net/devlink/rate.c
+++ b/net/devlink/rate.c
@@ -108,12 +108,12 @@ static int devlink_nl_rate_fill(struct sk_buff *msg,
                        goto nla_put_failure;
        }
 
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_RATE_TX_SHARE,
-                             devlink_rate->tx_share, DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_RATE_TX_SHARE,
+                              devlink_rate->tx_share))
                goto nla_put_failure;
 
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_RATE_TX_MAX,
-                             devlink_rate->tx_max, DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_RATE_TX_MAX,
+                              devlink_rate->tx_max))
                goto nla_put_failure;
 
        if (nla_put_u32(msg, DEVLINK_ATTR_RATE_TX_PRIORITY,

diff --git a/net/devlink/region.c b/net/devlink/region.c
index 7319127c5913febb31ce18333302560d6991dc4d..0a75a2fbd4d78b224efbb95a5880db1f1a63d772 100644 (file)
--- a/net/devlink/region.c
+++ b/net/devlink/region.c
@@ -145,9 +145,7 @@ static int devlink_nl_region_fill(struct sk_buff *msg, struct devlink *devlink,
        if (err)
                goto nla_put_failure;
 
-       err = nla_put_u64_64bit(msg, DEVLINK_ATTR_REGION_SIZE,
-                               region->size,
-                               DEVLINK_ATTR_PAD);
+       err = devlink_nl_put_u64(msg, DEVLINK_ATTR_REGION_SIZE, region->size);
        if (err)
                goto nla_put_failure;
 
@@ -210,8 +208,8 @@ devlink_nl_region_notify_build(struct devlink_region *region,
                if (err)
                        goto out_cancel_msg;
        } else {
-               err = nla_put_u64_64bit(msg, DEVLINK_ATTR_REGION_SIZE,
-                                       region->size, DEVLINK_ATTR_PAD);
+               err = devlink_nl_put_u64(msg, DEVLINK_ATTR_REGION_SIZE,
+                                        region->size);
                if (err)
                        goto out_cancel_msg;
        }
@@ -773,8 +771,7 @@ static int devlink_nl_cmd_region_read_chunk_fill(struct sk_buff *msg,
        if (err)
                goto nla_put_failure;
 
-       err = nla_put_u64_64bit(msg, DEVLINK_ATTR_REGION_CHUNK_ADDR, addr,
-                               DEVLINK_ATTR_PAD);
+       err = devlink_nl_put_u64(msg, DEVLINK_ATTR_REGION_CHUNK_ADDR, addr);
        if (err)
                goto nla_put_failure;
 

diff --git a/net/devlink/resource.c b/net/devlink/resource.c
index 594c8aeb3bfa015f1296a3f1c8c362664a266418..5ce05e94f48410137af07b719e633b07d94de109 100644 (file)
--- a/net/devlink/resource.c
+++ b/net/devlink/resource.c
@@ -141,12 +141,12 @@ devlink_resource_size_params_put(struct devlink_resource *resource,
        struct devlink_resource_size_params *size_params;
 
        size_params = &resource->size_params;
-       if (nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_GRAN,
-                             size_params->size_granularity, DEVLINK_ATTR_PAD) ||
-           nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_MAX,
-                             size_params->size_max, DEVLINK_ATTR_PAD) ||
-           nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_MIN,
-                             size_params->size_min, DEVLINK_ATTR_PAD) ||
+       if (devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE_GRAN,
+                              size_params->size_granularity) ||
+           devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE_MAX,
+                              size_params->size_max) ||
+           devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE_MIN,
+                              size_params->size_min) ||
            nla_put_u8(skb, DEVLINK_ATTR_RESOURCE_UNIT, size_params->unit))
                return -EMSGSIZE;
        return 0;
@@ -157,9 +157,8 @@ static int devlink_resource_occ_put(struct devlink_resource *resource,
 {
        if (!resource->occ_get)
                return 0;
-       return nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_OCC,
-                                resource->occ_get(resource->occ_get_priv),
-                                DEVLINK_ATTR_PAD);
+       return devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_OCC,
+                                 resource->occ_get(resource->occ_get_priv));
 }
 
 static int devlink_resource_put(struct devlink *devlink, struct sk_buff *skb,
@@ -174,14 +173,12 @@ static int devlink_resource_put(struct devlink *devlink, struct sk_buff *skb,
                return -EMSGSIZE;
 
        if (nla_put_string(skb, DEVLINK_ATTR_RESOURCE_NAME, resource->name) ||
-           nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE, resource->size,
-                             DEVLINK_ATTR_PAD) ||
-           nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_ID, resource->id,
-                             DEVLINK_ATTR_PAD))
+           devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE, resource->size) ||
+           devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_ID, resource->id))
                goto nla_put_failure;
        if (resource->size != resource->size_new &&
-           nla_put_u64_64bit(skb, DEVLINK_ATTR_RESOURCE_SIZE_NEW,
-                             resource->size_new, DEVLINK_ATTR_PAD))
+           devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE_NEW,
+                              resource->size_new))
                goto nla_put_failure;
        if (devlink_resource_occ_put(resource, skb))
                goto nla_put_failure;

diff --git a/net/devlink/trap.c b/net/devlink/trap.c
index 5d18c7424df1afa86b108a02876e2d524fbf7144..f36087f90db51db307ce1d7d40cc359d3a18dcb8 100644 (file)
--- a/net/devlink/trap.c
+++ b/net/devlink/trap.c
@@ -189,14 +189,12 @@ devlink_trap_group_stats_put(struct sk_buff *msg,
        if (!attr)
                return -EMSGSIZE;
 
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_STATS_RX_PACKETS,
-                             u64_stats_read(&stats.rx_packets),
-                             DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_STATS_RX_PACKETS,
+                              u64_stats_read(&stats.rx_packets)))
                goto nla_put_failure;
 
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_STATS_RX_BYTES,
-                             u64_stats_read(&stats.rx_bytes),
-                             DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_STATS_RX_BYTES,
+                              u64_stats_read(&stats.rx_bytes)))
                goto nla_put_failure;
 
        nla_nest_end(msg, attr);
@@ -231,18 +229,15 @@ static int devlink_trap_stats_put(struct sk_buff *msg, struct devlink *devlink,
                return -EMSGSIZE;
 
        if (devlink->ops->trap_drop_counter_get &&
-           nla_put_u64_64bit(msg, DEVLINK_ATTR_STATS_RX_DROPPED, drops,
-                             DEVLINK_ATTR_PAD))
+           devlink_nl_put_u64(msg, DEVLINK_ATTR_STATS_RX_DROPPED, drops))
                goto nla_put_failure;
 
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_STATS_RX_PACKETS,
-                             u64_stats_read(&stats.rx_packets),
-                             DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_STATS_RX_PACKETS,
+                              u64_stats_read(&stats.rx_packets)))
                goto nla_put_failure;
 
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_STATS_RX_BYTES,
-                             u64_stats_read(&stats.rx_bytes),
-                             DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_STATS_RX_BYTES,
+                              u64_stats_read(&stats.rx_bytes)))
                goto nla_put_failure;
 
        nla_nest_end(msg, attr);
@@ -750,8 +745,7 @@ devlink_trap_policer_stats_put(struct sk_buff *msg, struct devlink *devlink,
        if (!attr)
                return -EMSGSIZE;
 
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_STATS_RX_DROPPED, drops,
-                             DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_STATS_RX_DROPPED, drops))
                goto nla_put_failure;
 
        nla_nest_end(msg, attr);
@@ -783,12 +777,12 @@ devlink_nl_trap_policer_fill(struct sk_buff *msg, struct devlink *devlink,
                        policer_item->policer->id))
                goto nla_put_failure;
 
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_TRAP_POLICER_RATE,
-                             policer_item->rate, DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_TRAP_POLICER_RATE,
+                              policer_item->rate))
                goto nla_put_failure;
 
-       if (nla_put_u64_64bit(msg, DEVLINK_ATTR_TRAP_POLICER_BURST,
-                             policer_item->burst, DEVLINK_ATTR_PAD))
+       if (devlink_nl_put_u64(msg, DEVLINK_ATTR_TRAP_POLICER_BURST,
+                              policer_item->burst))
                goto nla_put_failure;
 
        err = devlink_trap_policer_stats_put(msg, devlink,