Merge branch 'devlink-finish-conversion-to-generated-split_ops'

Jiri Pirko says:

====================
devlink: finish conversion to generated split_ops

This patchset converts the remaining genetlink commands to generated
split_ops and removes the existing small_ops arrays entirely
alongside with shared netlink attribute policy.

Patches #1-#6 are just small preparations and small fixes on multiple
              places. Note that couple of patches contain the "Fixes"
              tag but no need to put them into -net tree.
Patch #7 is a simple rename preparation
Patch #8 is the main one in this set and adds actual definitions of cmds
         in to yaml file.
Patches #9-#10 finalize the change removing bits that are no longer in
               use.
====================

Link: https://lore.kernel.org/r/20231021112711.660606-1-jiri@resnulli.us
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
index 6fa79898c42c50c6d075c0155db4c84db1d61fa8..58c5412d317361345a210bd6c6d4c75f883325a5 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
@@ -1160,6 +1160,7 @@ static void idpf_rxq_set_descids(struct idpf_vport *vport, struct idpf_queue *q)
  */
 static int idpf_txq_group_alloc(struct idpf_vport *vport, u16 num_txq)
 {
+       bool flow_sch_en;
        int err, i;
 
        vport->txq_grps = kcalloc(vport->num_txq_grp,
@@ -1167,6 +1168,9 @@ static int idpf_txq_group_alloc(struct idpf_vport *vport, u16 num_txq)
        if (!vport->txq_grps)
                return -ENOMEM;
 
+       flow_sch_en = !idpf_is_cap_ena(vport->adapter, IDPF_OTHER_CAPS,
+                                      VIRTCHNL2_CAP_SPLITQ_QSCHED);
+
        for (i = 0; i < vport->num_txq_grp; i++) {
                struct idpf_txq_group *tx_qgrp = &vport->txq_grps[i];
                struct idpf_adapter *adapter = vport->adapter;
@@ -1195,8 +1199,7 @@ static int idpf_txq_group_alloc(struct idpf_vport *vport, u16 num_txq)
                        q->txq_grp = tx_qgrp;
                        hash_init(q->sched_buf_hash);
 
-                       if (!idpf_is_cap_ena(adapter, IDPF_OTHER_CAPS,
-                                            VIRTCHNL2_CAP_SPLITQ_QSCHED))
+                       if (flow_sch_en)
                                set_bit(__IDPF_Q_FLOW_SCH_EN, q->flags);
                }
 
@@ -1215,6 +1218,9 @@ static int idpf_txq_group_alloc(struct idpf_vport *vport, u16 num_txq)
                tx_qgrp->complq->desc_count = vport->complq_desc_count;
                tx_qgrp->complq->vport = vport;
                tx_qgrp->complq->txq_grp = tx_qgrp;
+
+               if (flow_sch_en)
+                       __set_bit(__IDPF_Q_FLOW_SCH_EN, tx_qgrp->complq->flags);
        }
 
        return 0;

diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
index 9bc85b2f1709daf950ce0849ee455b5dcb64e729..2c1b051fdc0d4868def4420ec099972740a5109a 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
@@ -1473,7 +1473,7 @@ static int idpf_send_config_tx_queues_msg(struct idpf_vport *vport)
        /* Populate the queue info buffer with all queue context info */
        for (i = 0; i < vport->num_txq_grp; i++) {
                struct idpf_txq_group *tx_qgrp = &vport->txq_grps[i];
-               int j;
+               int j, sched_mode;
 
                for (j = 0; j < tx_qgrp->num_txq; j++, k++) {
                        qi[k].queue_id =
@@ -1514,6 +1514,12 @@ static int idpf_send_config_tx_queues_msg(struct idpf_vport *vport)
                qi[k].ring_len = cpu_to_le16(tx_qgrp->complq->desc_count);
                qi[k].dma_ring_addr = cpu_to_le64(tx_qgrp->complq->dma);
 
+               if (test_bit(__IDPF_Q_FLOW_SCH_EN, tx_qgrp->complq->flags))
+                       sched_mode = VIRTCHNL2_TXQ_SCHED_MODE_FLOW;
+               else
+                       sched_mode = VIRTCHNL2_TXQ_SCHED_MODE_QUEUE;
+               qi[k].sched_mode = cpu_to_le16(sched_mode);
+
                k++;
        }
 
@@ -3140,6 +3146,7 @@ restart:
 
 err_intr_req:
        cancel_delayed_work_sync(&adapter->serv_task);
+       cancel_delayed_work_sync(&adapter->mbx_task);
        idpf_vport_params_buf_rel(adapter);
 err_netdev_alloc:
        kfree(adapter->vports);

diff --git a/drivers/net/mdio/mdio-xgene.c b/drivers/net/mdio/mdio-xgene.c
index 495fbe35b6ce20827c25b98b1bc07e0aabc0fff6..2772a309854369f6838d4e6fa00edd6dca4000e3 100644 (file)
--- a/drivers/net/mdio/mdio-xgene.c
+++ b/drivers/net/mdio/mdio-xgene.c
@@ -437,7 +437,7 @@ static void xgene_mdio_remove(struct platform_device *pdev)
 static struct platform_driver xgene_mdio_driver = {
        .driver = {
                .name = "xgene-mdio",
-               .of_match_table = of_match_ptr(xgene_mdio_of_match),
+               .of_match_table = xgene_mdio_of_match,
                .acpi_match_table = ACPI_PTR(xgene_mdio_acpi_match),
        },
        .probe = xgene_mdio_probe,

diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c
index 8eacdb54e72f4412af1834bfdb2c387d41516349..bf9d00518a60853b27910c47738509c09d53bf19 100644 (file)
--- a/net/sched/sch_fq.c
+++ b/net/sched/sch_fq.c
@@ -383,6 +383,10 @@ static struct fq_flow *fq_classify(struct Qdisc *sch, struct sk_buff *skb,
 
        if (fq_fastpath_check(sch, skb, now)) {
                q->internal.stat_fastpath_packets++;
+               if (skb->sk == sk && q->rate_enable &&
+                   READ_ONCE(sk->sk_pacing_status) != SK_PACING_FQ)
+                       smp_store_release(&sk->sk_pacing_status,
+                                         SK_PACING_FQ);
                return &q->internal;
        }
 
@@ -651,7 +655,7 @@ static struct sk_buff *fq_dequeue(struct Qdisc *sch)
 begin:
        head = fq_pband_head_select(pband);
        if (!head) {
-               while (++retry < FQ_BANDS) {
+               while (++retry <= FQ_BANDS) {
                        if (++q->band_nr == FQ_BANDS)
                                q->band_nr = 0;
                        pband = &q->band_flows[q->band_nr];

diff --git a/tools/net/ynl/generated/devlink-user.h b/tools/net/ynl/generated/devlink-user.h
index 9f45cc0d854c52559b8f75492016e66c014d088d..1db4edc36eaa1c2e67d2ca9fa5372ee72c6e8f0b 100644 (file)
--- a/tools/net/ynl/generated/devlink-user.h
+++ b/tools/net/ynl/generated/devlink-user.h
@@ -380,7 +380,7 @@ devlink_get(struct ynl_sock *ys, struct devlink_get_req *req);
 /* DEVLINK_CMD_GET - dump */
 struct devlink_get_list {
        struct devlink_get_list *next;
-       struct devlink_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_get_rsp obj __attribute__((aligned(8)));
 };
 
 void devlink_get_list_free(struct devlink_get_list *rsp);
@@ -508,7 +508,7 @@ struct devlink_port_get_rsp_dump {
 
 struct devlink_port_get_rsp_list {
        struct devlink_port_get_rsp_list *next;
-       struct devlink_port_get_rsp_dump obj __attribute__ ((aligned (8)));
+       struct devlink_port_get_rsp_dump obj __attribute__((aligned(8)));
 };
 
 void devlink_port_get_rsp_list_free(struct devlink_port_get_rsp_list *rsp);
@@ -996,7 +996,7 @@ devlink_sb_get_req_dump_set_dev_name(struct devlink_sb_get_req_dump *req,
 
 struct devlink_sb_get_list {
        struct devlink_sb_get_list *next;
-       struct devlink_sb_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_sb_get_rsp obj __attribute__((aligned(8)));
 };
 
 void devlink_sb_get_list_free(struct devlink_sb_get_list *rsp);
@@ -1126,7 +1126,7 @@ devlink_sb_pool_get_req_dump_set_dev_name(struct devlink_sb_pool_get_req_dump *r
 
 struct devlink_sb_pool_get_list {
        struct devlink_sb_pool_get_list *next;
-       struct devlink_sb_pool_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_sb_pool_get_rsp obj __attribute__((aligned(8)));
 };
 
 void devlink_sb_pool_get_list_free(struct devlink_sb_pool_get_list *rsp);
@@ -1353,7 +1353,7 @@ devlink_sb_port_pool_get_req_dump_set_dev_name(struct devlink_sb_port_pool_get_r
 
 struct devlink_sb_port_pool_get_list {
        struct devlink_sb_port_pool_get_list *next;
-       struct devlink_sb_port_pool_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_sb_port_pool_get_rsp obj __attribute__((aligned(8)));
 };
 
 void
@@ -1593,7 +1593,7 @@ devlink_sb_tc_pool_bind_get_req_dump_set_dev_name(struct devlink_sb_tc_pool_bind
 
 struct devlink_sb_tc_pool_bind_get_list {
        struct devlink_sb_tc_pool_bind_get_list *next;
-       struct devlink_sb_tc_pool_bind_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_sb_tc_pool_bind_get_rsp obj __attribute__((aligned(8)));
 };
 
 void
@@ -2570,7 +2570,7 @@ devlink_param_get_req_dump_set_dev_name(struct devlink_param_get_req_dump *req,
 
 struct devlink_param_get_list {
        struct devlink_param_get_list *next;
-       struct devlink_param_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_param_get_rsp obj __attribute__((aligned(8)));
 };
 
 void devlink_param_get_list_free(struct devlink_param_get_list *rsp);
@@ -2776,7 +2776,7 @@ devlink_region_get_req_dump_set_dev_name(struct devlink_region_get_req_dump *req
 
 struct devlink_region_get_list {
        struct devlink_region_get_list *next;
-       struct devlink_region_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_region_get_rsp obj __attribute__((aligned(8)));
 };
 
 void devlink_region_get_list_free(struct devlink_region_get_list *rsp);
@@ -3279,7 +3279,7 @@ devlink_info_get(struct ynl_sock *ys, struct devlink_info_get_req *req);
 /* DEVLINK_CMD_INFO_GET - dump */
 struct devlink_info_get_list {
        struct devlink_info_get_list *next;
-       struct devlink_info_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_info_get_rsp obj __attribute__((aligned(8)));
 };
 
 void devlink_info_get_list_free(struct devlink_info_get_list *rsp);
@@ -3423,7 +3423,7 @@ devlink_health_reporter_get_req_dump_set_port_index(struct devlink_health_report
 
 struct devlink_health_reporter_get_list {
        struct devlink_health_reporter_get_list *next;
-       struct devlink_health_reporter_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_health_reporter_get_rsp obj __attribute__((aligned(8)));
 };
 
 void
@@ -4005,7 +4005,7 @@ devlink_trap_get_req_dump_set_dev_name(struct devlink_trap_get_req_dump *req,
 
 struct devlink_trap_get_list {
        struct devlink_trap_get_list *next;
-       struct devlink_trap_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_trap_get_rsp obj __attribute__((aligned(8)));
 };
 
 void devlink_trap_get_list_free(struct devlink_trap_get_list *rsp);
@@ -4194,7 +4194,7 @@ devlink_trap_group_get_req_dump_set_dev_name(struct devlink_trap_group_get_req_d
 
 struct devlink_trap_group_get_list {
        struct devlink_trap_group_get_list *next;
-       struct devlink_trap_group_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_trap_group_get_rsp obj __attribute__((aligned(8)));
 };
 
 void devlink_trap_group_get_list_free(struct devlink_trap_group_get_list *rsp);
@@ -4393,7 +4393,7 @@ devlink_trap_policer_get_req_dump_set_dev_name(struct devlink_trap_policer_get_r
 
 struct devlink_trap_policer_get_list {
        struct devlink_trap_policer_get_list *next;
-       struct devlink_trap_policer_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_trap_policer_get_rsp obj __attribute__((aligned(8)));
 };
 
 void
@@ -4668,7 +4668,7 @@ devlink_rate_get_req_dump_set_dev_name(struct devlink_rate_get_req_dump *req,
 
 struct devlink_rate_get_list {
        struct devlink_rate_get_list *next;
-       struct devlink_rate_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_rate_get_rsp obj __attribute__((aligned(8)));
 };
 
 void devlink_rate_get_list_free(struct devlink_rate_get_list *rsp);
@@ -5052,7 +5052,7 @@ devlink_linecard_get_req_dump_set_dev_name(struct devlink_linecard_get_req_dump
 
 struct devlink_linecard_get_list {
        struct devlink_linecard_get_list *next;
-       struct devlink_linecard_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_linecard_get_rsp obj __attribute__((aligned(8)));
 };
 
 void devlink_linecard_get_list_free(struct devlink_linecard_get_list *rsp);
@@ -5190,7 +5190,7 @@ devlink_selftests_get(struct ynl_sock *ys,
 /* DEVLINK_CMD_SELFTESTS_GET - dump */
 struct devlink_selftests_get_list {
        struct devlink_selftests_get_list *next;
-       struct devlink_selftests_get_rsp obj __attribute__ ((aligned (8)));
+       struct devlink_selftests_get_rsp obj __attribute__((aligned(8)));
 };
 
 void devlink_selftests_get_list_free(struct devlink_selftests_get_list *rsp);

diff --git a/tools/net/ynl/generated/ethtool-user.h b/tools/net/ynl/generated/ethtool-user.h
index ddc1a52099929dd93d006f544f6a7f27fffaa559..ca0ec5fd7798c42a1c1a54140a59551180f2f8e5 100644 (file)
--- a/tools/net/ynl/generated/ethtool-user.h
+++ b/tools/net/ynl/generated/ethtool-user.h
@@ -347,7 +347,7 @@ ethtool_strset_get_req_dump_set_counts_only(struct ethtool_strset_get_req_dump *
 
 struct ethtool_strset_get_list {
        struct ethtool_strset_get_list *next;
-       struct ethtool_strset_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_strset_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_strset_get_list_free(struct ethtool_strset_get_list *rsp);
@@ -472,7 +472,7 @@ ethtool_linkinfo_get_req_dump_set_header_flags(struct ethtool_linkinfo_get_req_d
 
 struct ethtool_linkinfo_get_list {
        struct ethtool_linkinfo_get_list *next;
-       struct ethtool_linkinfo_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_linkinfo_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_linkinfo_get_list_free(struct ethtool_linkinfo_get_list *rsp);
@@ -487,7 +487,7 @@ struct ethtool_linkinfo_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_linkinfo_get_ntf *ntf);
-       struct ethtool_linkinfo_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_linkinfo_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_linkinfo_get_ntf_free(struct ethtool_linkinfo_get_ntf *rsp);
@@ -712,7 +712,7 @@ ethtool_linkmodes_get_req_dump_set_header_flags(struct ethtool_linkmodes_get_req
 
 struct ethtool_linkmodes_get_list {
        struct ethtool_linkmodes_get_list *next;
-       struct ethtool_linkmodes_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_linkmodes_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_linkmodes_get_list_free(struct ethtool_linkmodes_get_list *rsp);
@@ -727,7 +727,7 @@ struct ethtool_linkmodes_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_linkmodes_get_ntf *ntf);
-       struct ethtool_linkmodes_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_linkmodes_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_linkmodes_get_ntf_free(struct ethtool_linkmodes_get_ntf *rsp);
@@ -1014,7 +1014,7 @@ ethtool_linkstate_get_req_dump_set_header_flags(struct ethtool_linkstate_get_req
 
 struct ethtool_linkstate_get_list {
        struct ethtool_linkstate_get_list *next;
-       struct ethtool_linkstate_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_linkstate_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_linkstate_get_list_free(struct ethtool_linkstate_get_list *rsp);
@@ -1129,7 +1129,7 @@ ethtool_debug_get_req_dump_set_header_flags(struct ethtool_debug_get_req_dump *r
 
 struct ethtool_debug_get_list {
        struct ethtool_debug_get_list *next;
-       struct ethtool_debug_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_debug_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_debug_get_list_free(struct ethtool_debug_get_list *rsp);
@@ -1144,7 +1144,7 @@ struct ethtool_debug_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_debug_get_ntf *ntf);
-       struct ethtool_debug_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_debug_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_debug_get_ntf_free(struct ethtool_debug_get_ntf *rsp);
@@ -1330,7 +1330,7 @@ ethtool_wol_get_req_dump_set_header_flags(struct ethtool_wol_get_req_dump *req,
 
 struct ethtool_wol_get_list {
        struct ethtool_wol_get_list *next;
-       struct ethtool_wol_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_wol_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_wol_get_list_free(struct ethtool_wol_get_list *rsp);
@@ -1344,7 +1344,7 @@ struct ethtool_wol_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_wol_get_ntf *ntf);
-       struct ethtool_wol_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_wol_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_wol_get_ntf_free(struct ethtool_wol_get_ntf *rsp);
@@ -1546,7 +1546,7 @@ ethtool_features_get_req_dump_set_header_flags(struct ethtool_features_get_req_d
 
 struct ethtool_features_get_list {
        struct ethtool_features_get_list *next;
-       struct ethtool_features_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_features_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_features_get_list_free(struct ethtool_features_get_list *rsp);
@@ -1561,7 +1561,7 @@ struct ethtool_features_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_features_get_ntf *ntf);
-       struct ethtool_features_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_features_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_features_get_ntf_free(struct ethtool_features_get_ntf *rsp);
@@ -1843,7 +1843,7 @@ ethtool_privflags_get_req_dump_set_header_flags(struct ethtool_privflags_get_req
 
 struct ethtool_privflags_get_list {
        struct ethtool_privflags_get_list *next;
-       struct ethtool_privflags_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_privflags_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_privflags_get_list_free(struct ethtool_privflags_get_list *rsp);
@@ -1858,7 +1858,7 @@ struct ethtool_privflags_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_privflags_get_ntf *ntf);
-       struct ethtool_privflags_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_privflags_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_privflags_get_ntf_free(struct ethtool_privflags_get_ntf *rsp);
@@ -2072,7 +2072,7 @@ ethtool_rings_get_req_dump_set_header_flags(struct ethtool_rings_get_req_dump *r
 
 struct ethtool_rings_get_list {
        struct ethtool_rings_get_list *next;
-       struct ethtool_rings_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_rings_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_rings_get_list_free(struct ethtool_rings_get_list *rsp);
@@ -2087,7 +2087,7 @@ struct ethtool_rings_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_rings_get_ntf *ntf);
-       struct ethtool_rings_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_rings_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_rings_get_ntf_free(struct ethtool_rings_get_ntf *rsp);
@@ -2395,7 +2395,7 @@ ethtool_channels_get_req_dump_set_header_flags(struct ethtool_channels_get_req_d
 
 struct ethtool_channels_get_list {
        struct ethtool_channels_get_list *next;
-       struct ethtool_channels_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_channels_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_channels_get_list_free(struct ethtool_channels_get_list *rsp);
@@ -2410,7 +2410,7 @@ struct ethtool_channels_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_channels_get_ntf *ntf);
-       struct ethtool_channels_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_channels_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_channels_get_ntf_free(struct ethtool_channels_get_ntf *rsp);
@@ -2697,7 +2697,7 @@ ethtool_coalesce_get_req_dump_set_header_flags(struct ethtool_coalesce_get_req_d
 
 struct ethtool_coalesce_get_list {
        struct ethtool_coalesce_get_list *next;
-       struct ethtool_coalesce_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_coalesce_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_coalesce_get_list_free(struct ethtool_coalesce_get_list *rsp);
@@ -2712,7 +2712,7 @@ struct ethtool_coalesce_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_coalesce_get_ntf *ntf);
-       struct ethtool_coalesce_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_coalesce_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_coalesce_get_ntf_free(struct ethtool_coalesce_get_ntf *rsp);
@@ -3124,7 +3124,7 @@ ethtool_pause_get_req_dump_set_header_flags(struct ethtool_pause_get_req_dump *r
 
 struct ethtool_pause_get_list {
        struct ethtool_pause_get_list *next;
-       struct ethtool_pause_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_pause_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_pause_get_list_free(struct ethtool_pause_get_list *rsp);
@@ -3139,7 +3139,7 @@ struct ethtool_pause_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_pause_get_ntf *ntf);
-       struct ethtool_pause_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_pause_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_pause_get_ntf_free(struct ethtool_pause_get_ntf *rsp);
@@ -3360,7 +3360,7 @@ ethtool_eee_get_req_dump_set_header_flags(struct ethtool_eee_get_req_dump *req,
 
 struct ethtool_eee_get_list {
        struct ethtool_eee_get_list *next;
-       struct ethtool_eee_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_eee_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_eee_get_list_free(struct ethtool_eee_get_list *rsp);
@@ -3374,7 +3374,7 @@ struct ethtool_eee_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_eee_get_ntf *ntf);
-       struct ethtool_eee_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_eee_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_eee_get_ntf_free(struct ethtool_eee_get_ntf *rsp);
@@ -3623,7 +3623,7 @@ ethtool_tsinfo_get_req_dump_set_header_flags(struct ethtool_tsinfo_get_req_dump
 
 struct ethtool_tsinfo_get_list {
        struct ethtool_tsinfo_get_list *next;
-       struct ethtool_tsinfo_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_tsinfo_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_tsinfo_get_list_free(struct ethtool_tsinfo_get_list *rsp);
@@ -3842,7 +3842,7 @@ ethtool_tunnel_info_get_req_dump_set_header_flags(struct ethtool_tunnel_info_get
 
 struct ethtool_tunnel_info_get_list {
        struct ethtool_tunnel_info_get_list *next;
-       struct ethtool_tunnel_info_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_tunnel_info_get_rsp obj __attribute__((aligned(8)));
 };
 
 void
@@ -3964,7 +3964,7 @@ ethtool_fec_get_req_dump_set_header_flags(struct ethtool_fec_get_req_dump *req,
 
 struct ethtool_fec_get_list {
        struct ethtool_fec_get_list *next;
-       struct ethtool_fec_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_fec_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_fec_get_list_free(struct ethtool_fec_get_list *rsp);
@@ -3978,7 +3978,7 @@ struct ethtool_fec_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_fec_get_ntf *ntf);
-       struct ethtool_fec_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_fec_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_fec_get_ntf_free(struct ethtool_fec_get_ntf *rsp);
@@ -4221,7 +4221,7 @@ ethtool_module_eeprom_get_req_dump_set_header_flags(struct ethtool_module_eeprom
 
 struct ethtool_module_eeprom_get_list {
        struct ethtool_module_eeprom_get_list *next;
-       struct ethtool_module_eeprom_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_module_eeprom_get_rsp obj __attribute__((aligned(8)));
 };
 
 void
@@ -4340,7 +4340,7 @@ ethtool_phc_vclocks_get_req_dump_set_header_flags(struct ethtool_phc_vclocks_get
 
 struct ethtool_phc_vclocks_get_list {
        struct ethtool_phc_vclocks_get_list *next;
-       struct ethtool_phc_vclocks_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_phc_vclocks_get_rsp obj __attribute__((aligned(8)));
 };
 
 void
@@ -4458,7 +4458,7 @@ ethtool_module_get_req_dump_set_header_flags(struct ethtool_module_get_req_dump
 
 struct ethtool_module_get_list {
        struct ethtool_module_get_list *next;
-       struct ethtool_module_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_module_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_module_get_list_free(struct ethtool_module_get_list *rsp);
@@ -4473,7 +4473,7 @@ struct ethtool_module_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_module_get_ntf *ntf);
-       struct ethtool_module_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_module_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_module_get_ntf_free(struct ethtool_module_get_ntf *rsp);
@@ -4654,7 +4654,7 @@ ethtool_pse_get_req_dump_set_header_flags(struct ethtool_pse_get_req_dump *req,
 
 struct ethtool_pse_get_list {
        struct ethtool_pse_get_list *next;
-       struct ethtool_pse_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_pse_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_pse_get_list_free(struct ethtool_pse_get_list *rsp);
@@ -4849,7 +4849,7 @@ ethtool_rss_get_req_dump_set_header_flags(struct ethtool_rss_get_req_dump *req,
 
 struct ethtool_rss_get_list {
        struct ethtool_rss_get_list *next;
-       struct ethtool_rss_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_rss_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_rss_get_list_free(struct ethtool_rss_get_list *rsp);
@@ -4979,7 +4979,7 @@ ethtool_plca_get_cfg_req_dump_set_header_flags(struct ethtool_plca_get_cfg_req_d
 
 struct ethtool_plca_get_cfg_list {
        struct ethtool_plca_get_cfg_list *next;
-       struct ethtool_plca_get_cfg_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_plca_get_cfg_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_plca_get_cfg_list_free(struct ethtool_plca_get_cfg_list *rsp);
@@ -4994,7 +4994,7 @@ struct ethtool_plca_get_cfg_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_plca_get_cfg_ntf *ntf);
-       struct ethtool_plca_get_cfg_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_plca_get_cfg_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_plca_get_cfg_ntf_free(struct ethtool_plca_get_cfg_ntf *rsp);
@@ -5244,7 +5244,7 @@ ethtool_plca_get_status_req_dump_set_header_flags(struct ethtool_plca_get_status
 
 struct ethtool_plca_get_status_list {
        struct ethtool_plca_get_status_list *next;
-       struct ethtool_plca_get_status_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_plca_get_status_rsp obj __attribute__((aligned(8)));
 };
 
 void
@@ -5376,7 +5376,7 @@ ethtool_mm_get_req_dump_set_header_flags(struct ethtool_mm_get_req_dump *req,
 
 struct ethtool_mm_get_list {
        struct ethtool_mm_get_list *next;
-       struct ethtool_mm_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_mm_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_mm_get_list_free(struct ethtool_mm_get_list *rsp);
@@ -5390,7 +5390,7 @@ struct ethtool_mm_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_mm_get_ntf *ntf);
-       struct ethtool_mm_get_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_mm_get_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_mm_get_ntf_free(struct ethtool_mm_get_ntf *rsp);
@@ -5504,7 +5504,7 @@ struct ethtool_cable_test_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_cable_test_ntf *ntf);
-       struct ethtool_cable_test_ntf_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_cable_test_ntf_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_cable_test_ntf_free(struct ethtool_cable_test_ntf *rsp);
@@ -5527,7 +5527,7 @@ struct ethtool_cable_test_tdr_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ethtool_cable_test_tdr_ntf *ntf);
-       struct ethtool_cable_test_tdr_ntf_rsp obj __attribute__ ((aligned (8)));
+       struct ethtool_cable_test_tdr_ntf_rsp obj __attribute__((aligned(8)));
 };
 
 void ethtool_cable_test_tdr_ntf_free(struct ethtool_cable_test_tdr_ntf *rsp);

diff --git a/tools/net/ynl/generated/fou-user.h b/tools/net/ynl/generated/fou-user.h
index a8f860892540b8d85f0b763a15081780ef48528a..fd566716ddd67f295a1e4e6455be45d19312400d 100644 (file)
--- a/tools/net/ynl/generated/fou-user.h
+++ b/tools/net/ynl/generated/fou-user.h
@@ -333,7 +333,7 @@ struct fou_get_rsp *fou_get(struct ynl_sock *ys, struct fou_get_req *req);
 /* FOU_CMD_GET - dump */
 struct fou_get_list {
        struct fou_get_list *next;
-       struct fou_get_rsp obj __attribute__ ((aligned (8)));
+       struct fou_get_rsp obj __attribute__((aligned(8)));
 };
 
 void fou_get_list_free(struct fou_get_list *rsp);

diff --git a/tools/net/ynl/generated/handshake-user.h b/tools/net/ynl/generated/handshake-user.h
index 2b34acc608dea51b72c18980190e2c4f59a50102..bce537d8b8cca208c41d635cf821c487903f66e6 100644 (file)
--- a/tools/net/ynl/generated/handshake-user.h
+++ b/tools/net/ynl/generated/handshake-user.h
@@ -90,7 +90,7 @@ struct handshake_accept_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct handshake_accept_ntf *ntf);
-       struct handshake_accept_rsp obj __attribute__ ((aligned (8)));
+       struct handshake_accept_rsp obj __attribute__((aligned(8)));
 };
 
 void handshake_accept_ntf_free(struct handshake_accept_ntf *rsp);

diff --git a/tools/net/ynl/generated/netdev-user.h b/tools/net/ynl/generated/netdev-user.h
index b4351ff3459551901fc7e84916982b630d68f208..4fafac879df396e4eba7352649765fd5e1446cee 100644 (file)
--- a/tools/net/ynl/generated/netdev-user.h
+++ b/tools/net/ynl/generated/netdev-user.h
@@ -69,7 +69,7 @@ netdev_dev_get(struct ynl_sock *ys, struct netdev_dev_get_req *req);
 /* NETDEV_CMD_DEV_GET - dump */
 struct netdev_dev_get_list {
        struct netdev_dev_get_list *next;
-       struct netdev_dev_get_rsp obj __attribute__ ((aligned (8)));
+       struct netdev_dev_get_rsp obj __attribute__((aligned(8)));
 };
 
 void netdev_dev_get_list_free(struct netdev_dev_get_list *rsp);
@@ -82,7 +82,7 @@ struct netdev_dev_get_ntf {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct netdev_dev_get_ntf *ntf);
-       struct netdev_dev_get_rsp obj __attribute__ ((aligned (8)));
+       struct netdev_dev_get_rsp obj __attribute__((aligned(8)));
 };
 
 void netdev_dev_get_ntf_free(struct netdev_dev_get_ntf *rsp);

diff --git a/tools/net/ynl/lib/ynl.h b/tools/net/ynl/lib/ynl.h
index c883e4747cfafc53d333d3c998a6180ffa930cc0..e974378e3b8c79001c2e1fe70ccf1800d83279f2 100644 (file)
--- a/tools/net/ynl/lib/ynl.h
+++ b/tools/net/ynl/lib/ynl.h
@@ -158,7 +158,7 @@ struct ynl_parse_arg {
 
 struct ynl_dump_list_type {
        struct ynl_dump_list_type *next;
-       unsigned char data[] __attribute__ ((aligned (8)));
+       unsigned char data[] __attribute__((aligned(8)));
 };
 extern struct ynl_dump_list_type *YNL_LIST_END;
 
@@ -188,7 +188,7 @@ struct ynl_ntf_base_type {
        __u8 cmd;
        struct ynl_ntf_base_type *next;
        void (*free)(struct ynl_ntf_base_type *ntf);
-       unsigned char data[] __attribute__ ((aligned (8)));
+       unsigned char data[] __attribute__((aligned(8)));
 };
 
 extern mnl_cb_t ynl_cb_array[NLMSG_MIN_TYPE];

diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py
index ed35a307c9600da1e4914e8dd3b45a2adbbe1c1c..8ae283b1a9bc911e530769c5eb673f1a6e7649ba 100755 (executable)
--- a/tools/net/ynl/ynl-gen-c.py
+++ b/tools/net/ynl/ynl-gen-c.py
@@ -1902,7 +1902,7 @@ def print_wrapped_type(ri):
         ri.cw.p('__u8 cmd;')
         ri.cw.p('struct ynl_ntf_base_type *next;')
         ri.cw.p(f"void (*free)({type_name(ri, 'reply')} *ntf);")
-    ri.cw.p(f"{type_name(ri, 'reply', deref=True)} obj __attribute__ ((aligned (8)));")
+    ri.cw.p(f"{type_name(ri, 'reply', deref=True)} obj __attribute__((aligned(8)));")
     ri.cw.block_end(line=';')
     ri.cw.nl()
     print_free_prototype(ri, 'reply')