[PATCH 02/16] event/octeontx: add define guards to avoid multi-inclusion

[PATCH 02/16] event/octeontx: add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/event/octeontx/timvf_worker.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/event/octeontx/timvf_worker.h b/drivers/event/octeontx/timvf_worker.h
index 3f1e77f1d1..a99ff54245 100644
--- a/drivers/event/octeontx/timvf_worker.h
+++ b/drivers/event/octeontx/timvf_worker.h
@@ -2,6 +2,9 @@
  * Copyright(c) 2017 Cavium, Inc
  */
 
+#ifndef __TIMVF_WORKER_H__
+#define __TIMVF_WORKER_H__
+
 #include <eventdev_pmd.h>
 
 #include <rte_common.h>
@@ -443,3 +446,5 @@ timvf_add_entry_brst(struct timvf_ring * const timr, const uint16_t rel_bkt,
 	timr_bkt_dec_lock(bkt);
 	return nb_timers;
 }
+
+#endif /* __TIMVF_WORKER_H__ */
-- 
2.25.1

Re: [PATCH 02/16] event/octeontx: add define guards to avoid multi-inclusion

[Thomas Monjalon]

06/02/2022 04:58, Weiguo Li:
> Supplement define guards to prevent multiple inclusion.
> 
> Signed-off-by: Weiguo Li <liwg06@foxmail.com>
> ---
> --- a/drivers/event/octeontx/timvf_worker.h
> +++ b/drivers/event/octeontx/timvf_worker.h
> +#ifndef __TIMVF_WORKER_H__
> +#define __TIMVF_WORKER_H__

Why these underscores?
It could be simply
	#ifndef TIMVF_WORKER_H

[PATCH v2 00/16] add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Notice that there are couples of guard styles used in this project,
like "XX_H", "XX_H_" or "XXX_H__".
Adhere to Thomas's advice, this patch set use the first style to
make it simple.

Weiguo Li (16):
  bus/dpaa: add define guards to avoid multi-inclusion
  event/octeontx: add define guards to avoid multi-inclusion
  net/cxgbe: add define guards to avoid multi-inclusion
  net/enetfec: add define guards to avoid multi-inclusion
  net/i40e: add define guards to avoid multi-inclusion
  net/netvsc: add define guards to avoid multi-inclusion
  net/qede: add define guards to avoid multi-inclusion
  net/tap: add define guards to avoid multi-inclusion
  net/virtio: add define guards to avoid multi-inclusion
  raw/ifpga/base: add define guards to avoid multi-inclusion
  kni: add define guards to avoid multi-inclusion
  acl: add define guards to avoid multi-inclusion
  eal: add define guards to avoid multi-inclusion
  efd: add define guards to avoid multi-inclusion
  hash: add define guards to avoid multi-inclusion
  pcapng: add define guards to avoid multi-inclusion

 drivers/bus/dpaa/base/qbman/qman.h           | 5 +++++
 drivers/event/octeontx/timvf_worker.h        | 5 +++++
 drivers/net/cxgbe/base/t4_regs.h             | 5 +++++
 drivers/net/enetfec/enet_uio.h               | 5 +++++
 drivers/net/i40e/i40e_regs.h                 | 5 +++++
 drivers/net/netvsc/hn_nvs.h                  | 5 +++++
 drivers/net/netvsc/hn_rndis.h                | 5 +++++
 drivers/net/netvsc/hn_var.h                  | 5 +++++
 drivers/net/qede/base/reg_addr.h             | 5 +++++
 drivers/net/qede/qede_sriov.h                | 5 +++++
 drivers/net/tap/tap_bpf_insns.h              | 5 +++++
 drivers/net/tap/tap_log.h                    | 5 +++++
 drivers/net/virtio/virtio_rxtx_packed_avx.h  | 5 +++++
 drivers/net/virtio/virtio_rxtx_packed_neon.h | 5 +++++
 drivers/raw/ifpga/base/opae_at24_eeprom.h    | 5 +++++
 kernel/linux/kni/compat.h                    | 5 +++++
 lib/acl/acl_run_altivec.h                    | 5 +++++
 lib/acl/acl_run_avx2.h                       | 5 +++++
 lib/acl/acl_run_avx512x16.h                  | 5 +++++
 lib/acl/acl_run_avx512x8.h                   | 5 +++++
 lib/acl/acl_run_neon.h                       | 5 +++++
 lib/acl/acl_run_sse.h                        | 5 +++++
 lib/eal/include/rte_eal_paging.h             | 5 +++++
 lib/eal/windows/include/rte_virt2phys.h      | 5 +++++
 lib/efd/rte_efd_x86.h                        | 5 +++++
 lib/hash/rte_cmp_arm64.h                     | 5 +++++
 lib/hash/rte_cmp_x86.h                       | 5 +++++
 lib/kni/rte_kni_fifo.h                       | 5 ++++-
 lib/pcapng/pcapng_proto.h                    | 5 +++++
 29 files changed, 144 insertions(+), 1 deletion(-)

