Run clang-format on ovs-p4rt source (#330)

Signed-off-by: Derek G Foster <[email protected]>
ipdk-io · Nov 8, 2023 · 807d13b · 807d13b
1 parent 8131f67
commit 807d13b
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 176 deletions.
diff --git a/ovs-p4rt/dpdk/p4_name_mapping.h b/ovs-p4rt/dpdk/p4_name_mapping.h
@@ -12,85 +12,60 @@ extern "C" {
 /* List of tables and corresponding actions */
 
 /* VXLAN_ENCAP_MOD_TABLE */
-#define VXLAN_ENCAP_MOD_TABLE \
-        "linux_networking_control.vxlan_encap_mod_table"
+#define VXLAN_ENCAP_MOD_TABLE "linux_networking_control.vxlan_encap_mod_table"
 
 #define VXLAN_ENCAP_MOD_TABLE_KEY_VENDORMETA_MOD_DATA_PTR \
-        "vendormeta_mod_data_ptr"
-
-#define ACTION_VXLAN_ENCAP \
-        "linux_networking_control.vxlan_encap"
-#define ACTION_VXLAN_ENCAP_PARAM_SRC_ADDR \
-        "src_addr"
-#define ACTION_VXLAN_ENCAP_PARAM_DST_ADDR \
-        "dst_addr"
-#define ACTION_VXLAN_ENCAP_PARAM_DST_PORT \
-        "dst_port"
-#define ACTION_VXLAN_ENCAP_PARAM_VNI \
-        "vni"
-#define TUNNEL_TYPE_VXLAN  2
+  "vendormeta_mod_data_ptr"
 
-/* IPV4_TUNNEL_TERM_TABLE */
-#define IPV4_TUNNEL_TERM_TABLE \
-        "linux_networking_control.ipv4_tunnel_term_table"
+#define ACTION_VXLAN_ENCAP "linux_networking_control.vxlan_encap"
+#define ACTION_VXLAN_ENCAP_PARAM_SRC_ADDR "src_addr"
+#define ACTION_VXLAN_ENCAP_PARAM_DST_ADDR "dst_addr"
+#define ACTION_VXLAN_ENCAP_PARAM_DST_PORT "dst_port"
+#define ACTION_VXLAN_ENCAP_PARAM_VNI "vni"
+#define TUNNEL_TYPE_VXLAN 2
 
-#define IPV4_TUNNEL_TERM_TABLE_KEY_TUNNEL_TYPE \
-        "tunnel_type"
-#define IPV4_TUNNEL_TERM_TABLE_KEY_IPV4_SRC \
-        "ipv4_src"
-#define IPV4_TUNNEL_TERM_TABLE_KEY_IPV4_DST \
-        "ipv4_dst"
+/* IPV4_TUNNEL_TERM_TABLE */
+#define IPV4_TUNNEL_TERM_TABLE "linux_networking_control.ipv4_tunnel_term_table"
 
-#define ACTION_DECAP_OUTER_IPV4 \
-        "linux_networking_control.decap_outer_ipv4"
-#define ACTION_DECAP_OUTER_IPV4_PARAM_TUNNEL_ID \
-        "tunnel_id"
+#define IPV4_TUNNEL_TERM_TABLE_KEY_TUNNEL_TYPE "tunnel_type"
+#define IPV4_TUNNEL_TERM_TABLE_KEY_IPV4_SRC "ipv4_src"
+#define IPV4_TUNNEL_TERM_TABLE_KEY_IPV4_DST "ipv4_dst"
 
+#define ACTION_DECAP_OUTER_IPV4 "linux_networking_control.decap_outer_ipv4"
+#define ACTION_DECAP_OUTER_IPV4_PARAM_TUNNEL_ID "tunnel_id"
 
 /* L2_FWD_RX_TABLE */
-#define L2_FWD_RX_TABLE \
-        "linux_networking_control.l2_fwd_rx_table"
+#define L2_FWD_RX_TABLE "linux_networking_control.l2_fwd_rx_table"
 
-#define L2_FWD_RX_TABLE_KEY_DST_MAC \
-        "dst_mac"
-
-#define L2_FWD_RX_TABLE_ACTION_L2_FWD \
-        "linux_networking_control.l2_fwd"
-#define ACTION_L2_FWD_PARAM_PORT \
-        "port"
+#define L2_FWD_RX_TABLE_KEY_DST_MAC "dst_mac"
 
+#define L2_FWD_RX_TABLE_ACTION_L2_FWD "linux_networking_control.l2_fwd"
+#define ACTION_L2_FWD_PARAM_PORT "port"
 
 /* L2_FWD_RX_WITH_TUNNEL_TABLE */
 #define L2_FWD_RX_WITH_TUNNEL_TABLE \
-        "linux_networking_control.l2_fwd_rx_with_tunnel_table"
+  "linux_networking_control.l2_fwd_rx_with_tunnel_table"
 
-#define L2_FWD_RX_WITH_TUNNEL_TABLE_KEY_DST_MAC \
-        "dst_mac"
+#define L2_FWD_RX_WITH_TUNNEL_TABLE_KEY_DST_MAC "dst_mac"
 
 #define L2_FWD_RX_WITH_TUNNEL_TABLE_ACTION_L2_FWD \
-        "linux_networking_control.l2_fwd"
+  "linux_networking_control.l2_fwd"
 
 /* L2_FWD_TX_TABLE */
-#define L2_FWD_TX_TABLE \
-        "linux_networking_control.l2_fwd_tx_table"
+#define L2_FWD_TX_TABLE "linux_networking_control.l2_fwd_tx_table"
 
-#define L2_FWD_TX_TABLE_KEY_DST_MAC \
-        "dst_mac"
+#define L2_FWD_TX_TABLE_KEY_DST_MAC "dst_mac"
 
-#define L2_FWD_TX_TABLE_ACTION_L2_FWD \
-        "linux_networking_control.l2_fwd"
+#define L2_FWD_TX_TABLE_ACTION_L2_FWD "linux_networking_control.l2_fwd"
 
-#define L2_FWD_TX_TABLE_ACTION_SET_TUNNEL \
-        "linux_networking_control.set_tunnel"
+#define L2_FWD_TX_TABLE_ACTION_SET_TUNNEL "linux_networking_control.set_tunnel"
 
 #define ACTION_SET_TUNNEL_PARAM_TUNNEL_ID "tunnel_id"
 
-#define ACTION_SET_TUNNEL_PARAM_DST_ADDR \
-        "dst_addr"
+#define ACTION_SET_TUNNEL_PARAM_DST_ADDR "dst_addr"
 
 #ifdef __cplusplus
-}; // extern "C"
+};  // extern "C"
 #endif
 
 #endif /* __P4_NAME_MAPPING__ */
