Commit 00842be5 authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'bpf-bpftool-license-update' 



Jakub Kicinski says:

====================
We are changing/clarifying the license on bpftool to GPLv2-only +
BSD-2-Clause for all files.  Current license mix is incompatible
with libbfd (which is GPLv3-only) and therefore Debian maintainers
are apprehensive about packaging bpftool.

Acks include authors of code which has been copied into bpftool (e.g.
JSON writer from iproute2, code from tools/bpf, code from BPF samples
and selftests, etc.)

Thanks again to all the authors who acked the change!
====================

Acked-by: default avatarRoman Gushchin <guro@fb.com>
Acked-by: default avatarYueHaibing <yuehaibing@huawei.com>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Acked-by: default avatarStanislav Fomichev <sdf@google.com>
Acked-by: default avatarSean Young <sean@mess.org>
Acked-by: default avatarJiri Benc <jbenc@redhat.com>
Acked-by: default avatarDavid Calavera <david.calavera@gmail.com>
Acked-by: default avatarAndrey Ignatov <rdna@fb.com>
Acked-by: default avatarJoe Stringer <joe@wand.net.nz>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Acked-by: default avatarAlexei Starovoitov <alexei.starovoitov@gmail.com>
Acked-by: default avatarPetar Penkov <ppenkov@stanford.edu>
Acked-by: default avatarSandipan Das <sandipan@linux.ibm.com>
Acked-by: default avatarPrashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
Acked-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Acked-by: default avatarTaeung Song <treeze.taeung@gmail.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
CC: okash.khawaja@gmail.com
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents 8f9a8a61 907b2236

tools/bpf/bpftool/bash-completion/bpftool

+1 −30
Original line number Diff line number Diff line 
# bpftool(8) bash completion                               -*- shell-script -*-

#

# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# Copyright (C) 2017-2018 Netronome Systems, Inc.

#

# This software is dual licensed under the GNU General License

# Version 2, June 1991 as shown in the file COPYING in the top-level

# directory of this source tree or the BSD 2-Clause License provided

# below.  You have the option to license this software under the

# complete terms of either license.

#

# The BSD 2-Clause License:

#

#     Redistribution and use in source and binary forms, with or

#     without modification, are permitted provided that the following

#     conditions are met:

#

#      1. Redistributions of source code must retain the above

#         copyright notice, this list of conditions and the following

#         disclaimer.

#

#      2. Redistributions in binary form must reproduce the above

#         copyright notice, this list of conditions and the following

#         disclaimer in the documentation and/or other materials

#         provided with the distribution.

#

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

# SOFTWARE.

#

# Author: Quentin Monnet <quentin.monnet@netronome.com>



# Takes a list of words in argument; each one of them is added to COMPREPLY if

tools/bpf/bpftool/btf_dumper.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

/* Copyright (c) 2018 Facebook */



#include <ctype.h>

tools/bpf/bpftool/cfg.c

+1 −35
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

/*

 * Copyright (C) 2018 Netronome Systems, Inc.

 *

 * This software is dual licensed under the GNU General License Version 2,

 * June 1991 as shown in the file COPYING in the top-level directory of this

 * source tree or the BSD 2-Clause License provided below.  You have the

 * option to license this software under the complete terms of either license.

 *

 * The BSD 2-Clause License:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      1. Redistributions of source code must retain the above

 *         copyright notice, this list of conditions and the following

 *         disclaimer.

 *

 *      2. Redistributions in binary form must reproduce the above

 *         copyright notice, this list of conditions and the following

 *         disclaimer in the documentation and/or other materials

 *         provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

 * POSSIBILITY OF SUCH DAMAGE.

 */

/* Copyright (C) 2018 Netronome Systems, Inc. */



#include <linux/list.h>

#include <stdlib.h>

tools/bpf/bpftool/cfg.h

+2 −36
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

/*

 * Copyright (C) 2018 Netronome Systems, Inc.

 *

 * This software is dual licensed under the GNU General License Version 2,

 * June 1991 as shown in the file COPYING in the top-level directory of this

 * source tree or the BSD 2-Clause License provided below.  You have the

 * option to license this software under the complete terms of either license.

 *

 * The BSD 2-Clause License:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      1. Redistributions of source code must retain the above

 *         copyright notice, this list of conditions and the following

 *         disclaimer.

 *

 *      2. Redistributions in binary form must reproduce the above

 *         copyright notice, this list of conditions and the following

 *         disclaimer in the documentation and/or other materials

 *         provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

 * POSSIBILITY OF SUCH DAMAGE.

 */

/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */

/* Copyright (C) 2018 Netronome Systems, Inc. */



#ifndef __BPF_TOOL_CFG_H

#define __BPF_TOOL_CFG_H

tools/bpf/bpftool/cgroup.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

// Copyright (C) 2017 Facebook

// Author: Roman Gushchin <guro@fb.com>

CRA Git | Maintained and supported by SUSTech CRA and CCSE