Add Bazel support for switchapi/dpdk

Signed-off-by: Derek G Foster <[email protected]>
ipdk-io · Mar 11, 2024 · 96710cb · 96710cb
1 parent 988f808
commit 96710cb
Show file tree

Hide file tree

Showing 22 changed files with 103 additions and 44 deletions.
diff --git a/switchapi/CMakeLists.txt b/switchapi/CMakeLists.txt
@@ -28,6 +28,7 @@ add_library(switchapi_o OBJECT
   switch_lag.h
   switch_neighbor.h
   switch_neighbor_int.h
+  switch_pd_routing.h
   switch_nhop.h
   switch_nhop_int.h
   switch_port_int.h

diff --git a/switchapi/dpdk/switch_config.c b/switchapi/dpdk/switch_config.c
@@ -1,6 +1,6 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 #include "switchapi/switch_config_int.h"
 #include "switchapi/switch_internal.h"
+#include "switchutils/switch_log.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/switchapi/dpdk/switch_device.c b/switchapi/dpdk/switch_device.c
@@ -1,6 +1,6 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,13 +26,14 @@
 #include "switchapi/switch_rmac_int.h"
 #include "switchapi/switch_table.h"
 #include "switchapi/switch_vrf.h"
+#include "switchutils/switch_log.h"
 
 #undef __MODULE__
 #define __MODULE__ SWITCH_API_TYPE_DEVICE
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */
+#endif
 
 #define __FILE_ID__ SWITCH_DEVICE
 
@@ -620,7 +621,7 @@ switch_status_t switch_api_device_tunnel_dmac_get(switch_device_t device,
   return status;
 }
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
 
 switch_status_t switch_api_device_remove(switch_device_t device) {

diff --git a/switchapi/dpdk/switch_fdb.c b/switchapi/dpdk/switch_fdb.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +24,7 @@
 #include "switchapi/switch_internal.h"
 #include "switchapi/switch_rif_int.h"
 #include "switchapi/switch_status.h"
+#include "switchutils/switch_log.h"
 
 switch_status_t switch_l2_hash_key_init(void* args, switch_uint8_t* key,
                                         switch_uint32_t* len) {

diff --git a/switchapi/dpdk/switch_handle.c b/switchapi/dpdk/switch_handle.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +21,7 @@
 #include "switchapi/switch_internal.h"
 #include "switchapi/switch_nhop_int.h"
 #include "switchapi/switch_status.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include "switchutils/switch_log.h"
 
 #define __FILE_ID__ SWITCH_HANDLE
 
@@ -477,7 +475,3 @@ switch_status_t switch_api_handle_count_get(switch_device_t device,
 
   return status;
 }
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/switchapi/dpdk/switch_id.c b/switchapi/dpdk/switch_id.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +19,7 @@
 #include "switchapi/switch_id.h"
 
 #include "switchapi/switch_internal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include "switchutils/switch_log.h"
 
 #define __FILE_ID__ SWITCH_ID
 

diff --git a/switchapi/dpdk/switch_l3.c b/switchapi/dpdk/switch_l3.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +22,7 @@
 #include "switchapi/switch_device.h"
 #include "switchapi/switch_internal.h"
 #include "switchapi/switch_nhop_int.h"
+#include "switchutils/switch_log.h"
 
 switch_status_t switch_route_table_entry_key_init(void* args,
                                                   switch_uint8_t* key,

diff --git a/switchapi/dpdk/switch_neighbor.c b/switchapi/dpdk/switch_neighbor.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +27,7 @@
 #include "switchapi/switch_nhop_int.h"
 #include "switchapi/switch_rif_int.h"
 #include "switchapi/switch_rmac_int.h"
+#include "switchutils/switch_log.h"
 
 switch_status_t switch_neighbor_init(switch_device_t device) {
   switch_neighbor_context_t* neighbor_ctx = NULL;

diff --git a/switchapi/dpdk/switch_nhop.c b/switchapi/dpdk/switch_nhop.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +25,7 @@
 #include "switchapi/switch_nhop_int.h"
 #include "switchapi/switch_rif.h"
 #include "switchapi/switch_rif_int.h"
+#include "switchutils/switch_log.h"
 
 // add corresponding delete functions
 

diff --git a/switchapi/dpdk/switch_pd_fdb.c b/switchapi/dpdk/switch_pd_fdb.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +26,7 @@
 #include "switchapi/switch_fdb.h"
 #include "switchapi/switch_internal.h"
 #include "switchapi/switch_rif_int.h"
+#include "switchutils/switch_log.h"
 
 switch_status_t switch_pd_l2_tx_forward_table_entry(
     switch_device_t device, const switch_api_l2_info_t* api_l2_tx_info,

diff --git a/switchapi/dpdk/switch_pd_routing.c b/switchapi/dpdk/switch_pd_routing.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +24,7 @@
 #include "switchapi/switch_base_types.h"
 #include "switchapi/switch_internal.h"
 #include "switchapi/switch_nhop_int.h"
+#include "switchutils/switch_log.h"
 
 switch_status_t switch_routing_table_entry(
     switch_device_t device, const switch_pd_routing_info_t* api_routing_info,

diff --git a/switchapi/dpdk/switch_pd_tunnel.c b/switchapi/dpdk/switch_pd_tunnel.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +22,7 @@
 #include "switch_pd_utils.h"
 #include "switchapi/switch_internal.h"
 #include "switchapi/switch_tunnel.h"
+#include "switchutils/switch_log.h"
 
 switch_status_t switch_pd_tunnel_entry(
     switch_device_t device, const switch_api_tunnel_info_t* api_tunnel_info_t,

diff --git a/switchapi/dpdk/switch_pd_utils.c b/switchapi/dpdk/switch_pd_utils.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +25,7 @@
 #include "port_mgr/dpdk/bf_dpdk_port_if.h"
 #include "switchapi/switch_base_types.h"
 #include "switchapi/switch_internal.h"
+#include "switchutils/switch_log.h"
 
 void switch_pd_to_get_port_id(switch_api_rif_info_t* port_rif_info) {
   char if_name[16] = {0};

diff --git a/switchapi/dpdk/switch_rif.c b/switchapi/dpdk/switch_rif.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +27,7 @@
 #include "switchapi/switch_rif.h"
 #include "switchapi/switch_rif_int.h"
 #include "switchapi/switch_status.h"
+#include "switchutils/switch_log.h"
 
 /*
  * Routine Description:

diff --git a/switchapi/dpdk/switch_rmac.c b/switchapi/dpdk/switch_rmac.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,7 @@
 #include "switch_pd_routing.h"
 #include "switchapi/switch_internal.h"
 #include "switchapi/switch_rmac_int.h"
+#include "switchutils/switch_log.h"
 
 /*
  * Routine Description:

diff --git a/switchapi/switch_neighbor.h b/switchapi/switch_neighbor.h
@@ -24,7 +24,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */
+#endif
 
 typedef enum switch_neighbor_type_s {
   SWITCH_NEIGHBOR_TYPE_IP = 0x0,

diff --git a/switchapi/switch_neighbor_int.h b/switchapi/switch_neighbor_int.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
+ * Copyright 2022-2024 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,17 +19,12 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */
+#endif
 
+#include "switch_pd_routing.h"
 #include "switch_rif.h"
 #include "switch_types_int.h"
 
-#if defined(DPDK_TARGET)
-#include "dpdk/switch_pd_routing.h"
-#elif defined(ES2K_TARGET)
-#include "es2k/switch_pd_routing.h"
-#endif
-
 #define switch_neighbor_handle_create(_device)               \
   switch_handle_create(_device, SWITCH_HANDLE_TYPE_NEIGHBOR, \
                        sizeof(switch_neighbor_info_t))
@@ -70,4 +65,4 @@ switch_status_t switch_neighbor_default_entries_delete(switch_device_t device);
 }
 #endif
 
-#endif /* _switch_neighbor_int_h_ */
+#endif  // __SWITCH_NEIGHBOR_INT_H__
diff --git a/switchapi/switch_pd_routing.h b/switchapi/switch_pd_routing.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2024 Intel Corporation.
+ * SPDX-License-Identifier: Apache 2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Proxy for the target-specific switch_pd_routing header file.
+//
+// We use a unique include guard to avoid aliasing the ones in the
+// target-specific header files (which would cause their contents
+// to be ignored).
+
+#ifndef __SWITCHAPI_PD_ROUTING_H__
+#define __SWITCHAPI_PD_ROUTING_H__
+
+#if defined(DPDK_TARGET)
+#include "dpdk/switch_pd_routing.h"
+#elif defined(ES2K_TARGET)
+#include "es2k/switch_pd_routing.h"
+#endif
+
+#endif  // __SWITCHAPI_PD_ROUTING_H__
diff --git a/switchapi/switch_table.h b/switchapi/switch_table.h
@@ -1,7 +1,6 @@
 /*
  * Copyright 2013-present Barefoot Networks, Inc.
- * Copyright 2022-2023 Intel Corporation.
- *
+ * Copyright 2022-2024 Intel Corporation.
  * SPDX-License-Identifier: Apache 2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +20,7 @@
 #define __SWITCH_TABLE_H__
 
 #include "switch_base_types.h"
+#include "switchutils/switch_log.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/switchlink/BUILD.bazel b/switchlink/BUILD.bazel
@@ -7,6 +7,13 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
 
 package(default_visibility = ["//visibility:public"])
 
+TARGET_DEFINES = select(
+    {
+        "//:dpdk_target": ["DPDK_TARGET"],
+        "//:es2k_target": ["ES2K_TARGET"],
+    },
+)
+
 cc_library(
     name = "switchlink_address",
     srcs = ["switchlink_address.c"],
@@ -36,6 +43,7 @@ cc_library(
         "switchlink_db.h",
         "switchlink_db_int.h",
     ],
+    defines = TARGET_DEFINES,
     deps = [
         ":switchlink_int",
         ":switchlink_link_types",