-
diff --git a/ovs-p4rt/es2k/p4_name_mapping.h b/ovs-p4rt/es2k/p4_name_mapping.h
@@ -17,180 +17,128 @@ extern "C" {
 /* List of tables and corresponding actions */
 
 /* VXLAN_ENCAP_MOD_TABLE */
-#define VXLAN_ENCAP_MOD_TABLE \
-        "linux_networking_control.vxlan_encap_mod_table"
+#define VXLAN_ENCAP_MOD_TABLE "linux_networking_control.vxlan_encap_mod_table"
 
 #define VXLAN_ENCAP_MOD_TABLE_KEY_VENDORMETA_MOD_DATA_PTR \
-        "vmeta.common.mod_blob_ptr"
-
-#define ACTION_VXLAN_ENCAP \
-        "linux_networking_control.vxlan_encap"
-#define ACTION_VXLAN_ENCAP_PARAM_SRC_ADDR \
-        "src_addr"
-#define ACTION_VXLAN_ENCAP_PARAM_DST_ADDR \
-        "dst_addr"
-#define ACTION_VXLAN_ENCAP_PARAM_DST_PORT \
-        "dst_port"
-#define ACTION_VXLAN_ENCAP_PARAM_SRC_PORT \
-        "src_port"
-#define ACTION_VXLAN_ENCAP_PARAM_VNI \
-        "vni"
-#define TUNNEL_TYPE_VXLAN  2
+  "vmeta.common.mod_blob_ptr"
+
+#define ACTION_VXLAN_ENCAP "linux_networking_control.vxlan_encap"
+#define ACTION_VXLAN_ENCAP_PARAM_SRC_ADDR "src_addr"
+#define ACTION_VXLAN_ENCAP_PARAM_DST_ADDR "dst_addr"
+#define ACTION_VXLAN_ENCAP_PARAM_DST_PORT "dst_port"
+#define ACTION_VXLAN_ENCAP_PARAM_SRC_PORT "src_port"
+#define ACTION_VXLAN_ENCAP_PARAM_VNI "vni"
+#define TUNNEL_TYPE_VXLAN 2
 
 /* VXLAN_ENCAP_V6_MOD_TABLE */
 #define VXLAN_ENCAP_V6_MOD_TABLE \
-        "linux_networking_control.vxlan_encap_v6_mod_table"
+  "linux_networking_control.vxlan_encap_v6_mod_table"
 
 #define VXLAN_ENCAP_V6_MOD_TABLE_KEY_VENDORMETA_MOD_DATA_PTR \
-        "vmeta.common.mod_blob_ptr"
-
-#define ACTION_VXLAN_ENCAP_V6 \
-        "linux_networking_control.vxlan_encap_v6"
-#define ACTION_VXLAN_ENCAP_V6_PARAM_SRC_ADDR \
-        "src_addr"
-#define ACTION_VXLAN_ENCAP_V6_PARAM_DST_ADDR \
-        "dst_addr"
-#define ACTION_VXLAN_ENCAP_V6_PARAM_DS \
-        "ds"
-#define ACTION_VXLAN_ENCAP_V6_PARAM_ECN \
-        "ecn"
-#define ACTION_VXLAN_ENCAP_V6_PARAM_FLOW_LABEL \
-        "flow_label"
-#define ACTION_VXLAN_ENCAP_V6_PARAM_hop_limit \
-        "hop_limit"
-#define ACTION_VXLAN_ENCAP_V6_PARAM_SRC_PORT \
-        "src_port"
-#define ACTION_VXLAN_ENCAP_V6_PARAM_DST_PORT \
-        "dst_port"
-#define ACTION_VXLAN_ENCAP_V6_PARAM_VNI \
-        "vni"
+  "vmeta.common.mod_blob_ptr"
+
+#define ACTION_VXLAN_ENCAP_V6 "linux_networking_control.vxlan_encap_v6"
+#define ACTION_VXLAN_ENCAP_V6_PARAM_SRC_ADDR "src_addr"
+#define ACTION_VXLAN_ENCAP_V6_PARAM_DST_ADDR "dst_addr"
+#define ACTION_VXLAN_ENCAP_V6_PARAM_DS "ds"
+#define ACTION_VXLAN_ENCAP_V6_PARAM_ECN "ecn"
+#define ACTION_VXLAN_ENCAP_V6_PARAM_FLOW_LABEL "flow_label"
+#define ACTION_VXLAN_ENCAP_V6_PARAM_hop_limit "hop_limit"
+#define ACTION_VXLAN_ENCAP_V6_PARAM_SRC_PORT "src_port"
+#define ACTION_VXLAN_ENCAP_V6_PARAM_DST_PORT "dst_port"
+#define ACTION_VXLAN_ENCAP_V6_PARAM_VNI "vni"
 
 /* IPV4_TUNNEL_TERM_TABLE */
-#define IPV4_TUNNEL_TERM_TABLE \
-        "linux_networking_control.ipv4_tunnel_term_table"
+#define IPV4_TUNNEL_TERM_TABLE "linux_networking_control.ipv4_tunnel_term_table"
 
-#define IPV4_TUNNEL_TERM_TABLE_KEY_TUNNEL_TYPE \
-        "user_meta.pmeta.tun_flag1_d0"
-#define IPV4_TUNNEL_TERM_TABLE_KEY_IPV4_SRC \
-        "ipv4_src"
-#define IPV4_TUNNEL_TERM_TABLE_KEY_IPV4_DST \
-        "ipv4_dst"
+#define IPV4_TUNNEL_TERM_TABLE_KEY_TUNNEL_TYPE "user_meta.pmeta.tun_flag1_d0"
+#define IPV4_TUNNEL_TERM_TABLE_KEY_IPV4_SRC "ipv4_src"
+#define IPV4_TUNNEL_TERM_TABLE_KEY_IPV4_DST "ipv4_dst"
 
-#define ACTION_DECAP_OUTER_HDR \
-        "linux_networking_control.decap_outer_hdr"
-#define ACTION_DECAP_OUTER_HDR_PARAM_TUNNEL_ID \
-        "tunnel_id"
+#define ACTION_DECAP_OUTER_HDR "linux_networking_control.decap_outer_hdr"
+#define ACTION_DECAP_OUTER_HDR_PARAM_TUNNEL_ID "tunnel_id"
 
 /* IPV6_TUNNEL_TERM_TABLE */
-#define IPV6_TUNNEL_TERM_TABLE \
-        "linux_networking_control.ipv6_tunnel_term_table"
+#define IPV6_TUNNEL_TERM_TABLE "linux_networking_control.ipv6_tunnel_term_table"
 
-#define IPV6_TUNNEL_TERM_TABLE_KEY_TUNNEL_TYPE \
-        "user_meta.pmeta.tun_flag1_d0"
-#define IPV6_TUNNEL_TERM_TABLE_KEY_IPV6_SRC \
-        "ipv6_src"
-#define IPV6_TUNNEL_TERM_TABLE_KEY_IPV6_DST \
-        "ipv6_dst"
+#define IPV6_TUNNEL_TERM_TABLE_KEY_TUNNEL_TYPE "user_meta.pmeta.tun_flag1_d0"
+#define IPV6_TUNNEL_TERM_TABLE_KEY_IPV6_SRC "ipv6_src"
+#define IPV6_TUNNEL_TERM_TABLE_KEY_IPV6_DST "ipv6_dst"
 
 /* L2_FWD_RX_TABLE */
-#define L2_FWD_RX_TABLE \
-        "linux_networking_control.l2_fwd_rx_table"
+#define L2_FWD_RX_TABLE "linux_networking_control.l2_fwd_rx_table"
 
-#define L2_FWD_RX_TABLE_KEY_DST_MAC \
-        "dst_mac"
+#define L2_FWD_RX_TABLE_KEY_DST_MAC "dst_mac"
 
-#define L2_FWD_RX_TABLE_ACTION_L2_FWD \
-        "linux_networking_control.l2_fwd"
-#define ACTION_L2_FWD_PARAM_PORT \
-        "port"
+#define L2_FWD_RX_TABLE_ACTION_L2_FWD "linux_networking_control.l2_fwd"
+#define ACTION_L2_FWD_PARAM_PORT "port"
 
 /* L2_FWD_RX_WITH_TUNNEL_TABLE */
 #define L2_FWD_RX_WITH_TUNNEL_TABLE \
-        "linux_networking_control.l2_fwd_rx_with_tunnel_table"
+  "linux_networking_control.l2_fwd_rx_with_tunnel_table"
 
-#define L2_FWD_RX_WITH_TUNNEL_TABLE_KEY_DST_MAC \
-        "dst_mac"
+#define L2_FWD_RX_WITH_TUNNEL_TABLE_KEY_DST_MAC "dst_mac"
 
 #define L2_FWD_RX_WITH_TUNNEL_TABLE_ACTION_L2_FWD \
-        "linux_networking_control.l2_fwd"
+  "linux_networking_control.l2_fwd"
 
 /* L2_FWD_RX_IPV6_WITH_TUNNEL_TABLE */
 #define L2_FWD_RX_IPV6_WITH_TUNNEL_TABLE \
-        "linux_networking_control.l2_fwd_rx_ipv6_with_tunnel_table"
+  "linux_networking_control.l2_fwd_rx_ipv6_with_tunnel_table"
 
-#define L2_FWD_RX_IPV6_WITH_TUNNEL_TABLE_KEY_DST_MAC \
-        "dst_mac"
+#define L2_FWD_RX_IPV6_WITH_TUNNEL_TABLE_KEY_DST_MAC "dst_mac"
 
 #define L2_FWD_RX_IPV6_WITH_TUNNEL_TABLE_ACTION_L2_FWD \
-        "linux_networking_control.l2_fwd"
+  "linux_networking_control.l2_fwd"
 
 /* L2_FWD_TX_TABLE */
-#define L2_FWD_TX_TABLE \
-        "linux_networking_control.l2_fwd_tx_table"
+#define L2_FWD_TX_TABLE "linux_networking_control.l2_fwd_tx_table"
 
-#define L2_FWD_TX_TABLE_KEY_DST_MAC \
-        "dst_mac"
-#define L2_FWD_TX_TABLE_KEY_TUN_FLAG \
-        "user_meta.pmeta.tun_flag1_d0"
+#define L2_FWD_TX_TABLE_KEY_DST_MAC "dst_mac"
+#define L2_FWD_TX_TABLE_KEY_TUN_FLAG "user_meta.pmeta.tun_flag1_d0"
 
-#define L2_FWD_TX_TABLE_ACTION_L2_FWD \
-        "linux_networking_control.l2_fwd"
+#define L2_FWD_TX_TABLE_ACTION_L2_FWD "linux_networking_control.l2_fwd"
 
 #define L2_FWD_TX_TABLE_ACTION_SET_TUNNEL_UNDERLAY_V4_OVERLAY_V4 \
-        "linux_networking_control.set_tunnel_underlay_v4_overlay_v4"
+  "linux_networking_control.set_tunnel_underlay_v4_overlay_v4"
 
-#define ACTION_SET_TUNNEL_UNDERLAY_V4_OVERLAY_V4_PARAM_TUNNEL_ID \
-        "tunnel_id"
+#define ACTION_SET_TUNNEL_UNDERLAY_V4_OVERLAY_V4_PARAM_TUNNEL_ID "tunnel_id"
 
-#define ACTION_SET_TUNNEL_UNDERLAY_V4_OVERLAY_V4_PARAM_DST_ADDR \
-        "dst_addr"
+#define ACTION_SET_TUNNEL_UNDERLAY_V4_OVERLAY_V4_PARAM_DST_ADDR "dst_addr"
 
 /* L2_FWD_TX_IPV6_TABLE */
-#define L2_FWD_TX_IPV6_TABLE \
-        "linux_networking_control.l2_fwd_tx_ipv6_table"
+#define L2_FWD_TX_IPV6_TABLE "linux_networking_control.l2_fwd_tx_ipv6_table"
 
-#define L2_FWD_TX_IPV6_TABLE_KEY_DST_MAC \
-        "dst_mac"
+#define L2_FWD_TX_IPV6_TABLE_KEY_DST_MAC "dst_mac"
 
-#define L2_FWD_TX_IPV6_TABLE_KEY_TUN_FLAG \
-        "user_meta.pmeta.tun_flag1_d0"
+#define L2_FWD_TX_IPV6_TABLE_KEY_TUN_FLAG "user_meta.pmeta.tun_flag1_d0"
 
-#define L2_FWD_TX_IPV6_TABLE_ACTION_L2_FWD \
-        "linux_networking_control.l2_fwd"
+#define L2_FWD_TX_IPV6_TABLE_ACTION_L2_FWD "linux_networking_control.l2_fwd"
 
 #define L2_FWD_TX_IPV6_TABLE_ACTION_SET_TUNNEL_UNDERLAY_V6_OVERLAY_V6 \
-         "linux_networking_control.set_tunnel_underlay_v6_overlay_v6"
- 
+  "linux_networking_control.set_tunnel_underlay_v6_overlay_v6"
+
 #define ACTION_SET_TUNNEL_UNDERLAY_V6_OVERLAY_V6_PARAM_TUNNEL_ID "tunnel_id"
-
-#define ACTION_SET_TUNNEL_UNDERLAY_V6_OVERLAY_V6_PARAM_IPV6_1 \
-         "ipv6_1"
 
-#define ACTION_SET_TUNNEL_UNDERLAY_V6_OVERLAY_V6_PARAM_IPV6_2 \
-         "ipv6_2"
-
-#define ACTION_SET_TUNNEL_UNDERLAY_V6_OVERLAY_V6_PARAM_IPV6_3 \
-         "ipv6_3"
+#define ACTION_SET_TUNNEL_UNDERLAY_V6_OVERLAY_V6_PARAM_IPV6_1 "ipv6_1"
+
+#define ACTION_SET_TUNNEL_UNDERLAY_V6_OVERLAY_V6_PARAM_IPV6_2 "ipv6_2"
 
-#define ACTION_SET_TUNNEL_UNDERLAY_V6_OVERLAY_V6_PARAM_IPV6_4 \
-         "ipv6_4"
+#define ACTION_SET_TUNNEL_UNDERLAY_V6_OVERLAY_V6_PARAM_IPV6_3 "ipv6_3"
+
+#define ACTION_SET_TUNNEL_UNDERLAY_V6_OVERLAY_V6_PARAM_IPV6_4 "ipv6_4"
 
 /* SEM_BYPASS TABLE */
-#define SEM_BYPASS_TABLE \
-        "linux_networking_control.sem_bypass"
+#define SEM_BYPASS_TABLE "linux_networking_control.sem_bypass"
 
-#define SEM_BYPASS_TABLE_KEY_DST_MAC \
-        "dst_mac"
+#define SEM_BYPASS_TABLE_KEY_DST_MAC "dst_mac"
 
-#define SEM_BYPASS_TABLE_ACTION_SET_DEST \
-        "linux_networking_control.set_dest"
+#define SEM_BYPASS_TABLE_ACTION_SET_DEST "linux_networking_control.set_dest"
 
-#define ACTION_SET_DEST_PARAM_PORT_ID \
-        "port_id"
+#define ACTION_SET_DEST_PARAM_PORT_ID "port_id"
 
 #ifdef __cplusplus
-}; // extern "C"
+};  // extern "C"
 #endif
 
 #endif /* __P4_NAME_MAPPING__ */