-- 
2.25.1

Re: [PATCH v2 00/16] add define guards to avoid multi-inclusion

[Stephen Hemminger]

On Wed,  9 Feb 2022 11:02:08 +0800
Weiguo Li <liwg06@foxmail.com> wrote:

> Supplement define guards to prevent multiple inclusion.
> 
> Notice that there are couples of guard styles used in this project,
> like "XX_H", "XX_H_" or "XXX_H__".
> Adhere to Thomas's advice, this patch set use the first style to
> make it simple.
> 
> Weiguo Li (16):
>   bus/dpaa: add define guards to avoid multi-inclusion
>   event/octeontx: add define guards to avoid multi-inclusion
>   net/cxgbe: add define guards to avoid multi-inclusion
>   net/enetfec: add define guards to avoid multi-inclusion
>   net/i40e: add define guards to avoid multi-inclusion
>   net/netvsc: add define guards to avoid multi-inclusion
>   net/qede: add define guards to avoid multi-inclusion
>   net/tap: add define guards to avoid multi-inclusion
>   net/virtio: add define guards to avoid multi-inclusion
>   raw/ifpga/base: add define guards to avoid multi-inclusion
>   kni: add define guards to avoid multi-inclusion
>   acl: add define guards to avoid multi-inclusion
>   eal: add define guards to avoid multi-inclusion
>   efd: add define guards to avoid multi-inclusion
>   hash: add define guards to avoid multi-inclusion
>   pcapng: add define guards to avoid multi-inclusion
> 
>  drivers/bus/dpaa/base/qbman/qman.h           | 5 +++++
>  drivers/event/octeontx/timvf_worker.h        | 5 +++++
>  drivers/net/cxgbe/base/t4_regs.h             | 5 +++++
>  drivers/net/enetfec/enet_uio.h               | 5 +++++
>  drivers/net/i40e/i40e_regs.h                 | 5 +++++
>  drivers/net/netvsc/hn_nvs.h                  | 5 +++++
>  drivers/net/netvsc/hn_rndis.h                | 5 +++++
>  drivers/net/netvsc/hn_var.h                  | 5 +++++
>  drivers/net/qede/base/reg_addr.h             | 5 +++++
>  drivers/net/qede/qede_sriov.h                | 5 +++++
>  drivers/net/tap/tap_bpf_insns.h              | 5 +++++
>  drivers/net/tap/tap_log.h                    | 5 +++++
>  drivers/net/virtio/virtio_rxtx_packed_avx.h  | 5 +++++
>  drivers/net/virtio/virtio_rxtx_packed_neon.h | 5 +++++
>  drivers/raw/ifpga/base/opae_at24_eeprom.h    | 5 +++++
>  kernel/linux/kni/compat.h                    | 5 +++++
>  lib/acl/acl_run_altivec.h                    | 5 +++++
>  lib/acl/acl_run_avx2.h                       | 5 +++++
>  lib/acl/acl_run_avx512x16.h                  | 5 +++++
>  lib/acl/acl_run_avx512x8.h                   | 5 +++++
>  lib/acl/acl_run_neon.h                       | 5 +++++
>  lib/acl/acl_run_sse.h                        | 5 +++++
>  lib/eal/include/rte_eal_paging.h             | 5 +++++
>  lib/eal/windows/include/rte_virt2phys.h      | 5 +++++
>  lib/efd/rte_efd_x86.h                        | 5 +++++
>  lib/hash/rte_cmp_arm64.h                     | 5 +++++
>  lib/hash/rte_cmp_x86.h                       | 5 +++++
>  lib/kni/rte_kni_fifo.h                       | 5 ++++-
>  lib/pcapng/pcapng_proto.h                    | 5 +++++
>  29 files changed, 144 insertions(+), 1 deletion(-)
> 

Some are good, but all the drivers and internal headers this change
is unnecessary. Please limit changes to where it matters.

[PATCH v3 0/4] add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

---
v3:
* limit changes to "rte_xxx.h" headers
v2:
* update to a simple style

Weiguo Li (4):
  kni: add define guards to avoid multi-inclusion
  eal: add define guards to avoid multi-inclusion
  efd: add define guards to avoid multi-inclusion
  hash: add define guards to avoid multi-inclusion

 lib/eal/include/rte_eal_paging.h        | 5 +++++
 lib/eal/windows/include/rte_virt2phys.h | 5 +++++
 lib/efd/rte_efd_x86.h                   | 5 +++++
 lib/hash/rte_cmp_arm64.h                | 5 +++++
 lib/hash/rte_cmp_x86.h                  | 5 +++++
 lib/kni/rte_kni_fifo.h                  | 5 ++++-
 6 files changed, 29 insertions(+), 1 deletion(-)

