Flow API providers renamed to be consistent with parent module 'netdev-offload' and look more like each other.
'_rte_' replaced with more convenient '_dpdk_'. We'll have following structure: Common code: lib/netdev-offload-provider.h lib/netdev-offload.c lib/netdev-offload.h Providers: lib/netdev-offload-tc.c lib/netdev-offload-dpdk.c 'netdev-offload-dummy' still resides inside netdev-dummy, but it makes no much sence to move it out of there. Signed-off-by: Ilya Maximets <i.maxim...@samsung.com> Acked-by: Ben Pfaff <b...@ovn.org> --- lib/automake.mk | 4 +-- lib/dpdk.c | 2 +- lib/netdev-dummy.c | 4 +-- ...v-rte-offloads.c => netdev-offload-dpdk.c} | 30 +++++++++---------- lib/netdev-offload-provider.h | 4 +-- ...tdev-tc-offloads.c => netdev-offload-tc.c} | 5 ++-- lib/netdev.c | 2 +- 7 files changed, 25 insertions(+), 26 deletions(-) rename lib/{netdev-rte-offloads.c => netdev-offload-dpdk.c} (96%) rename lib/{netdev-tc-offloads.c => netdev-offload-tc.c} (99%) diff --git a/lib/automake.mk b/lib/automake.mk index b2d90da4e..27bc376c0 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -394,7 +394,7 @@ lib_libopenvswitch_la_SOURCES += \ lib/if-notifier.h \ lib/netdev-linux.c \ lib/netdev-linux.h \ - lib/netdev-tc-offloads.c \ + lib/netdev-offload-tc.c \ lib/netlink-conntrack.c \ lib/netlink-conntrack.h \ lib/netlink-notifier.c \ @@ -414,7 +414,7 @@ if DPDK_NETDEV lib_libopenvswitch_la_SOURCES += \ lib/dpdk.c \ lib/netdev-dpdk.c \ - lib/netdev-rte-offloads.c + lib/netdev-offload-dpdk.c else lib_libopenvswitch_la_SOURCES += \ lib/dpdk-stub.c diff --git a/lib/dpdk.c b/lib/dpdk.c index a253bef71..fc89a0931 100644 --- a/lib/dpdk.c +++ b/lib/dpdk.c @@ -443,7 +443,7 @@ dpdk_init__(const struct smap *ovs_other_config) /* Finally, register the dpdk classes */ netdev_dpdk_register(); - netdev_register_flow_api_provider(&netdev_dpdk_offloads); + netdev_register_flow_api_provider(&netdev_offload_dpdk); return true; } diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index 2e2e0c2ab..b305c08d4 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -1581,7 +1581,7 @@ netdev_dummy_offloads_init_flow_api(struct netdev *netdev) return is_dummy_class(netdev->netdev_class) ? 0 : -1; } -static const struct netdev_flow_api netdev_dummy_offloads = { +static const struct netdev_flow_api netdev_offload_dummy = { .type = "dummy", .flow_put = netdev_dummy_flow_put, .flow_del = netdev_dummy_flow_del, @@ -2034,7 +2034,7 @@ netdev_dummy_register(enum dummy_level level) netdev_register_provider(&dummy_internal_class); netdev_register_provider(&dummy_pmd_class); - netdev_register_flow_api_provider(&netdev_dummy_offloads); + netdev_register_flow_api_provider(&netdev_offload_dummy); netdev_vport_tunnel_register(); } diff --git a/lib/netdev-rte-offloads.c b/lib/netdev-offload-dpdk.c similarity index 96% rename from lib/netdev-rte-offloads.c rename to lib/netdev-offload-dpdk.c index e5239eba6..64c0eab40 100644 --- a/lib/netdev-rte-offloads.c +++ b/lib/netdev-offload-dpdk.c @@ -27,7 +27,7 @@ #include "packets.h" #include "uuid.h" -VLOG_DEFINE_THIS_MODULE(netdev_rte_offloads); +VLOG_DEFINE_THIS_MODULE(netdev_offload_dpdk); /* Thread-safety * ============= @@ -411,7 +411,7 @@ add_flow_rss_action(struct flow_actions *actions, } static int -netdev_rte_offloads_add_flow(struct netdev *netdev, +netdev_offload_dpdk_add_flow(struct netdev *netdev, const struct match *match, struct nlattr *nl_actions OVS_UNUSED, size_t actions_len OVS_UNUSED, @@ -617,7 +617,7 @@ out: * Check if any unsupported flow patterns are specified. */ static int -netdev_rte_offloads_validate_flow(const struct match *match) +netdev_offload_dpdk_validate_flow(const struct match *match) { struct match match_zero_wc; const struct flow *masks = &match->wc.masks; @@ -686,7 +686,7 @@ err: } static int -netdev_rte_offloads_destroy_flow(struct netdev *netdev, +netdev_offload_dpdk_destroy_flow(struct netdev *netdev, const ovs_u128 *ufid, struct rte_flow *rte_flow) { @@ -707,7 +707,7 @@ netdev_rte_offloads_destroy_flow(struct netdev *netdev, } static int -netdev_rte_offloads_flow_put(struct netdev *netdev, struct match *match, +netdev_offload_dpdk_flow_put(struct netdev *netdev, struct match *match, struct nlattr *actions, size_t actions_len, const ovs_u128 *ufid, struct offload_info *info, struct dpif_flow_stats *stats OVS_UNUSED) @@ -721,23 +721,23 @@ netdev_rte_offloads_flow_put(struct netdev *netdev, struct match *match, */ rte_flow = ufid_to_rte_flow_find(ufid); if (rte_flow) { - ret = netdev_rte_offloads_destroy_flow(netdev, ufid, rte_flow); + ret = netdev_offload_dpdk_destroy_flow(netdev, ufid, rte_flow); if (ret < 0) { return ret; } } - ret = netdev_rte_offloads_validate_flow(match); + ret = netdev_offload_dpdk_validate_flow(match); if (ret < 0) { return ret; } - return netdev_rte_offloads_add_flow(netdev, match, actions, + return netdev_offload_dpdk_add_flow(netdev, match, actions, actions_len, ufid, info); } static int -netdev_rte_offloads_flow_del(struct netdev *netdev, const ovs_u128 *ufid, +netdev_offload_dpdk_flow_del(struct netdev *netdev, const ovs_u128 *ufid, struct dpif_flow_stats *stats OVS_UNUSED) { struct rte_flow *rte_flow = ufid_to_rte_flow_find(ufid); @@ -746,18 +746,18 @@ netdev_rte_offloads_flow_del(struct netdev *netdev, const ovs_u128 *ufid, return -1; } - return netdev_rte_offloads_destroy_flow(netdev, ufid, rte_flow); + return netdev_offload_dpdk_destroy_flow(netdev, ufid, rte_flow); } static int -netdev_rte_offloads_init_flow_api(struct netdev *netdev) +netdev_offload_dpdk_init_flow_api(struct netdev *netdev) { return netdev_dpdk_flow_api_supported(netdev); } -const struct netdev_flow_api netdev_dpdk_offloads = { +const struct netdev_flow_api netdev_offload_dpdk = { .type = "dpdk_flow_api", - .flow_put = netdev_rte_offloads_flow_put, - .flow_del = netdev_rte_offloads_flow_del, - .init_flow_api = netdev_rte_offloads_init_flow_api, + .flow_put = netdev_offload_dpdk_flow_put, + .flow_del = netdev_offload_dpdk_flow_del, + .init_flow_api = netdev_offload_dpdk_init_flow_api, }; diff --git a/lib/netdev-offload-provider.h b/lib/netdev-offload-provider.h index 2634efca0..4e1c4251d 100644 --- a/lib/netdev-offload-provider.h +++ b/lib/netdev-offload-provider.h @@ -91,11 +91,11 @@ int netdev_register_flow_api_provider(const struct netdev_flow_api *); int netdev_unregister_flow_api_provider(const char *type); #ifdef __linux__ -extern const struct netdev_flow_api netdev_tc_offloads; +extern const struct netdev_flow_api netdev_offload_tc; #endif #ifdef DPDK_NETDEV -extern const struct netdev_flow_api netdev_dpdk_offloads; +extern const struct netdev_flow_api netdev_offload_dpdk; #endif #ifdef __cplusplus diff --git a/lib/netdev-tc-offloads.c b/lib/netdev-offload-tc.c similarity index 99% rename from lib/netdev-tc-offloads.c rename to lib/netdev-offload-tc.c index b9a4a7302..498aae369 100644 --- a/lib/netdev-tc-offloads.c +++ b/lib/netdev-offload-tc.c @@ -1,4 +1,3 @@ - /* * Copyright (c) 2016 Mellanox Technologies, Ltd. * @@ -40,7 +39,7 @@ #include "unaligned.h" #include "util.h" -VLOG_DEFINE_THIS_MODULE(netdev_tc_offloads); +VLOG_DEFINE_THIS_MODULE(netdev_offload_tc); static struct vlog_rate_limit error_rl = VLOG_RATE_LIMIT_INIT(60, 5); @@ -1595,7 +1594,7 @@ netdev_tc_init_flow_api(struct netdev *netdev) return 0; } -const struct netdev_flow_api netdev_tc_offloads = { +const struct netdev_flow_api netdev_offload_tc = { .type = "linux_tc", .flow_flush = netdev_tc_flow_flush, .flow_dump_create = netdev_tc_flow_dump_create, diff --git a/lib/netdev.c b/lib/netdev.c index 7f0fab8b8..96587996f 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -146,7 +146,7 @@ netdev_initialize(void) netdev_register_provider(&netdev_tap_class); netdev_vport_tunnel_register(); - netdev_register_flow_api_provider(&netdev_tc_offloads); + netdev_register_flow_api_provider(&netdev_offload_tc); #endif #if defined(__FreeBSD__) || defined(__NetBSD__) netdev_register_provider(&netdev_tap_class); -- 2.17.1 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev