diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..ca64e87 --- /dev/null +++ b/Android.bp @@ -0,0 +1,17 @@ +cc_defaults { + name: "bpf_defaults", + cpp_std: "c++17", + cflags: [ + "-Wall", + "-Werror", + "-Wnullable-to-nonnull-conversion", + "-Wthread-safety", + "-Wunused-parameter", + ], + tidy: true, + tidy_checks: [ + "android-*", + "cert-*", + "clang-analyzer-security*", + ], +} diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2 new file mode 100644 index 0000000..e69de29 diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/NOTICE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/OWNERS b/OWNERS new file mode 100644 index 0000000..9d84f37 --- /dev/null +++ b/OWNERS @@ -0,0 +1,5 @@ +fengc@google.com +joelaf@google.com +lorenzo@google.com +maze@google.com +sspatil@google.com diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 0000000..c8dbf77 --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,5 @@ +[Builtin Hooks] +clang_format = true + +[Builtin Hooks Options] +clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp diff --git a/bpfloader/Android.bp b/bpfloader/Android.bp index fe52bcf..48189e0 100644 --- a/bpfloader/Android.bp +++ b/bpfloader/Android.bp @@ -20,7 +20,7 @@ cc_binary { name: "bpfloader", - defaults: ["netd_defaults"], + defaults: ["bpf_defaults"], cflags: [ "-Wall", "-Werror", @@ -35,6 +35,7 @@ cc_binary { "libbpf", "libbase", "liblog", + "libnetdbpf", "libnetdutils", ], srcs: [ @@ -54,5 +55,5 @@ bpf { "-Wall", "-Werror", ], - include_dirs: ["system/netd/libbpf/include"], + include_dirs: ["system/netd/libnetdbpf/include"], } diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp index c7b1332..3d3d4dd 100644 --- a/bpfloader/BpfLoader.cpp +++ b/bpfloader/BpfLoader.cpp @@ -44,7 +44,7 @@ #include #include #include "bpf/BpfUtils.h" -#include "bpf/bpf_shared.h" +#include "netdbpf/bpf_shared.h" using android::base::unique_fd; using android::netdutils::Slice; diff --git a/bpfloader/bpf_kern.h b/bpfloader/bpf_kern.h index e56033d..25edbd4 100644 --- a/bpfloader/bpf_kern.h +++ b/bpfloader/bpf_kern.h @@ -16,16 +16,7 @@ /* * This h file together with bpf_kern.c is used for compiling the eBPF kernel - * program. To generate the bpf_kern.o file manually, use the clang prebuilt in - * this android tree to compile the files with --target=bpf options. For - * example, in system/netd/ directory, execute the following command: - * $: ANDROID_BASE_DIRECTORY/prebuilts/clang/host/linux-x86/clang-4691093/bin/clang \ - * -I ANDROID_BASE_DIRECTORY/bionic/libc/kernel/uapi/ \ - * -I ANDROID_BASE_DIRECTORY/system/netd/bpfloader/ \ - * -I ANDROID_BASE_DIRECTORY/bionic/libc/kernel/android/uapi/ \ - * -I ANDROID_BASE_DIRECTORY/bionic/libc/include \ - * -I ANDROID_BASE_DIRECTORY/system/netd/libbpf/include \ - * --target=bpf -O2 -c bpfloader/bpf_kern.c -o bpfloader/bpf_kern.o + * program. */ #include @@ -37,7 +28,7 @@ #include #include #include -#include "bpf/bpf_shared.h" +#include "netdbpf/bpf_shared.h" #define ELF_SEC(NAME) __attribute__((section(NAME), used)) diff --git a/libbpf/Android.bp b/libbpf/Android.bp new file mode 100644 index 0000000..4bf151a --- /dev/null +++ b/libbpf/Android.bp @@ -0,0 +1,83 @@ +// +// Copyright (C) 2018 The Android Open Source Project +// +// 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. +// + +cc_library_headers { + name: "libbpf_headers", + vendor_available: false, + host_supported: false, + export_include_dirs: ["include"], + target: { + linux_bionic: { + enabled: true, + }, + }, +} + +cc_library { + name: "libbpf", + vendor_available: false, + host_supported: false, + target: { + android: { + srcs: [ + "BpfUtils.cpp", + ], + sanitize: { + misc_undefined: ["integer"], + }, + }, + }, + + shared_libs: [ + "libbase", + "libutils", + "liblog", + "libnetdutils", + ], + header_libs: [ + "libbpf_headers" + ], + export_header_lib_headers: ["libbpf_headers"], + local_include_dirs: ["include"], + + defaults: ["bpf_defaults"], + cflags: [ + "-Werror", + "-Wall", + "-Wextra", + ], +} + +cc_test { + name: "libbpf_test", + srcs: [ + "BpfMapTest.cpp", + ], + defaults: ["bpf_defaults"], + cflags: [ + "-Wall", + "-Werror", + "-Wno-error=unused-variable", + ], + static_libs: ["libgmock"], + shared_libs: [ + "libbpf", + "libbase", + "liblog", + "libnetdutils", + "libutils", + ], +} diff --git a/libbpf/BpfMapTest.cpp b/libbpf/BpfMapTest.cpp index e367bdb..d0bd79e 100644 --- a/libbpf/BpfMapTest.cpp +++ b/libbpf/BpfMapTest.cpp @@ -33,16 +33,9 @@ #include #include -#include #include "bpf/BpfMap.h" -#include "bpf/BpfNetworkStats.h" #include "bpf/BpfUtils.h" -using ::testing::_; -using ::testing::ByMove; -using ::testing::Invoke; -using ::testing::Return; -using ::testing::StrictMock; using ::testing::Test; namespace android { diff --git a/libbpf/BpfUtils.cpp b/libbpf/BpfUtils.cpp index 955f2ec..cec8911 100644 --- a/libbpf/BpfUtils.cpp +++ b/libbpf/BpfUtils.cpp @@ -381,7 +381,7 @@ int parsePrograms(Slice fileContents, BpfProgInfo* programs, size_t size, int parseProgramsFromFile(const char* path, BpfProgInfo* programs, size_t size, const std::vector& mapPatterns) { - unique_fd fd(open(path, O_RDONLY)); + unique_fd fd(open(path, O_RDONLY | O_CLOEXEC)); int ret; if (fd < 0) { ret = -errno; diff --git a/libbpf/include/bpf/BpfMap.h b/libbpf/include/bpf/BpfMap.h index 20db43e..deeed14 100644 --- a/libbpf/include/bpf/BpfMap.h +++ b/libbpf/include/bpf/BpfMap.h @@ -47,7 +47,7 @@ template class BpfMap { public: BpfMap() : mMapFd(-1){}; - BpfMap(int fd) : mMapFd(fd){}; + explicit BpfMap(int fd) : mMapFd(fd){}; BpfMap(bpf_map_type map_type, uint32_t max_entries, uint32_t map_flags) { int map_fd = createMap(map_type, sizeof(Key), sizeof(Value), max_entries, map_flags); if (map_fd < 0) { @@ -57,7 +57,7 @@ class BpfMap { } } - netdutils::Status pinToPath(const std::string path) { + netdutils::Status pinToPath(const std::string& path) { int ret = bpfFdPin(mMapFd, path.c_str()); if (ret) { return netdutils::statusFromErrno(errno,