-- 
2.25.1

[PATCH 03/16] net/cxgbe: add define guards to avoid multiple inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/net/cxgbe/base/t4_regs.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/cxgbe/base/t4_regs.h b/drivers/net/cxgbe/base/t4_regs.h
index 8a14d09a15..4952f7cde4 100644
--- a/drivers/net/cxgbe/base/t4_regs.h
+++ b/drivers/net/cxgbe/base/t4_regs.h
@@ -3,6 +3,9 @@
  * All rights reserved.
  */
 
+#ifndef _CXGBE_T4_REGS_H_
+#define _CXGBE_T4_REGS_H_
+
 #define MYPF_BASE 0x1b000
 #define MYPF_REG(reg_addr) (MYPF_BASE + (reg_addr))
 
@@ -976,3 +979,5 @@
 
 #define LE_3_DB_HASH_MASK_GEN_IPV4_T6_A 0x19eac
 #define LE_4_DB_HASH_MASK_GEN_IPV4_T6_A 0x19eb0
+
+#endif /* _CXGBE_T4_REGS_H_ */
-- 
2.25.1

[PATCH 04/16] net/enetfec: add define guards to avoid multiple inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/net/enetfec/enet_uio.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/enetfec/enet_uio.h b/drivers/net/enetfec/enet_uio.h
index fec8ba6f95..0d5b9e7a39 100644
--- a/drivers/net/enetfec/enet_uio.h
+++ b/drivers/net/enetfec/enet_uio.h
@@ -2,6 +2,9 @@
  * Copyright 2021 NXP
  */
 
+#ifndef _ENETFEC_UIO_H_
+#define _ENETFEC_UIO_H_
+
 #include "enet_ethdev.h"
 
 /* Prefix path to sysfs directory where UIO device attributes are exported.
@@ -62,3 +65,5 @@ int enetfec_configure(void);
 int config_enetfec_uio(struct enetfec_private *fep);
 void enetfec_uio_init(void);
 void enetfec_cleanup(struct enetfec_private *fep);
+
+#endif /* _ENETFEC_UIO_H_ */
-- 
2.25.1

[PATCH 05/16] net/i40e: add define guards to avoid multiple inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/net/i40e/i40e_regs.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/i40e/i40e_regs.h b/drivers/net/i40e/i40e_regs.h
index b19bb1d5a5..b3111dbf96 100644
--- a/drivers/net/i40e/i40e_regs.h
+++ b/drivers/net/i40e/i40e_regs.h
@@ -2,6 +2,9 @@
  * Copyright(c) 2016 Intel Corporation
  */
 
