diff --git a/home/nipa/nipa_out/984521/ynl/old-code/netdev-user.c b/home/nipa/nipa_out/984521/ynl/new-code/netdev-user.c index 7398a146f4fe..ea026459bf7c 100644 --- a/home/nipa/nipa_out/984521/ynl/old-code/netdev-user.c +++ b/home/nipa/nipa_out/984521/ynl/new-code/netdev-user.c @@ -107,6 +107,18 @@ const char *netdev_qstats_scope_str(enum netdev_qstats_scope value) return netdev_qstats_scope_strmap[value]; } +static const char * const netdev_napi_threaded_strmap[] = { + [0] = "disabled", + [1] = "enabled", +}; + +const char *netdev_napi_threaded_str(enum netdev_napi_threaded value) +{ + if (value < 0 || value >= (int)YNL_ARRAY_SIZE(netdev_napi_threaded_strmap)) + return NULL; + return netdev_napi_threaded_strmap[value]; +} + /* Policies */ const struct ynl_policy_attr netdev_io_uring_provider_info_policy[NETDEV_A_IO_URING_PROVIDER_INFO_MAX + 1] = { }; @@ -217,7 +229,7 @@ const struct ynl_policy_attr netdev_napi_policy[NETDEV_A_NAPI_MAX + 1] = { [NETDEV_A_NAPI_DEFER_HARD_IRQS] = { .name = "defer-hard-irqs", .type = YNL_PT_U32, }, [NETDEV_A_NAPI_GRO_FLUSH_TIMEOUT] = { .name = "gro-flush-timeout", .type = YNL_PT_UINT, }, [NETDEV_A_NAPI_IRQ_SUSPEND_TIMEOUT] = { .name = "irq-suspend-timeout", .type = YNL_PT_UINT, }, - [NETDEV_A_NAPI_THREADED] = { .name = "threaded", .type = YNL_PT_UINT, }, + [NETDEV_A_NAPI_THREADED] = { .name = "threaded", .type = YNL_PT_U32, }, }; const struct ynl_policy_nest netdev_napi_nest = { @@ -1049,7 +1061,7 @@ int netdev_napi_get_rsp_parse(const struct nlmsghdr *nlh, if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; dst->_present.threaded = 1; - dst->threaded = ynl_attr_get_uint(attr); + dst->threaded = ynl_attr_get_u32(attr); } } @@ -1345,7 +1357,7 @@ int netdev_napi_set(struct ynl_sock *ys, struct netdev_napi_set_req *req) if (req->_present.irq_suspend_timeout) ynl_attr_put_uint(nlh, NETDEV_A_NAPI_IRQ_SUSPEND_TIMEOUT, req->irq_suspend_timeout); if (req->_present.threaded) - ynl_attr_put_uint(nlh, NETDEV_A_NAPI_THREADED, req->threaded); + ynl_attr_put_u32(nlh, NETDEV_A_NAPI_THREADED, req->threaded); err = ynl_exec(ys, nlh, &yrs); if (err < 0) diff --git a/home/nipa/nipa_out/984521/ynl/old-code/netdev-user.h b/home/nipa/nipa_out/984521/ynl/new-code/netdev-user.h index 499a38c54a1f..6fb0b75f58d4 100644 --- a/home/nipa/nipa_out/984521/ynl/old-code/netdev-user.h +++ b/home/nipa/nipa_out/984521/ynl/new-code/netdev-user.h @@ -22,6 +22,7 @@ const char *netdev_xdp_rx_metadata_str(enum netdev_xdp_rx_metadata value); const char *netdev_xsk_flags_str(enum netdev_xsk_flags value); const char *netdev_queue_type_str(enum netdev_queue_type value); const char *netdev_qstats_scope_str(enum netdev_qstats_scope value); +const char *netdev_napi_threaded_str(enum netdev_napi_threaded value); /* Common nested types */ struct netdev_io_uring_provider_info { @@ -431,7 +432,7 @@ struct netdev_napi_get_rsp { __u32 defer_hard_irqs; __u64 gro_flush_timeout; __u64 irq_suspend_timeout; - __u64 threaded; + enum netdev_napi_threaded threaded; }; void netdev_napi_get_rsp_free(struct netdev_napi_get_rsp *rsp); @@ -617,7 +618,7 @@ struct netdev_napi_set_req { __u32 defer_hard_irqs; __u64 gro_flush_timeout; __u64 irq_suspend_timeout; - __u64 threaded; + enum netdev_napi_threaded threaded; }; static inline struct netdev_napi_set_req *netdev_napi_set_req_alloc(void) @@ -655,7 +656,7 @@ netdev_napi_set_req_set_irq_suspend_timeout(struct netdev_napi_set_req *req, } static inline void netdev_napi_set_req_set_threaded(struct netdev_napi_set_req *req, - __u64 threaded) + enum netdev_napi_threaded threaded) { req->_present.threaded = 1; req->threaded = threaded;