mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
fb9a98e160
This fixes two issues with the newly introduced libbpf_common.h file:
- The header failed to include <string.h> for the definition of memset()
- The new file was not included in the install_headers rule in the Makefile
Both of these issues cause breakage when installing libbpf with 'make
install' and trying to use it in applications.
Fixes: 544402d4b4 ("libbpf: Extract common user-facing helpers")
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20191217112810.768078-1-toke@redhat.com
40 lines
1.3 KiB
C
40 lines
1.3 KiB
C
/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */
|
|
|
|
/*
|
|
* Common user-facing libbpf helpers.
|
|
*
|
|
* Copyright (c) 2019 Facebook
|
|
*/
|
|
|
|
#ifndef __LIBBPF_LIBBPF_COMMON_H
|
|
#define __LIBBPF_LIBBPF_COMMON_H
|
|
|
|
#include <string.h>
|
|
|
|
#ifndef LIBBPF_API
|
|
#define LIBBPF_API __attribute__((visibility("default")))
|
|
#endif
|
|
|
|
/* Helper macro to declare and initialize libbpf options struct
|
|
*
|
|
* This dance with uninitialized declaration, followed by memset to zero,
|
|
* followed by assignment using compound literal syntax is done to preserve
|
|
* ability to use a nice struct field initialization syntax and **hopefully**
|
|
* have all the padding bytes initialized to zero. It's not guaranteed though,
|
|
* when copying literal, that compiler won't copy garbage in literal's padding
|
|
* bytes, but that's the best way I've found and it seems to work in practice.
|
|
*
|
|
* Macro declares opts struct of given type and name, zero-initializes,
|
|
* including any extra padding, it with memset() and then assigns initial
|
|
* values provided by users in struct initializer-syntax as varargs.
|
|
*/
|
|
#define DECLARE_LIBBPF_OPTS(TYPE, NAME, ...) \
|
|
struct TYPE NAME = ({ \
|
|
memset(&NAME, 0, sizeof(struct TYPE)); \
|
|
(struct TYPE) { \
|
|
.sz = sizeof(struct TYPE), \
|
|
__VA_ARGS__ \
|
|
}; \
|
|
})
|
|
|
|
#endif /* __LIBBPF_LIBBPF_COMMON_H */
|