+#ifndef _I40E_REGS_H_
+#define _I40E_REGS_H_
+
 struct i40e_reg_info {
 	uint32_t base_addr;
 	uint32_t count1;
@@ -966,3 +969,5 @@ static const struct i40e_reg_info i40e_regs_others[] = {
 	{I40E_GLGEN_STAT_CLEAR, 0, 0, 0, 0, "GLGEN_STAT_CLEAR"},
 	{0, 0, 0, 0, 0, NULL}
 };
+
+#endif /* _I40E_REGS_H_ */
-- 
2.25.1

[PATCH 06/16] net/netvsc: add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/net/netvsc/hn_nvs.h   | 5 +++++
 drivers/net/netvsc/hn_rndis.h | 5 +++++
 drivers/net/netvsc/hn_var.h   | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/drivers/net/netvsc/hn_nvs.h b/drivers/net/netvsc/hn_nvs.h
index 3766d2ee34..f1144897d9 100644
--- a/drivers/net/netvsc/hn_nvs.h
+++ b/drivers/net/netvsc/hn_nvs.h
@@ -3,6 +3,9 @@
  * All rights reserved.
  */
 
+#ifndef _NETVSC_HN_NVS_H_
+#define _NETVSC_HN_NVS_H_
+
 /*
  * The indirection table message is the largest message
  * received from host, and that is 112 bytes.
@@ -236,3 +239,5 @@ hn_nvs_send_sglist(struct vmbus_channel *chan,
 	return rte_vmbus_chan_send_sglist(chan, sg, sglen, nvs_msg, nvs_msglen,
 					  (uint64_t)sndc, need_sig);
 }
+
+#endif /* _NETVSC_HN_NVS_H_ */
diff --git a/drivers/net/netvsc/hn_rndis.h b/drivers/net/netvsc/hn_rndis.h
index 9a8251fc2f..7c3b750ccc 100644
--- a/drivers/net/netvsc/hn_rndis.h
+++ b/drivers/net/netvsc/hn_rndis.h
@@ -1,5 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 
+#ifndef _NETVSC_HN_RNDIS_H_
+#define _NETVSC_HN_RNDIS_H_
+
 #include "rndis.h"
 
 struct hn_data;
@@ -32,3 +35,5 @@ void hn_rndis_dump(const void *buf);
 #else
 #define hn_rndis_dump(buf)
 #endif
+
+#endif /* _NETVSC_HN_RNDIS_H_ */
diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h
index fbb3995507..53939efdd3 100644
--- a/drivers/net/netvsc/hn_var.h
+++ b/drivers/net/netvsc/hn_var.h
@@ -6,6 +6,9 @@
  * All rights reserved.
  */
 
+#ifndef _NETVSC_HN_VAR_H_
+#define _NETVSC_HN_VAR_H_
+
 #include <rte_eal_paging.h>
 #include <ethdev_driver.h>
 
@@ -283,3 +286,5 @@ int	hn_vf_reta_hash_update(struct rte_eth_dev *dev,
 int	hn_eth_rmv_event_callback(uint16_t port_id,
 				  enum rte_eth_event_type event __rte_unused,
 				  void *cb_arg, void *out __rte_unused);
+
+#endif /* _NETVSC_HN_VAR_H_ */
-- 
2.25.1

[PATCH 07/16] net/qede: add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/net/qede/base/reg_addr.h | 5 +++++
 drivers/net/qede/qede_sriov.h    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/drivers/net/qede/base/reg_addr.h b/drivers/net/qede/base/reg_addr.h
index c84d3865f4..d8435f468e 100644
--- a/drivers/net/qede/base/reg_addr.h
+++ b/drivers/net/qede/base/reg_addr.h
@@ -4,6 +4,9 @@
  * www.cavium.com
  */
 
+#ifndef _QEDE_REG_ADDR_H_
+#define _QEDE_REG_ADDR_H_
+
 #define  CDU_REG_CID_ADDR_PARAMS_CONTEXT_SIZE_SHIFT \
 	0
 
@@ -2091,3 +2094,5 @@
   #define MISC_REG_AEU_GENERAL_MASK_AEU_SYS_KILL_MASK_SHIFT 2
   #define MISC_REG_AEU_GENERAL_MASK_AEU_GLB_UNC_ERR_MASK (0x1UL << 3)
   #define MISC_REG_AEU_GENERAL_MASK_AEU_GLB_UNC_ERR_MASK_SHIFT 3
+
+#endif /* _QEDE_REG_ADDR_H_ */
diff --git a/drivers/net/qede/qede_sriov.h b/drivers/net/qede/qede_sriov.h
index e58ecc2a51..e95bee9415 100644
--- a/drivers/net/qede/qede_sriov.h
+++ b/drivers/net/qede/qede_sriov.h
@@ -4,6 +4,9 @@
  * www.marvell.com
  */
 
+#ifndef _QEDE_SRIOV_H_
+#define _QEDE_SRIOV_H_
+
 void qed_sriov_configure(struct ecore_dev *edev, int num_vfs_param);
 
 enum qed_iov_wq_flag {
@@ -20,3 +23,5 @@ enum qed_iov_wq_flag {
 void qed_inform_vf_link_state(struct ecore_hwfn *hwfn);
 int qed_schedule_iov(struct ecore_hwfn *p_hwfn, enum qed_iov_wq_flag flag);
 void qed_iov_pf_task(void *arg);
+
+#endif /* _QEDE_SRIOV_H_ */
-- 
2.25.1

[PATCH 08/16] net/tap: add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/net/tap/tap_bpf_insns.h | 5 +++++
 drivers/net/tap/tap_log.h       | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/drivers/net/tap/tap_bpf_insns.h b/drivers/net/tap/tap_bpf_insns.h
index 1a91bbad13..d4e6bea3d7 100644
--- a/drivers/net/tap/tap_bpf_insns.h
+++ b/drivers/net/tap/tap_bpf_insns.h
@@ -2,6 +2,9 @@
  * Copyright 2017 Mellanox Technologies, Ltd
  */
 
+#ifndef _TAP_BPF_INSNS_H_
+#define _TAP_BPF_INSNS_H_
+
 #include <tap_bpf.h>
 
 /* bpf_insn array matching cls_q section. See tap_bpf_program.c file */
@@ -1694,3 +1697,5 @@ static struct bpf_insn l3_l4_hash_insns[] = {
 	{0xbf,    0,    7,        0, 0x00000000},
 	{0x95,    0,    0,        0, 0x00000000},
 };
+
+#endif /* _TAP_BPF_INSNS_H_ */
diff --git a/drivers/net/tap/tap_log.h b/drivers/net/tap/tap_log.h
index fa06843a4c..667d9e6ab0 100644
--- a/drivers/net/tap/tap_log.h
+++ b/drivers/net/tap/tap_log.h
@@ -3,8 +3,13 @@
  * Copyright 2017 Mellanox Technologies, Ltd
  */
 
+#ifndef _TAP_LOG_H_
+#define _TAP_LOG_H_
+
 extern int tap_logtype;
 
 #define TAP_LOG(level, fmt, args...) \
 	rte_log(RTE_LOG_ ## level, tap_logtype, "%s(): " fmt "\n", \
 		__func__, ## args)
+
+#endif /* _TAP_LOG_H_ */
-- 
2.25.1

[PATCH 09/16] net/virtio: add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/net/virtio/virtio_rxtx_packed_avx.h  | 5 +++++
 drivers/net/virtio/virtio_rxtx_packed_neon.h | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/drivers/net/virtio/virtio_rxtx_packed_avx.h b/drivers/net/virtio/virtio_rxtx_packed_avx.h
index 584ac72f95..950abc8b12 100644
--- a/drivers/net/virtio/virtio_rxtx_packed_avx.h
+++ b/drivers/net/virtio/virtio_rxtx_packed_avx.h
@@ -2,6 +2,9 @@
  * Copyright(c) 2010-2020 Intel Corporation
  */
 
+#ifndef _VIRTIO_RXTX_PACKED_AVX_H_
+#define _VIRTIO_RXTX_PACKED_AVX_H_
+
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -237,3 +240,5 @@ virtqueue_dequeue_batch_packed_vec(struct virtnet_rx *rxvq,
 
 	return 0;
 }
+
+#endif /* _VIRTIO_RXTX_PACKED_AVX_H_ */
diff --git a/drivers/net/virtio/virtio_rxtx_packed_neon.h b/drivers/net/virtio/virtio_rxtx_packed_neon.h
index c222ebf00c..a946649bdd 100644
--- a/drivers/net/virtio/virtio_rxtx_packed_neon.h
+++ b/drivers/net/virtio/virtio_rxtx_packed_neon.h
@@ -2,6 +2,9 @@
  * Copyright(c) 2020 Arm Corporation
  */
 
+#ifndef _VIRTIO_RXTX_PACKED_NEON_H_
+#define _VIRTIO_RXTX_PACKED_NEON_H_
+
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -291,3 +294,5 @@ virtqueue_dequeue_batch_packed_vec(struct virtnet_rx *rxvq,
 
 	return 0;
 }
+
+#endif /* _VIRTIO_RXTX_PACKED_NEON_H_ */
-- 
2.25.1

[PATCH 10/16] raw/ifpga/base: add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 drivers/raw/ifpga/base/opae_at24_eeprom.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/raw/ifpga/base/opae_at24_eeprom.h b/drivers/raw/ifpga/base/opae_at24_eeprom.h
index caae9a3ec1..6ba6933409 100644
--- a/drivers/raw/ifpga/base/opae_at24_eeprom.h
+++ b/drivers/raw/ifpga/base/opae_at24_eeprom.h
@@ -3,6 +3,9 @@
  * Copyright(c) 2010-2019 Intel Corporation
  */
 
+#ifndef _OPAE_AT24_EEPROM_H
+#define _OPAE_AT24_EEPROM_H
+
 #define AT24C512_PAGE_SIZE 128
 #define AT24C512_IO_LIMIT  128
 
@@ -12,3 +15,5 @@ int at24_eeprom_read(struct altera_i2c_dev *dev, unsigned int slave_addr,
 		u32 offset, u8 *buf, int count);
 int at24_eeprom_write(struct altera_i2c_dev *dev, unsigned int slave_addr,
 		u32 offset, u8 *buf, int count);
+
+#endif /* _OPAE_AT24_EEPROM_H */
-- 
2.25.1

[PATCH 11/16] kni: add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 kernel/linux/kni/compat.h | 5 +++++
 lib/kni/rte_kni_fifo.h    | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
index 664785674f..0879a7666e 100644
--- a/kernel/linux/kni/compat.h
+++ b/kernel/linux/kni/compat.h
@@ -3,6 +3,9 @@
  * Minimal wrappers to allow compiling kni on older kernels.
  */
 
+#ifndef _KNI_COMPAT_H_
+#define _KNI_COMPAT_H_
+
 #include <linux/version.h>
 
 #ifndef RHEL_RELEASE_VERSION
@@ -141,3 +144,5 @@
 #if KERNEL_VERSION(5, 9, 0) > LINUX_VERSION_CODE
 #define HAVE_TSK_IN_GUP
 #endif
+
+#endif /* _KNI_COMPAT_H_ */
diff --git a/lib/kni/rte_kni_fifo.h b/lib/kni/rte_kni_fifo.h
index d2ec82fe87..73d70c9bda 100644
--- a/lib/kni/rte_kni_fifo.h
+++ b/lib/kni/rte_kni_fifo.h
@@ -2,7 +2,8 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
-
+#ifndef _RTE_KNI_FIFO_H_
+#define _RTE_KNI_FIFO_H_
 
 /**
  * @internal when c11 memory model enabled use c11 atomic memory barrier.
@@ -115,3 +116,5 @@ kni_fifo_free_count(struct rte_kni_fifo *fifo)
 	uint32_t fifo_read = __KNI_LOAD_ACQUIRE(&fifo->read);
 	return (fifo_read - fifo_write - 1) & (fifo->len - 1);
 }
+
+#endif /* _RTE_KNI_FIFO_H_ */
-- 
2.25.1

[PATCH 12/16] acl: add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.
It should noted that there is an exceptional case:
lib/acl/acl_run_avx512_common.h is designed to be included
several times.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 lib/acl/acl_run_altivec.h   | 5 +++++
 lib/acl/acl_run_avx2.h      | 5 +++++
 lib/acl/acl_run_avx512x16.h | 5 +++++
 lib/acl/acl_run_avx512x8.h  | 5 +++++
 lib/acl/acl_run_neon.h      | 5 +++++
 lib/acl/acl_run_sse.h       | 5 +++++
 6 files changed, 30 insertions(+)

diff --git a/lib/acl/acl_run_altivec.h b/lib/acl/acl_run_altivec.h
index 24a41eec17..0c4388c14e 100644
--- a/lib/acl/acl_run_altivec.h
+++ b/lib/acl/acl_run_altivec.h
@@ -3,6 +3,9 @@
  * Copyright (C) IBM Corporation 2016.
  */
 
+#ifndef _ACL_RUN_ALTIVEC_H_
+#define _ACL_RUN_ALTIVEC_H_
+
 #include "acl_run.h"
 #include "acl_vect.h"
 
@@ -300,3 +303,5 @@ search_altivec_4(const struct rte_acl_ctx *ctx, const uint8_t **data,
 
 	return 0;
 }
+
+#endif /* _ACL_RUN_ALTIVEC_H_ */
diff --git a/lib/acl/acl_run_avx2.h b/lib/acl/acl_run_avx2.h
index 0b8967f22e..15c8ac2dfb 100644
--- a/lib/acl/acl_run_avx2.h
+++ b/lib/acl/acl_run_avx2.h
@@ -2,6 +2,9 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
+#ifndef _ACL_RUN_AVX2_H_
+#define _ACL_RUN_AVX2_H_
+
 #include "acl_run_sse.h"
 
 static const rte_ymm_t ymm_match_mask = {
@@ -253,3 +256,5 @@ search_avx2x16(const struct rte_acl_ctx *ctx, const uint8_t **data,
 
 	return 0;
 }
+
+#endif /* _ACL_RUN_AVX2_H_ */
diff --git a/lib/acl/acl_run_avx512x16.h b/lib/acl/acl_run_avx512x16.h
index f87293eeb7..3a6f4900af 100644
--- a/lib/acl/acl_run_avx512x16.h
+++ b/lib/acl/acl_run_avx512x16.h
@@ -2,6 +2,9 @@
  * Copyright(c) 2020 Intel Corporation
  */
 
+#ifndef _ACL_RUN_AVX512X16_H_
+#define _ACL_RUN_AVX512X16_H_
+
 /*
  * Defines required by "acl_run_avx512_common.h".
  * Note that all of them has to be undefined by the end
@@ -337,3 +340,5 @@ search_avx512x16x2(const struct rte_acl_ctx *ctx, const uint8_t **data,
 #undef _SC_
 #undef _T_mask
 #undef _T_simd
+
+#endif /* _ACL_RUN_AVX512X16_H_ */
diff --git a/lib/acl/acl_run_avx512x8.h b/lib/acl/acl_run_avx512x8.h
index 5da2bbfdeb..9033e4b324 100644
--- a/lib/acl/acl_run_avx512x8.h
+++ b/lib/acl/acl_run_avx512x8.h
@@ -2,6 +2,9 @@
  * Copyright(c) 2020 Intel Corporation
  */
 
+#ifndef _ACL_RUN_AVX512X8_H_
+#define _ACL_RUN_AVX512X8_H_
+
 /*
  * Defines required by "acl_run_avx512_common.h".
  * Note that all of them has to be undefined by the end
@@ -251,3 +254,5 @@ search_avx512x8x2(const struct rte_acl_ctx *ctx, const uint8_t **data,
 #undef _SC_
 #undef _T_mask
 #undef _T_simd
+
+#endif /* _ACL_RUN_AVX512X8_H_ */
diff --git a/lib/acl/acl_run_neon.h b/lib/acl/acl_run_neon.h
index 69d1b6d9e1..cf721e4c3c 100644
--- a/lib/acl/acl_run_neon.h
+++ b/lib/acl/acl_run_neon.h
@@ -2,6 +2,9 @@
  * Copyright(c) 2015 Cavium, Inc
  */
 
+#ifndef _ACL_RUN_NEON_H_
+#define _ACL_RUN_NEON_H_
+
 #include "acl_run.h"
 #include "acl_vect.h"
 
@@ -259,3 +262,5 @@ search_neon_4(const struct rte_acl_ctx *ctx, const uint8_t **data,
 
 	return 0;
 }
+
+#endif /* _ACL_RUN_NEON_H_ */
diff --git a/lib/acl/acl_run_sse.h b/lib/acl/acl_run_sse.h
index 93286a2c38..6d733f6046 100644
--- a/lib/acl/acl_run_sse.h
+++ b/lib/acl/acl_run_sse.h
@@ -2,6 +2,9 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
+#ifndef _ACL_RUN_SSE_H_
+#define _ACL_RUN_SSE_H_
+
 #include "acl_run.h"
 #include "acl_vect.h"
 
@@ -326,3 +329,5 @@ search_sse_4(const struct rte_acl_ctx *ctx, const uint8_t **data,
 
 	return 0;
 }
+
+#endif /* _ACL_RUN_SSE_H_ */
-- 
2.25.1

[PATCH 13/16] eal: add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 lib/eal/include/rte_eal_paging.h        | 5 +++++
 lib/eal/windows/include/rte_virt2phys.h | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/lib/eal/include/rte_eal_paging.h b/lib/eal/include/rte_eal_paging.h
index c60317d0f5..0ee5dd467f 100644
--- a/lib/eal/include/rte_eal_paging.h
+++ b/lib/eal/include/rte_eal_paging.h
@@ -2,6 +2,9 @@
  * Copyright(c) 2020 Dmitry Kozlyuk
  */
 
+#ifndef _RTE_EAL_PAGING_H_
+#define _RTE_EAL_PAGING_H_
+
 #include <stdint.h>
 
 #include <rte_compat.h>
@@ -96,3 +99,5 @@ rte_mem_page_size(void);
 __rte_internal
 int
 rte_mem_lock(const void *virt, size_t size);
+
+#endif /* _RTE_EAL_PAGING_H_ */
diff --git a/lib/eal/windows/include/rte_virt2phys.h b/lib/eal/windows/include/rte_virt2phys.h
index 4bb2b4aafe..06992f208d 100644
--- a/lib/eal/windows/include/rte_virt2phys.h
+++ b/lib/eal/windows/include/rte_virt2phys.h
@@ -2,6 +2,9 @@
  * Copyright (c) 2020 Dmitry Kozlyuk
  */
 
+#ifndef _RTE_VIRT2PHYS_H_
+#define _RTE_VIRT2PHYS_H_
+
 /**
  * @file virt2phys driver interface
  */
@@ -32,3 +35,5 @@ DEFINE_GUID(GUID_DEVINTERFACE_VIRT2PHYS,
  */
 #define IOCTL_VIRT2PHYS_TRANSLATE CTL_CODE( \
 	VIRT2PHYS_DEVTYPE, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#endif /* _RTE_VIRT2PHYS_H_ */
-- 
2.25.1

Re: [PATCH 13/16] eal: add define guards to avoid multi-inclusion

[Dmitry Kozlyuk]

2022-02-06 11:58 (UTC+0800), Weiguo Li:
> Supplement define guards to prevent multiple inclusion.
> 
> Signed-off-by: Weiguo Li <liwg06@foxmail.com>
> ---
>  lib/eal/include/rte_eal_paging.h        | 5 +++++
>  lib/eal/windows/include/rte_virt2phys.h | 5 +++++
>  2 files changed, 10 insertions(+)
> 
> diff --git a/lib/eal/include/rte_eal_paging.h b/lib/eal/include/rte_eal_paging.h
> index c60317d0f5..0ee5dd467f 100644
> --- a/lib/eal/include/rte_eal_paging.h
> +++ b/lib/eal/include/rte_eal_paging.h
> @@ -2,6 +2,9 @@
>   * Copyright(c) 2020 Dmitry Kozlyuk
>   */
>  
> +#ifndef _RTE_EAL_PAGING_H_
> +#define _RTE_EAL_PAGING_H_
> +
>  #include <stdint.h>
>  
>  #include <rte_compat.h>
> @@ -96,3 +99,5 @@ rte_mem_page_size(void);
>  __rte_internal
>  int
>  rte_mem_lock(const void *virt, size_t size);
> +
> +#endif /* _RTE_EAL_PAGING_H_ */
> diff --git a/lib/eal/windows/include/rte_virt2phys.h b/lib/eal/windows/include/rte_virt2phys.h
> index 4bb2b4aafe..06992f208d 100644
> --- a/lib/eal/windows/include/rte_virt2phys.h
> +++ b/lib/eal/windows/include/rte_virt2phys.h
> @@ -2,6 +2,9 @@
>   * Copyright (c) 2020 Dmitry Kozlyuk
>   */
>  
> +#ifndef _RTE_VIRT2PHYS_H_
> +#define _RTE_VIRT2PHYS_H_
> +
>  /**
>   * @file virt2phys driver interface
>   */
> @@ -32,3 +35,5 @@ DEFINE_GUID(GUID_DEVINTERFACE_VIRT2PHYS,
>   */
>  #define IOCTL_VIRT2PHYS_TRANSLATE CTL_CODE( \
>  	VIRT2PHYS_DEVTYPE, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS)
> +
> +#endif /* _RTE_VIRT2PHYS_H_ */

Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>

Probably should have:

Fixes: 2a5d547a4a9b ("eal/windows: implement basic memory management")
Cc: dmitry.kozliuk@gmail.com

[PATCH 14/16] efd: add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 lib/efd/rte_efd_x86.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/efd/rte_efd_x86.h b/lib/efd/rte_efd_x86.h
index e2f9dcca88..fac74fa50b 100644
--- a/lib/efd/rte_efd_x86.h
+++ b/lib/efd/rte_efd_x86.h
@@ -2,6 +2,9 @@
  * Copyright(c) 2016-2017 Intel Corporation
  */
 
+#ifndef _RTE_EFD_X86_H_
+#define _RTE_EFD_X86_H_
+
 /* rte_efd_x86.h
  * This file holds all x86 specific EFD functions
  */
@@ -55,3 +58,5 @@ efd_lookup_internal_avx2(const efd_hashfunc_t *group_hash_idx,
 #endif
 
 }
+
+#endif /* _RTE_EFD_X86_H_ */
-- 
2.25.1

[PATCH 15/16] hash: add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 lib/hash/rte_cmp_arm64.h | 5 +++++
 lib/hash/rte_cmp_x86.h   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/lib/hash/rte_cmp_arm64.h b/lib/hash/rte_cmp_arm64.h
index e9e26f9abd..aaad614d56 100644
--- a/lib/hash/rte_cmp_arm64.h
+++ b/lib/hash/rte_cmp_arm64.h
@@ -2,6 +2,9 @@
  * Copyright(c) 2015 Cavium, Inc
  */
 
+#ifndef _RTE_CMP_ARM64_H_
+#define _RTE_CMP_ARM64_H_
+
 /* Functions to compare multiple of 16 byte keys (up to 128 bytes) */
 static int
 rte_hash_k16_cmp_eq(const void *key1, const void *key2,
@@ -83,3 +86,5 @@ rte_hash_k128_cmp_eq(const void *key1, const void *key2, size_t key_len)
 		rte_hash_k64_cmp_eq((const char *) key1 + 64,
 				(const char *) key2 + 64, key_len);
 }
+
+#endif /* _RTE_CMP_ARM64_H_ */
diff --git a/lib/hash/rte_cmp_x86.h b/lib/hash/rte_cmp_x86.h
index 13a5836351..f31ec7b1d2 100644
--- a/lib/hash/rte_cmp_x86.h
+++ b/lib/hash/rte_cmp_x86.h
@@ -2,6 +2,9 @@
  * Copyright(c) 2015 Intel Corporation
  */
 
+#ifndef _RTE_CMP_X86_H_
+#define _RTE_CMP_X86_H_
+
 #include <rte_vect.h>
 
 /* Functions to compare multiple of 16 byte keys (up to 128 bytes) */
@@ -74,3 +77,5 @@ rte_hash_k128_cmp_eq(const void *key1, const void *key2, size_t key_len)
 		rte_hash_k64_cmp_eq((const char *) key1 + 64,
 				(const char *) key2 + 64, key_len);
 }
+
+#endif /* _RTE_CMP_X86_H_ */
-- 
2.25.1

[PATCH 16/16] pcapng: add define guards to avoid multi-inclusion

[Weiguo Li]

Supplement define guards to prevent multiple inclusion.

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
---
 lib/pcapng/pcapng_proto.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/pcapng/pcapng_proto.h b/lib/pcapng/pcapng_proto.h
index 47161d8a12..2e0c0e8cfd 100644
--- a/lib/pcapng/pcapng_proto.h
+++ b/lib/pcapng/pcapng_proto.h
@@ -6,6 +6,9 @@
  * See: https://github.com/pcapng/pcapng/ for the file format.
  */
 
+#ifndef _PCAPNG_PROTO_H_
+#define _PCAPNG_PROTO_H_
+
 enum pcapng_block_types {
 	PCAPNG_INTERFACE_BLOCK		= 1,
 	PCAPNG_PACKET_BLOCK,		/* Obsolete */
@@ -127,3 +130,5 @@ enum pcapng_isb_options {
 	PCAPNG_ISB_OSDROP,
 	PCAPNG_ISB_USRDELIV,
 };
+
+#endif /* _PCAPNG_PROTO_H_ */
-- 
2.25.1