Commit 1211f4e9 authored by Andrii Nakryiko's avatar Andrii Nakryiko
Browse files

Merge branch 'libbpf/xsk cleanups' 



Björn Töpel says:

====================

This series removes a header dependency from xsk.h, and moves
libbpf_util.h into xsk.h.

More details in each commit!

Thank you,
Björn
====================

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parents a9c80b03 7e8bbe24

tools/lib/bpf/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ install_headers: $(BPF_HELPER_DEFS) 
		$(call do_install,bpf.h,$(prefix)/include/bpf,644); \

		$(call do_install,libbpf.h,$(prefix)/include/bpf,644); \

		$(call do_install,btf.h,$(prefix)/include/bpf,644); \

		$(call do_install,libbpf_util.h,$(prefix)/include/bpf,644); \

		$(call do_install,libbpf_common.h,$(prefix)/include/bpf,644); \

		$(call do_install,xsk.h,$(prefix)/include/bpf,644); \

		$(call do_install,bpf_helpers.h,$(prefix)/include/bpf,644); \

tools/lib/bpf/libbpf_util.h

deleted100644 → 0
+0 −75
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */

/* Copyright (c) 2019 Facebook */



#ifndef __LIBBPF_LIBBPF_UTIL_H

#define __LIBBPF_LIBBPF_UTIL_H



#include <stdbool.h>

#include <linux/compiler.h>



#ifdef __cplusplus

extern "C" {

#endif



/* Use these barrier functions instead of smp_[rw]mb() when they are

 * used in a libbpf header file. That way they can be built into the

 * application that uses libbpf.

 */

#if defined(__i386__) || defined(__x86_64__)

# define libbpf_smp_store_release(p, v)					\

	do {								\

		asm volatile("" : : : "memory");			\

		WRITE_ONCE(*p, v);					\

	} while (0)

# define libbpf_smp_load_acquire(p)					\

	({								\

		typeof(*p) ___p1 = READ_ONCE(*p);			\

		asm volatile("" : : : "memory");			\

		___p1;							\

	})

#elif defined(__aarch64__)

# define libbpf_smp_store_release(p, v)					\

		asm volatile ("stlr %w1, %0" : "=Q" (*p) : "r" (v) : "memory")

# define libbpf_smp_load_acquire(p)					\

	({								\

		typeof(*p) ___p1;					\

		asm volatile ("ldar %w0, %1"				\

			      : "=r" (___p1) : "Q" (*p) : "memory");	\

		___p1;							\

	})

#elif defined(__riscv)

# define libbpf_smp_store_release(p, v)					\

	do {								\

		asm volatile ("fence rw,w" : : : "memory");		\

		WRITE_ONCE(*p, v);					\

	} while (0)

# define libbpf_smp_load_acquire(p)					\

	({								\

		typeof(*p) ___p1 = READ_ONCE(*p);			\

		asm volatile ("fence r,rw" : : : "memory");		\

		___p1;							\

	})

#endif



#ifndef libbpf_smp_store_release

#define libbpf_smp_store_release(p, v)					\

	do {								\

		__sync_synchronize();					\

		WRITE_ONCE(*p, v);					\

	} while (0)

#endif



#ifndef libbpf_smp_load_acquire

#define libbpf_smp_load_acquire(p)					\

	({								\

		typeof(*p) ___p1 = READ_ONCE(*p);			\

		__sync_synchronize();					\

		___p1;							\

	})

#endif



#ifdef __cplusplus

} /* extern "C" */

#endif



#endif

tools/lib/bpf/xsk.h

+68 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * AF_XDP user-space access library.

 *

 * Copyright (c) 2018 - 2019 Intel Corporation.

 * Copyright (c) 2019 Facebook

 *

 * Author(s): Magnus Karlsson <magnus.karlsson@intel.com>

 */
@@ -13,15 +14,80 @@ 


#include <stdio.h>

#include <stdint.h>

#include <stdbool.h>

#include <linux/if_xdp.h>



#include "libbpf.h"

#include "libbpf_util.h"



#ifdef __cplusplus

extern "C" {

#endif



/* Load-Acquire Store-Release barriers used by the XDP socket

 * library. The following macros should *NOT* be considered part of

 * the xsk.h API, and is subject to change anytime.

 *

 * LIBRARY INTERNAL

 */



#define __XSK_READ_ONCE(x) (*(volatile typeof(x) *)&x)

#define __XSK_WRITE_ONCE(x, v) (*(volatile typeof(x) *)&x) = (v)



#if defined(__i386__) || defined(__x86_64__)

# define libbpf_smp_store_release(p, v)					\

	do {								\

		asm volatile("" : : : "memory");			\

		__XSK_WRITE_ONCE(*p, v);				\

	} while (0)

# define libbpf_smp_load_acquire(p)					\

	({								\

		typeof(*p) ___p1 = __XSK_READ_ONCE(*p);			\

		asm volatile("" : : : "memory");			\

		___p1;							\

	})

#elif defined(__aarch64__)

# define libbpf_smp_store_release(p, v)					\

		asm volatile ("stlr %w1, %0" : "=Q" (*p) : "r" (v) : "memory")

# define libbpf_smp_load_acquire(p)					\

	({								\

		typeof(*p) ___p1;					\

		asm volatile ("ldar %w0, %1"				\

			      : "=r" (___p1) : "Q" (*p) : "memory");	\

		___p1;							\

	})

#elif defined(__riscv)

# define libbpf_smp_store_release(p, v)					\

	do {								\

		asm volatile ("fence rw,w" : : : "memory");		\

		__XSK_WRITE_ONCE(*p, v);				\

	} while (0)

# define libbpf_smp_load_acquire(p)					\

	({								\

		typeof(*p) ___p1 = __XSK_READ_ONCE(*p);			\

		asm volatile ("fence r,rw" : : : "memory");		\

		___p1;							\

	})

#endif



#ifndef libbpf_smp_store_release

#define libbpf_smp_store_release(p, v)					\

	do {								\

		__sync_synchronize();					\

		__XSK_WRITE_ONCE(*p, v);				\

	} while (0)

#endif



#ifndef libbpf_smp_load_acquire

#define libbpf_smp_load_acquire(p)					\

	({								\

		typeof(*p) ___p1 = __XSK_READ_ONCE(*p);			\

		__sync_synchronize();					\

		___p1;							\

	})

#endif



/* LIBRARY INTERNAL -- END */



/* Do not access these members directly. Use the functions below. */

#define DEFINE_XSK_RING(name) \

struct name { \