Merge branch 'master' into dependabot/github_actions/actions-e3feb9629e

Author: varun-r-mallya

.github/workflows/pip.yml

@@ -15,37 +15,36 @@ jobs:
       matrix:
         platform: [ubuntu-latest]
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-        
+
     runs-on: ${{ matrix.platform }}
-    
+
     steps:
     - uses: actions/checkout@v5
       with:
         submodules: true
-        
     - uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
-        
+
     - name: Install system dependencies
       run: |
         sudo apt-get update
         sudo apt-get install -y \
           libbpf-dev \
+          libelf-dev \
           linux-headers-generic \
           build-essential \
           cmake \
           ninja-build
-          
+
     - name: Add requirements
       run: python -m pip install --upgrade pip wheel setuptools
-      
+
     - name: Build and install
       run: pip install --verbose .[test]
-      
+
     - name: Test import
       run: python -c "import pylibbpf; print('Import successful')"
-      
+
     - name: Test
       run: python -m pytest -v
-      

.github/workflows/wheels.yml

@@ -18,13 +18,13 @@ jobs:
     - uses: actions/checkout@v5
       with:
         submodules: true
-        
+
     - name: Build SDist
       run: pipx run build --sdist
-      
+
     - name: Check metadata
       run: pipx run twine check dist/*
-      
+
     - uses: actions/upload-artifact@v4
       with:
         name: cibw-sdist
@@ -36,48 +36,32 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Build for both x86_64 and aarch64
-        arch: [x86_64, aarch64]
-        
+        arch: [x86_64]
+
     steps:
     - uses: actions/checkout@v5
       with:
         submodules: true
-        
-    # Set up QEMU for aarch64 emulation
-    - name: Set up QEMU
-      if: matrix.arch == 'aarch64'
-      uses: docker/setup-qemu-action@v3
-      with:
-        platforms: arm64
-        
+
     - name: Build wheels
       uses: pypa/[email protected]
       env:
-        # Only build for Linux
         CIBW_PLATFORM: linux
         CIBW_ARCHS_LINUX: ${{ matrix.arch }}
-        
-        # Python versions to build for
-        CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*"
-        CIBW_SKIP: "*-musllinux*"  # Skip musl builds, focus on glibc
-        
-        # Install system dependencies before building
-        CIBW_BEFORE_ALL_LINUX: >
-          yum install -y epel-release &&
-          yum install -y libbpf-devel kernel-headers ||
-          (apt-get update && apt-get install -y libbpf-dev linux-headers-generic)
-        
-        # Test the built wheels
+        CIBW_BUILD: "cp38-* cp311-*"
+        CIBW_SKIP: "*-musllinux*"
         CIBW_TEST_COMMAND: "python -c 'import pylibbpf; print(f\"pylibbpf {pylibbpf.__version__} imported successfully\")'"
-        
-        # Skip testing on emulated architectures (too slow)
         CIBW_TEST_SKIP: "*-linux_aarch64"
-        
+
+        CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
+
+        CIBW_BEFORE_ALL_LINUX: |
+          dnf install -y elfutils-libelf-devel zlib-devel
+
     - name: Verify clean directory
       run: git diff --exit-code
       shell: bash
-      
+
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:
@@ -90,20 +74,18 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
     permissions:
-      # IMPORTANT: this permission is mandatory for trusted publishing
       id-token: write
     environment:
       name: pypi
-      # url: https://pypi.org/project/pylibbpf/${{ github.event.release.name }}
-      
+
     steps:
     - name: Download all artifacts
       uses: actions/download-artifact@v5
       with:
         pattern: cibw-*
         path: dist
         merge-multiple: true
-        
+
     - name: Publish to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
       with:

.gitmodules

@@ -2,3 +2,6 @@
     path = pybind11
     url = https://github.com/pybind/pybind11.git
     branch = master
+[submodule "libbpf"]
+    path = libbpf
+    url = https://github.com/libbpf/libbpf.git

CMakeLists.txt

@@ -4,7 +4,51 @@ project(pylibbpf)
 add_subdirectory(pybind11)
 pybind11_add_module(pylibbpf src/main.cpp)
 
+# Build vendored libbpf
+include(ExternalProject)
+ExternalProject_Add(
+  libbpf
+  PREFIX libbpf
+  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libbpf/src
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND
+    make BUILD_STATIC_ONLY=1 OBJDIR=${CMAKE_CURRENT_BINARY_DIR}/libbpf/libbpf
+    DESTDIR=${CMAKE_CURRENT_BINARY_DIR}/libbpf INCLUDEDIR= LIBDIR= UAPIDIR=
+    install install_uapi_headers
+  BUILD_IN_SOURCE TRUE
+  INSTALL_COMMAND ""
+  STEP_TARGETS build)
+
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
+  set(ARCH "x86")
+elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+  set(ARCH "arm")
+elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
+  set(ARCH "arm64")
+elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc64le")
+  set(ARCH "powerpc")
+elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips")
+  set(ARCH "mips")
+elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "riscv64")
+  set(ARCH "riscv")
+elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "loongarch64")
+  set(ARCH "loongarch")
+endif()
+
+set(LIBBPF_INCLUDE_DIRS
+    ${CMAKE_CURRENT_BINARY_DIR}/libbpf
+    ${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include
+    ${CMAKE_CURRENT_BINARY_DIR}/libbpf/usr/include)
+set(LIBBPF_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/libbpf/libbpf.a)
+
 # EXAMPLE_VERSION_INFO is defined by setup.py and passed into the C++ code as a
 # define (VERSION_INFO) here.
 target_compile_definitions(pylibbpf
-                           PRIVATE VERSION_INFO=${EXAMPLE_VERSION_INFO})
+                           PRIVATE VERSION_INFO=${PYLIBBPF_VERSION_INFO})
+
+# ensure build order
+add_dependencies(pylibbpf libbpf)
+
+# headers + linking
+target_include_directories(pylibbpf PRIVATE ${LIBBPF_INCLUDE_DIRS})
+target_link_libraries(pylibbpf PRIVATE ${LIBBPF_LIBRARIES})

README.md

@@ -1,23 +1,10 @@
-# cmake_example for pybind11
-
-An example [pybind11](https://github.com/pybind/pybind11) module built with a
-CMake-based build system. This is useful for C++ codebases that have an
-existing CMake project structure. This is being replaced by
-[`scikit_build_example`](https://github.com/pybind/scikit_build_example), which uses
-[scikit-build-core][], which is designed to allow Python
-packages to be driven from CMake without depending on setuptools. The approach here has
-some trade-offs not present in a pure setuptools build (see
-[`python_example`](https://github.com/pybind/python_example)) or scikit-build-core. Python 3.7+ required;
-see the commit history for older versions of Python.
-
-Problems vs. scikit-build-core based example:
-
-- You have to manually copy fixes/additions when they get added to this example (like when Apple Silicon support was added)
-- Modern editable installs are not supported (scikit-build-core doesn't support them either yet, but probably will soon)
-- You are depending on setuptools, which can and will change
-- You are stuck with an all-or-nothing approach to adding cmake/ninja via wheels (scikit-build-core adds these only as needed, so it can be used on BSD, Cygwin, Pyodide, Android, etc)
-- You are stuck with whatever CMake ships with (scikit-build-core backports FindPython for you)
+# Py-libbpf
+This library provides Python bindings for libbpf on Linux to make loading of eBPF object files easier. This is meant to
+be used along with `pythonbpf`, the eBPF Python DSL compiler. This library makes it possible to attach these programs to
+events in the kernel right from inside Python.
 
+# Warning
+IN DEVELOPMENT. DO NOT USE.
 
 ## Prerequisites
 
@@ -32,40 +19,12 @@ Just clone this repository and pip install. Note the `--recursive` option which
 needed for the pybind11 submodule:
 
 ```bash
-git clone --recursive https://github.com/pybind/cmake_example.git
-pip install ./cmake_example
+git clone --recursive https://github.com/varun-r-mallya/pylibbpf.git
+pip install .
 ```
 
 With the `setup.py` file included in this example, the `pip install` command will
 invoke CMake and build the pybind11 module as specified in `CMakeLists.txt`.
 
-
-
 ## Building the documentation
-
-Documentation for the example project is generated using Sphinx. Sphinx has the
-ability to automatically inspect the signatures and documentation strings in
-the extension module to generate beautiful documentation in a variety formats.
-The following command generates HTML-based reference documentation; for other
-formats please refer to the Sphinx manual:
-
- - `cd cmake_example/docs`
- - `make html`
-
-
-## License
-
-Pybind11 is provided under a BSD-style license that can be found in the LICENSE
-file. By using, distributing, or contributing to this project, you agree to the
-terms and conditions of this license.
-
-
-## Test call
-
-```python
-import cmake_example
-cmake_example.add(1, 2)
-```
-
-[`cibuildwheel`]:    https://cibuildwheel.readthedocs.io
-[scikit-build-core]: https://github.com/scikit-build/scikit-build-core
+The documentation here is still boilerplate.

libbpf

@@ -16,12 +16,11 @@ authors = [
     { name = "varun-r-mallya", email = "[email protected]" }
 ]
 readme = "README.md"
-license = { text = "Apache-2.0" }
+license = { file = "LICENSE" }
 requires-python = ">=3.8"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: Apache Software License",
     "Operating System :: POSIX :: Linux",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.8",
@@ -64,31 +63,6 @@ filterwarnings = [
 ]
 testpaths = ["tests"]
 
-[tool.cibuildwheel]
-build = ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*"]
-skip = ["*-win32", "*-win_amd64", "*-macosx*", "pp*"]
-
-# Build for both x86_64 and aarch64 on Linux
-archs = ["x86_64", "aarch64"]
-
-# Linux-specific settings
-[tool.cibuildwheel.linux]
-before-all = [
-    "yum install -y epel-release || apt-get update",
-    "yum install -y libbpf-devel kernel-headers || apt-get install -y libbpf-dev linux-headers-generic",
-]
-
-# Skip testing on emulated architectures (too slow)
-test-skip = ["*_aarch64", "*_arm64"]
-
-# Test command for supported architectures
-test-command = "pytest {project}/tests"
-test-extras = ["test"]
-
-before-build = "rm -rf {project}/build"
-
-environment = { CMAKE_BUILD_PARALLEL_LEVEL = "2" }
-
 [tool.ruff]
 target-version = "py38"
 line-length = 88

pyproject.toml

@@ -1,5 +1,4 @@
 import os
-import re
 import subprocess
 import sys
 from pathlib import Path
@@ -50,7 +49,7 @@ def build_extension(self, ext: CMakeExtension) -> None:
             f"-DCMAKE_BUILD_TYPE={cfg}",  # not used on MSVC, but no harm
         ]
         build_args = []
-        
+
         # Adding CMake arguments set as environment variable
         # (needed e.g. to build for ARM OSx on conda-forge)
         if "CMAKE_ARGS" in os.environ:
@@ -137,7 +136,6 @@ def build_extension(self, ext: CMakeExtension) -> None:
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
-        "License :: OSI Approved :: Apache Software License",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.8",

setup.py

@@ -1,8 +1,11 @@
 #include <pybind11/pybind11.h>
-
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)
 
+extern "C" {
+#include "bpf/libbpf.h"
+}
+
 int add(int i, int j) {
     return i + j;
 }

src/main.cpp

@@ -1,5 +1,6 @@
 import pylibbpf as m
 
+
 def test_main():
     assert m.__version__ == "0.0.1"
     assert m.add(1, 2) == 3