-
diff --git a/ovs-p4rt/ovs_p4rt.cc b/ovs-p4rt/ovs_p4rt.cc
@@ -10,9 +10,9 @@
 #include "ovs_p4rt_tls_credentials.h"
 
 #if defined(DPDK_TARGET)
-  #include "dpdk/p4_name_mapping.h"
+#include "dpdk/p4_name_mapping.h"
 #elif defined(ES2K_TARGET)
-  #include "es2k/p4_name_mapping.h"
+#include "es2k/p4_name_mapping.h"
 #endif
 
 ABSL_FLAG(std::string, grpc_addr, "localhost:9559",

diff --git a/ovs-p4rt/ovs_p4rt_session.h b/ovs-p4rt/ovs_p4rt_session.h
@@ -95,10 +95,10 @@ ::absl::StatusOr<p4::v1::ReadResponse> SendReadRequest(
     OvsP4rtSession* session, const p4::v1::ReadRequest& read_request);
 
 ::absl::Status SendWriteRequest(OvsP4rtSession* session,
-                              const p4::v1::WriteRequest& write_request);
+                                const p4::v1::WriteRequest& write_request);
 
 ::absl::Status GetForwardingPipelineConfig(OvsP4rtSession* session,
-                                         p4::config::v1::P4Info* p4info);
+                                           p4::config::v1::P4Info* p4info);
 
 ::p4::v1::TableEntry* SetupTableEntryToInsert(OvsP4rtSession* session,
                                               ::p4::v1::WriteRequest* req);